[gnumeric] Fix #584771



commit 960fa2b8b4b575af8de49ded3825e71dec316f77
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed Jun 3 16:23:26 2009 -0600

    Fix #584771
    
    2009-06-03 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_cell_content_end): Since we may be
    	  assigning the result of an array calculation we should not
    	  check for array splits.
---
 plugins/openoffice/ChangeLog         |   10 ++++++++--
 plugins/openoffice/openoffice-read.c |    3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 872fb7f..e62bfaa 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,7 +1,13 @@
+2009-06-03 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-read.c (oo_cell_content_end): Since we may be 
+	  assigning the result of an array calculation we should not 
+	  check for array splits.
+	
 2009-06-02 Andreas J. Guelzow <aguelzow pyrshep ca>
 
-	* openoffice-read.c (odf_number_style_end): shorten code and distinguish 
-	  <> from <
+	* openoffice-read.c (odf_number_style_end): shorten code and
+	  distinguish <> from <
 	
 2009-06-02 Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 5dc33ee..3deaa82 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -1299,7 +1299,8 @@ oo_cell_content_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 		else
 			v = value_new_error (NULL, xin->content->str);
 
-		gnm_cell_set_value (cell, v);
+		/* Note that we could be looking at the result of an array calculation */
+		gnm_cell_assign_value (cell, v);
 		oo_update_data_extent (state, 1, 1);
 	}
 }



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