gnumeric r17131 - in trunk: . plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Mon Feb  9 18:20:37 2009
New Revision: 17131
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17131&view=rev

Log:
2009-02-09  Morten Welinder  <terra gnome org>

	* openoffice-read.c (oo_cell_start): Handle "of" expression
	namespace same as "oooc".  Fixes 570890.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Feb  9 18:20:37 2009
@@ -99,6 +99,7 @@
 	* Implement MATCH for wildcards.  [#570139]
 	* Fix problem with functions docs in locales without encoding
 	information.
+	* Work around a ODF spec. problem in OOo import.  [#570890]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/plugins/openoffice/openoffice-read.c
==============================================================================
--- trunk/plugins/openoffice/openoffice-read.c	(original)
+++ trunk/plugins/openoffice/openoffice-read.c	Mon Feb  9 18:20:37 2009
@@ -903,11 +903,14 @@
 
 			expr_string = CXML2C (attrs[1]);
 			if (state->ver == OOO_VER_OPENDOC) {
-				if (strncmp (expr_string, "oooc:", 5)) {
-					oo_warning (xin, _("Missing expression namespace"));
+				if (strncmp (expr_string, "oooc:", 5) == 0)
+					expr_string += 5;
+				else if (strncmp (expr_string, "of:", 3) == 0)
+					expr_string += 3;
+				else {
+					oo_warning (xin, _("Missing or unknown expression namespace: %s"), expr_string);
 					continue;
 				}
-				expr_string += 5;
 			}
 
 			expr_string = gnm_expr_char_start_p (expr_string);