gnumeric r16879 - in trunk: . plugins/excel

[jody svn gnome org]

Author: jody
Date: Mon Oct 13 12:49:46 2008
New Revision: 16879
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16879&view=rev

Log:
* XLS : support anachronistic objs in newer versions. [#546887]

Modified:
   trunk/NEWS
   trunk/plugins/excel/ChangeLog
   trunk/plugins/excel/ms-obj.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Oct 13 12:49:46 2008
@@ -40,6 +40,7 @@
 	* Support XLSX themed colours. [#555687]
 	* Restore the undocumented magic for solid fills in XLSX conditions.
 	* Work around gtk behavior change in IMContext initialization.
+	* XLS : support anachronistic objs in newer versions. [#546887]
 
 J.H.M. Dassen (Ray):
 	* Understand and ignore byte-order markers for CSV/stf probing and

Modified: trunk/plugins/excel/ms-obj.c
==============================================================================
--- trunk/plugins/excel/ms-obj.c	(original)
+++ trunk/plugins/excel/ms-obj.c	Mon Oct 13 12:49:46 2008
@@ -1242,7 +1242,10 @@
 		printf ("{ /* OBJ start */\n");
 #endif
 	obj = ms_obj_new (attrs);
-	errors = (c->importer->ver >= MS_BIFF_V8)
+	/* When called from escher (@attrs != NULL) use the biff8 variant.
+	 * When embdedded directly in the stream (@attrs == NULL) the OBJ
+	 * record appears to be in the old format. (#546887) */
+	errors = (NULL != attrs)
 		? ms_obj_read_biff8_obj (q, c, obj)
 		: ms_obj_read_pre_biff8_obj (q, c, obj);