gnumeric r16678 - in branches/gnumeric-1-8: . plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Sat Jun 28 16:09:36 2008
New Revision: 16678
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16678&view=rev

Log:
Backports.



Modified:
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/plugins/openoffice/ChangeLog
   branches/gnumeric-1-8/plugins/openoffice/openoffice-read.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Sat Jun 28 16:09:36 2008
@@ -1,7 +1,11 @@
 Gnumeric 1.8.4
 
+Jody:
+	* Fix ODS import failure on win32. [#536552]
+
 Morten:
 	* Fix text export problem for times with fractional seconds.  [#534514]
+	* Fix openoffice -pedantic problem.  [#540180]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.3

Modified: branches/gnumeric-1-8/plugins/openoffice/openoffice-read.c
==============================================================================
--- branches/gnumeric-1-8/plugins/openoffice/openoffice-read.c	(original)
+++ branches/gnumeric-1-8/plugins/openoffice/openoffice-read.c	Sat Jun 28 16:09:36 2008
@@ -224,7 +224,7 @@
 	} page_breaks;
 } OOParseState;
 
-static GsfXMLInNode const opendoc_content_dtd [];
+static GsfXMLInNode const * get_dtd (void);
 static void oo_chart_style_free (OOChartStyle *pointer);
 
 static gboolean oo_warning (GsfXMLIn *xin, char const *fmt, ...)
@@ -290,6 +290,7 @@
 	if (!gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), ns_id, name))
 		return FALSE;
 
+	errno = 0; /* strtol sets errno, but does not clear it.  */
 	tmp = strtol (CXML2C (attrs[1]), &end, 10);
 	if (*end || errno != 0 || tmp < INT_MIN || tmp > INT_MAX)
 		return oo_warning (xin, "Invalid integer '%s', for '%s'",
@@ -1985,7 +1986,7 @@
 
 	if (content != NULL) {
 		GsfXMLInDoc *doc =
-			gsf_xml_in_doc_new (opendoc_content_dtd, gsf_ooo_ns);
+			gsf_xml_in_doc_new (get_dtd (), gsf_ooo_ns);
 		gsf_xml_in_doc_parse (doc, content, state);
 		gsf_xml_in_doc_free (doc);
 		g_object_unref (content);
@@ -2755,6 +2756,8 @@
 GSF_XML_IN_NODE_END
 };
 
+static GsfXMLInNode const *get_dtd () { return opendoc_content_dtd; }
+
 /****************************************************************************/
 
 static GnmExpr const *