gnumeric r16677 - in trunk: . plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Sat Jun 28 13:54:19 2008
New Revision: 16677
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16677&view=rev

Log:
2008-06-28  Morten Welinder  <terra gnome org>

	* openoffice-read.c (get_dtd): New function.  Fixes #540180.



Modified:
   trunk/NEWS
   trunk/plugins/openoffice/ChangeLog
   trunk/plugins/openoffice/openoffice-read.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Jun 28 13:54:19 2008
@@ -7,6 +7,7 @@
 Morten:
 	* Fix EOMONTH issue.  [#540069]
 	* Fix phyper hang.  [#540211]
+	* Fix openoffice -pedantic problem.  [#540180]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.1

Modified: trunk/plugins/openoffice/openoffice-read.c
==============================================================================
--- trunk/plugins/openoffice/openoffice-read.c	(original)
+++ trunk/plugins/openoffice/openoffice-read.c	Sat Jun 28 13:54:19 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, ...)
@@ -1986,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);
@@ -2758,6 +2758,8 @@
 GSF_XML_IN_NODE_END
 };
 
+static GsfXMLInNode const *get_dtd () { return opendoc_content_dtd; }
+
 /****************************************************************************/
 
 static GnmExpr const *