[gnumeric] Fix histogram tool.

[Andreas J. Guelzow <guelzow src gnome org>]

commit a291a24032675b248787830e721a5d0a3d558e5d
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed Oct 7 20:24:42 2009 -0600

    Fix histogram tool.
    
    2009-10-07 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* analysis-histogram.c (make_hist_expr): fix tests

 NEWS                           |    1 +
 src/tools/ChangeLog            |    4 ++++
 src/tools/analysis-histogram.c |   12 ++++++------
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/NEWS b/NEWS
index 397e3eb..559bd8f 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Andreas:
 	* Fix diagonal borders in ODF export/import.
 	* For freezing of panes consider edit cell A1 special. [#594875]
 	* Don't convert blank cells to 0 in LINEST. [#551234]
+	* Fix histogram tool.
 
 Jean:
 	* Make plugins GUI labels translatable. [#159806]
diff --git a/src/tools/ChangeLog b/src/tools/ChangeLog
index 7d86c16..f06906f 100644
--- a/src/tools/ChangeLog
+++ b/src/tools/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-07 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* analysis-histogram.c (make_hist_expr): fix tests
+
 2009-09-22 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* analysis-anova.c: Change "Anova" to "ANOVA" throughout
diff --git a/src/tools/analysis-histogram.c b/src/tools/analysis-histogram.c
index 22d0648..d971b2d 100644
--- a/src/tools/analysis-histogram.c
+++ b/src/tools/analysis-histogram.c
@@ -54,16 +54,16 @@ make_hist_expr (analysis_tools_data_histogram_t *info,
 	GnmFunc *fd_count = gnm_func_lookup_or_add_placeholder ("COUNT", dao->sheet ? dao->sheet->workbook : NULL, FALSE);
 	gint to_col = (info->cumulative) ? 0 : 1;
 
-	if (info->bin_type & bintype_no_inf_lower) {
-		from = GNM_EXPR_OP_LTE;
-		to = GNM_EXPR_OP_GT;
-	} else {
+	if (info->bin_type & bintype_no_inf_upper) {
 		from = GNM_EXPR_OP_LT;
 		to = GNM_EXPR_OP_GTE;
+	} else {
+		from = GNM_EXPR_OP_LTE;
+		to = GNM_EXPR_OP_GT;
 	}
 
 	expr_data = gnm_expr_new_constant (value_dup (val));
-	if (fromminf)
+	if (topinf)
 		expr_if_to = gnm_expr_new_constant (value_new_int (1));
 	else
 		expr_if_to = gnm_expr_new_funcall3
@@ -78,7 +78,7 @@ make_hist_expr (analysis_tools_data_histogram_t *info,
 		expr = gnm_expr_new_funcall1 (fd_sum, expr_if_to);
 	else {
 		GnmExpr const *one = gnm_expr_new_constant (value_new_int (1));
-		if (topinf)
+		if (fromminf)
 			expr_if_from = one;
 		else
 			expr_if_from = gnm_expr_new_funcall3