gnumeric r17152 - in trunk: . plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Fri Feb 20 21:30:40 2009
New Revision: 17152
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17152&view=rev

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

	* openoffice-read.c (oo_colrow_reset_defaults): Call
	colrow_reset_defaults with the right column/row.  Fixes #568010.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Feb 20 21:30:40 2009
@@ -113,6 +113,7 @@
 	* When ssconvert-ing a single-sheet workbook, don't complain the
 	exporter can handle only a single sheet.  [#572448]
 	* Fix xls crash for bogus file.  [#572515]
+	* Fix OO import issue.  [#568010]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/plugins/openoffice/openoffice-read.c
==============================================================================
--- trunk/plugins/openoffice/openoffice-read.c	(original)
+++ trunk/plugins/openoffice/openoffice-read.c	Fri Feb 20 21:30:40 2009
@@ -569,9 +569,10 @@
 				sheet_row_set_default_size_pts (state->pos.sheet,
 					data.cri->size_pts);
 		}
-		colrow_reset_defaults (state->pos.sheet, is_cols, 1 + (is_cols
-			? state->extent_data.col
-			: state->extent_data.row));
+		colrow_reset_defaults (state->pos.sheet, is_cols,
+				       is_cols
+				       ? state->extent_data.col
+				       : state->extent_data.row);
 	}
 }