[gnumeric] Fix #625994.

[Jean Bréfort <jbrefort src gnome org>]

commit 14e9fff2865f4c9210a61e18ff9d889c6b9c188e
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Aug 4 16:39:49 2010 +0200

    Fix #625994.

 ChangeLog       |    5 +++++
 NEWS            |    2 ++
 src/dependent.c |    4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fedfd8e..5e76f83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-04  Jean Brefort  <jean brefort normalesup org>
+
+	* src/dependent.c (gnm_cell_eval_content): force columns span recalculation
+	when switching between number and error. [#625994]
+
 2010-08-03  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/gui-util.c (gnumeric_create_tooltip_rc_style): set all colours
diff --git a/NEWS b/NEWS
index d803689..389d578 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Jean:
 	* Import Guppi graphs from gnumeric-1.0.x files. [#567953]
 	* Survive malformed guppi graphs. [#625726]
 	* Use theme foreground color for row and column headers. [#625727]
+	* Force column span recalculation when switching between number and
+	  error. [#625994]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.8
diff --git a/src/dependent.c b/src/dependent.c
index 7149ec1..aeff995 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -1544,8 +1544,8 @@ iterate :
 			/* Value didn't change.  */
 			value_release (v);
 		} else {
-			gboolean was_string = had_value && VALUE_IS_STRING (cell->value);
-			gboolean is_string = VALUE_IS_STRING (v);
+			gboolean was_string = had_value && (VALUE_IS_STRING (cell->value) || VALUE_IS_ERROR (cell->value));
+			gboolean is_string = VALUE_IS_STRING (v) || VALUE_IS_ERROR (v);
 
 			if ((was_string || is_string) && cell->row_info)
 				cell->row_info->needs_respan = TRUE;