goffice r2330 - in trunk: . goffice/graph

[jbrefort svn gnome org]

Author: jbrefort
Date: Sat Mar 14 18:04:07 2009
New Revision: 2330
URL: http://svn.gnome.org/viewvc/goffice?rev=2330&view=rev

Log:
2009-03-14  Jean Brefort  <jean brefort normalesup org>

	* goffice/graph/gog-style.c: (gog_style_sax_load_font): set
	a default family when none is given. [#575318]



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/goffice/graph/gog-style.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Mar 14 18:04:07 2009
@@ -6,6 +6,7 @@
 	* Skip points corresponding to invalid valies in pie charts. [#574348]
 	* Correctly use all points defined in bar/columns plot series. [#574349]
 	* Avoid unused direct shlib deps.  [#572910]
+	* Set a default family when none is given. [#575318]
 
 Morten:
 	* Fix a pixbuf scaling problem in foocanvas.

Modified: trunk/goffice/graph/gog-style.c
==============================================================================
--- trunk/goffice/graph/gog-style.c	(original)
+++ trunk/goffice/graph/gog-style.c	Sat Mar 14 18:04:07 2009
@@ -1778,8 +1778,11 @@
 			go_color_from_str (attrs[1], &style->font.color);
 		else if (0 == strcmp (attrs[0], "font")) {
 			PangoFontDescription *desc = pango_font_description_from_string (attrs[1]);
-			if (desc != NULL)
+			if (desc != NULL) {
+				if (pango_font_description_get_family (desc) == NULL)
+					pango_font_description_set_family_static (desc, "Sans");
 				gog_style_set_font_desc (style, desc);
+			}
 		} else if (bool_sax_prop ("auto-scale", attrs[0], attrs[1], &style->font.auto_scale))
 			;
 }