gnumeric r16886 - trunk/src

[mortenw svn gnome org]

Author: mortenw
Date: Wed Oct 15 12:45:17 2008
New Revision: 16886
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16886&view=rev

Log:
2008-10-15  Morten Welinder  <terra gnome org>

	* src/xml-sax-read.c (xml_sax_style_region_end): Apply partial
	mstyles like in xml-io.c
	(xml_sax_style_region_start): Undo last change.



Modified:
   trunk/src/xml-sax-read.c

Modified: trunk/src/xml-sax-read.c
==============================================================================
--- trunk/src/xml-sax-read.c	(original)
+++ trunk/src/xml-sax-read.c	Wed Oct 15 12:45:17 2008
@@ -1244,7 +1244,11 @@
 	g_return_if_fail (state->style_range_init == FALSE);
 	g_return_if_fail (state->style == NULL);
 
-	state->style = gnm_style_new_default ();
+	state->style = (state->version >= GNM_XML_V6 ||
+			state->version <= GNM_XML_V2)
+		? gnm_style_new_default ()
+		: gnm_style_new ();
+
 	state->style_range_init =
 		xml_sax_attr_range (attrs, &state->style_range);
 }
@@ -1258,7 +1262,12 @@
 	g_return_if_fail (state->style != NULL);
 	g_return_if_fail (state->sheet != NULL);
 
-	sheet_style_set_range (state->sheet, &state->style_range, state->style);
+	if (state->version >= GNM_XML_V6 || state->version <= GNM_XML_V2)
+		sheet_style_set_range (state->sheet, &state->style_range,
+				       state->style);
+	else
+		sheet_style_apply_range (state->sheet, &state->style_range,
+					 state->style);
 
 	state->style_range_init = FALSE;
 	state->style = NULL;