gnumeric r17067 - trunk/plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Mon Jan 12 20:24:41 2009
New Revision: 17067
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17067&view=rev

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

	* openoffice-read.c (oo_col_start): Handle column-count
	discrepancies.



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

Modified: trunk/plugins/openoffice/openoffice-read.c
==============================================================================
--- trunk/plugins/openoffice/openoffice-read.c	(original)
+++ trunk/plugins/openoffice/openoffice-read.c	Mon Jan 12 20:24:41 2009
@@ -693,7 +693,12 @@
 		oo_update_style_extent (state, repeat_count, -1);
 	}
 	if (col_info != NULL) {
-		int const last = state->pos.eval.col + repeat_count;
+		int theend = gnm_sheet_get_max_cols (state->pos.sheet);
+		int last = state->pos.eval.col + repeat_count;
+		if (last > theend) {
+			g_warning ("Ignoring column information beyond the range we can handle.");
+			last = theend;
+		}
 		for (i = state->pos.eval.col ; i < last; i++ ) {
 			/* I can not find a listing for the default but will
 			 * assume it is TRUE to keep the files rational */