gnumeric r17099 - in trunk: . plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Mon Jan 26 18:53:16 2009
New Revision: 17099
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17099&view=rev

Log:
2009-01-26  Morten Welinder  <terra gnome org>

	* openoffice-read.c (oo_table_start): Handle missing style.  Fixes
	part of #568994.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan 26 18:53:16 2009
@@ -84,6 +84,7 @@
 	* Fix VLOOKUP and HLOOKUP for bools.
 	* Fix problem reading slightly-corrupted dbf file.  [#568454]
 	* If we overflow the sheet tab area, put list in context menu.
+	* Fix ods load crash.  [#568994]
 
 --------------------------------------------------------------------------
 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 Jan 26 18:53:16 2009
@@ -525,10 +525,11 @@
 				state->sheet_order, state->pos.sheet);
 		} else if (gsf_xml_in_namecmp (xin, CXML2C (attrs[0]), OO_NS_TABLE, "style-name"))  {
 			OOSheetStyle const *style = g_hash_table_lookup (state->styles.sheet, attrs[1]);
-			g_object_set (state->pos.sheet,
-				"visibility", style->visibility,
-				"text-is-rtl", style->is_rtl,
-				NULL);
+			if (style)
+				g_object_set (state->pos.sheet,
+					      "visibility", style->visibility,
+					      "text-is-rtl", style->is_rtl,
+					      NULL);
 		}
 }