[gnumeric] Fix "not-between" conditional styles. [#586818]



commit 9c9241293af2abd8f4185ca8ccd7e17daabb47c5
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed Jun 24 03:25:57 2009 -0600

    Fix "not-between" conditional styles. [#586818]
    
    2009-06-24  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/style-conditions.c (gnm_style_conditions_eval): fix
    	  GNM_STYLE_COND_NOT_BETWEEN:

 ChangeLog              |    5 +++++
 NEWS                   |    1 +
 src/style-conditions.c |    4 +++-
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6d430c8..c787b2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-24  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/style-conditions.c (gnm_style_conditions_eval): fix
+	  GNM_STYLE_COND_NOT_BETWEEN:
+
 2009-06-23  Morten Welinder  <terra gnome org>
 
 	* src/item-cursor.c (item_cursor_tip_setlabel,
diff --git a/NEWS b/NEWS
index c2c6eb5..f3cd02e 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Andreas:
 	* Fix import of currency symbols from ODF.
 	* Improve import of elapsed time from ODF.
 	* Import some conditional cell formats from ODF.
+	* Fix "not-between" conditional styles. [#586818]
 
 Morten:
 	* Make SUMIF/COUNTIF and the D* functions understand pattern. [#586215]
diff --git a/src/style-conditions.c b/src/style-conditions.c
index 0c64f7d..010c3d9 100644
--- a/src/style-conditions.c
+++ b/src/style-conditions.c
@@ -231,8 +231,10 @@ gnm_style_conditions_eval (GnmStyleConditions const *sc, GnmEvalPos const *ep)
 			case GNM_STYLE_COND_EQUAL:	use_this = (diff == IS_EQUAL); break;
 			case GNM_STYLE_COND_NOT_EQUAL:	use_this = (diff != IS_EQUAL); break;
 			case GNM_STYLE_COND_NOT_BETWEEN:
-				if (diff != IS_LESS)
+				if (diff == IS_LESS) {
+					use_this = TRUE;
 					break;
+				}
 				value_release (val);
 				val = gnm_expr_top_eval (cond->texpr[1], ep, GNM_EXPR_EVAL_SCALAR_NON_EMPTY);
 				diff = value_compare (cv, val, TRUE);



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