gnumeric r16676 - in trunk: . doc/C plugins/openoffice

[jody svn gnome org]

Author: jody
Date: Sat Jun 28 12:27:06 2008
New Revision: 16676
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16676&view=rev

Log:
* some distcheck fixes, and a patch for ODF import

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/Makefile.am
   trunk/plugins/openoffice/ChangeLog
   trunk/plugins/openoffice/openoffice-read.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Jun 28 12:27:06 2008
@@ -1,5 +1,9 @@
 Gnumeric 1.9.2
 
+Jody:
+	* Fix distcheck. [#540284]
+	* Fix ODS import failure on win32. [#536552]
+
 Morten:
 	* Fix EOMONTH issue.  [#540069]
 	* Fix phyper hang.  [#540211]

Modified: trunk/doc/C/Makefile.am
==============================================================================
--- trunk/doc/C/Makefile.am	(original)
+++ trunk/doc/C/Makefile.am	Sat Jun 28 12:27:06 2008
@@ -92,7 +92,9 @@
 # from gnumeric-doc.make
 dist-hook: validate
 
-EXTRA_DIST += $(manpage_DATA) ssconvert.1 ssindex.1 gnumeric-docbook-2-htmlhelp.xsl
+# Explicitly ship the manpages even if they are disabled
+EXTRA_DIST += gnumeric.1 ssconvert.1 ssindex.1 ssgrep.1	\
+	gnumeric-docbook-2-htmlhelp.xsl gnumeric-C.omf
 
 if ENABLE_PDFDOCS
 EXTRA_DIST += gnumeric.pdf

Modified: trunk/plugins/openoffice/openoffice-read.c
==============================================================================
--- trunk/plugins/openoffice/openoffice-read.c	(original)
+++ trunk/plugins/openoffice/openoffice-read.c	Sat Jun 28 12:27:06 2008
@@ -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'",