[gnumeric] ODF: Fix problem with load.



commit 77348e2b507c5bfcc80fee04080f74bb03b4b9cf
Author: Morten Welinder <terra gnome org>
Date:   Thu Feb 18 10:50:19 2010 -0500

    ODF: Fix problem with load.

 NEWS                                 |    1 +
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    3 ++-
 3 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index a90fe35..f4ae964 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Jean:
 
 Morten:
 	* Turn off -Wstrict-prototypes for the stable series.
+	* Fix ods read problem.  [#610178]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.0
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 8e2b155..a5f5dc0 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-18  Morten Welinder  <terra gnome org>
+
+	* openoffice-read.c (openoffice_file_open): Queue everything for
+	recalc since we use gnm_cell_set_expr_and_value.  Fixes #610178.
+
 2010-02-13  Morten Welinder <terra gnome org>
 
 	* Release 1.10.0
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index b494895..953aacd 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -5372,8 +5372,9 @@ openoffice_file_open (GOFileOpener const *fo, GOIOContext *io_context,
 	i = workbook_sheet_count (state.pos.wb);
 	while (i-- > 0)
 		sheet_flag_recompute_spans (workbook_sheet_by_index (state.pos.wb, i));
+	workbook_queue_all_recalc (state.pos.wb);
 
-	for (i = 0; i<NUM_FORMULAE_SUPPORTED; i++)
+	for (i = 0; i < NUM_FORMULAE_SUPPORTED; i++)
 		if (state.convs[i] != NULL)
 			gnm_conventions_free (state.convs[i]);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]