gnumeric r17319 - trunk/plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Wed Apr 15 20:36:52 2009
New Revision: 17319
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17319&view=rev

Log:
2009-04-15  Morten Welinder  <terra gnome org>

	* ms-obj.c (ms_read_TXO): Fix text problem.  [#578878]



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

Modified: trunk/plugins/excel/ms-container.c
==============================================================================
--- trunk/plugins/excel/ms-container.c	(original)
+++ trunk/plugins/excel/ms-container.c	Wed Apr 15 20:36:52 2009
@@ -262,7 +262,8 @@
 	TXORun txo_run;
 	size_t str_len;
 
-	g_return_val_if_fail (txo_len >= 16, NULL); /* min two records */
+	XL_CHECK_CONDITION_VAL (txo_len >= 16,
+				pango_attr_list_new ()); /* min two records */
 
 	str_len = g_utf8_strlen (str, -1);
 

Modified: trunk/plugins/excel/ms-obj.c
==============================================================================
--- trunk/plugins/excel/ms-obj.c	(original)
+++ trunk/plugins/excel/ms-obj.c	Wed Apr 15 20:36:52 2009
@@ -431,6 +431,7 @@
 		guint maxlen;
 
 		continue_seen = TRUE;
+		ms_biff_query_next (q);
 		if (q->length == 0)
 			continue;