[gnumeric] Conditional formatting: minor cleanup.



commit 0484d4f6d4293980ed1b4156520b7456a3845089
Author: Morten Welinder <terra gnome org>
Date:   Tue May 29 16:22:32 2012 -0400

    Conditional formatting: minor cleanup.

 src/dialogs/ChangeLog                 |    5 +++++
 src/dialogs/dialog-cell-format-cond.c |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 93929b2..7f792d9 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-29  Morten Welinder  <terra gnome org>
+
+	* dialog-cell-format-cond.c (c_fmt_dialog_get_condition): Use
+	gnm_style_cond_set_expr.
+
 2012-05-17  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* dialog-consolidate.c (adjust_source_areas): also expect empty
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index 3bbfd5e..e8d3671 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -387,13 +387,15 @@ c_fmt_dialog_get_condition (CFormatState *state)
 		GnmExprTop const *texpr = gnm_expr_entry_parse (GNM_EXPR_ENTRY (state->editor.expr_x), &pp,
 								NULL, FALSE,
 								GNM_EXPR_PARSE_UNKNOWN_NAMES_ARE_STRINGS);
-		cond->texpr[0] = texpr;
+		gnm_style_cond_set_expr (cond, texpr, 0);
+		gnm_expr_top_unref (texpr);
 	}
 	if (n_expr > 1) {
 		GnmExprTop const *texpr = gnm_expr_entry_parse (GNM_EXPR_ENTRY (state->editor.expr_y), &pp,
 								NULL, FALSE,
 								GNM_EXPR_PARSE_UNKNOWN_NAMES_ARE_STRINGS);
-		cond->texpr[1] = texpr;
+		gnm_style_cond_set_expr (cond, texpr, 1);
+		gnm_expr_top_unref (texpr);
 	}
 	return cond;
 }



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