gnumeric r16983 - in branches/gnumeric-1-8: . src

[mortenw svn gnome org]

Author: mortenw
Date: Thu Nov 27 01:02:01 2008
New Revision: 16983
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16983&view=rev

Log:
2008-11-26  Morten Welinder  <terra gnome org>

	* src/dependent.c (link_expr_dep): Treat GNM_EXPR_OP_RANGE_CTOR
	and GNM_EXPR_OP_INTERSECT as any other binary operator.  Fixes
	#562363.




Modified:
   branches/gnumeric-1-8/ChangeLog
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/src/dependent.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Thu Nov 27 01:02:01 2008
@@ -1,5 +1,8 @@
 Gnumeric 1.8.4
 
+Henry Law:
+	* Fix dependency problem with constructed ranges.  [#562363]
+
 Jean:
 	* Import/export axis ticks labels orientation. [#544935]
 	* Fix an attribute order issue while loading. [#547183]
@@ -254,6 +257,9 @@
 GÃtz Waschk:
 	* Fix paradox plugin compilation.  [#489030]
 
+Henry Law:
+	* Fix dependency problem with constructed ranges.  [#562363]
+
 Hib Eris:
 	* ssconvert export options.  (Code butchered by Morten.)  [#170767]
 

Modified: branches/gnumeric-1-8/src/dependent.c
==============================================================================
--- branches/gnumeric-1-8/src/dependent.c	(original)
+++ branches/gnumeric-1-8/src/dependent.c	Thu Nov 27 01:02:01 2008
@@ -1021,6 +1021,8 @@
 	g_return_val_if_fail (tree != NULL, DEPENDENT_NO_FLAG);
 
 	switch (GNM_EXPR_GET_OPER (tree)) {
+	case GNM_EXPR_OP_RANGE_CTOR:  /* See #562363 */
+	case GNM_EXPR_OP_INTERSECT:
 	case GNM_EXPR_OP_ANY_BINARY:
 		return  link_expr_dep (ep, tree->binary.value_a) |
 			link_expr_dep (ep, tree->binary.value_b);
@@ -1095,9 +1097,6 @@
 			res |= link_expr_dep (ep, tree->set.argv[i]);
 		return res;
 	}
-	case GNM_EXPR_OP_RANGE_CTOR:
-	case GNM_EXPR_OP_INTERSECT:
-		return DEPENDENT_NO_FLAG; /* handled at run time */
 
 #ifndef DEBUG_SWITCH_ENUM
 	default:
@@ -1111,6 +1110,8 @@
 unlink_expr_dep (GnmDependent *dep, GnmExpr const *tree)
 {
 	switch (GNM_EXPR_GET_OPER (tree)) {
+	case GNM_EXPR_OP_RANGE_CTOR:  /* See #562363 */
+	case GNM_EXPR_OP_INTERSECT:
 	case GNM_EXPR_OP_ANY_BINARY:
 		unlink_expr_dep (dep, tree->binary.value_a);
 		unlink_expr_dep (dep, tree->binary.value_b);
@@ -1183,10 +1184,6 @@
 		return;
 	}
 
-	case GNM_EXPR_OP_RANGE_CTOR:
-	case GNM_EXPR_OP_INTERSECT:
-		return;
-
 #ifndef DEBUG_SWITCH_ENUM
 	default:
 		g_assert_not_reached ();