gnumeric r16885 - in trunk: . src

[jody svn gnome org]

Author: jody
Date: Wed Oct 15 08:25:45 2008
New Revision: 16885
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16885&view=rev

Log:
* Fix reading magic version of ancient file format. [#555933]

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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Oct 15 08:25:45 2008
@@ -43,6 +43,7 @@
 	* XLS : support anachronistic objs in newer versions. [#546887]
 	* WIN32 : build fixes
 	* WIN32 : Fix Decimal keypad character. [#555522]
+	* Fix reading magic version of ancient file format. [#555933]
 
 J.H.M. Dassen (Ray):
 	* Understand and ignore byte-order markers for CSV/stf probing and

Modified: trunk/src/xml-sax-read.c
==============================================================================
--- trunk/src/xml-sax-read.c	(original)
+++ trunk/src/xml-sax-read.c	Wed Oct 15 08:25:45 2008
@@ -1244,10 +1244,7 @@
 	g_return_if_fail (state->style_range_init == FALSE);
 	g_return_if_fail (state->style == NULL);
 
-	state->style = (state->version >= GNM_XML_V6 ||
-			state->version <= GNM_XML_V2)
-		? gnm_style_new_default ()
-		: gnm_style_new ();
+	state->style = gnm_style_new_default ();
 	state->style_range_init =
 		xml_sax_attr_range (attrs, &state->style_range);
 }
@@ -2370,6 +2367,7 @@
 	  GSF_XML_IN_NODE_FULL (SHEET_NAMED_EXPR, SHEET_NAMED_EXPR_POSITION, GNM, "position", GSF_XML_CONTENT, FALSE, FALSE, NULL, &xml_sax_named_expr_prop, 2),
 
       GSF_XML_IN_NODE (SHEET, SHEET_PRINTINFO, GNM, "PrintInformation", GSF_XML_NO_CONTENT, NULL, NULL),
+        GSF_XML_IN_NODE (SHEET_PRINTINFO, SHEET_PRINTUNIT, GNM, "PrintUnit", GSF_XML_NO_CONTENT, NULL, NULL),	/* ignore ancient field */
 	GSF_XML_IN_NODE (SHEET_PRINTINFO, PRINT_MARGINS, GNM, "Margins", GSF_XML_NO_CONTENT, NULL, NULL),
 	  GSF_XML_IN_NODE_FULL (PRINT_MARGINS, PRINT_MARGIN_TOP,    GNM, "top",	  GSF_XML_CONTENT, FALSE, FALSE, &xml_sax_print_margins, NULL, 0),
 	  GSF_XML_IN_NODE_FULL (PRINT_MARGINS, PRINT_MARGIN_BOTTOM, GNM, "bottom",GSF_XML_CONTENT, FALSE, FALSE, &xml_sax_print_margins, NULL, 1),