[gnumeric] Do not use filtered out values in graphs. [#687209]

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

commit 58305b393e3105bf3305943940ee2f447747eb3d
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Oct 30 22:53:43 2012 +0100

    Do not use filtered out values in graphs. [#687209]

 ChangeLog   |    5 +++++
 NEWS        |    1 +
 src/graph.c |    6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c2a01af..1e53d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-30  Jean Brefort  <jean brefort normalesup org>
+
+	* src/graph.c (gnm_go_data_vector_load_values),
+	(gnm_go_data_vector_get_str): do not use filtered out values. [#687209]
+
 2012-10-27  Morten Welinder  <terra gnome org>
 
 	* src/stf.c (resize_columns): Only auto-resize columns based on
diff --git a/NEWS b/NEWS
index 7649a89..c19abb6 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Andreas:
 
 Jean:
 	* Fixed indentation in cell format dialog. [#683576]
+	* Do not use filtered out values in graphs. [#687209]
 
 Morten:
 	* Fix xlsx save performance problems.  [#662058]  [#685530]
diff --git a/src/graph.c b/src/graph.c
index 0e637c9..dfb93d8 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -699,7 +699,7 @@ gnm_go_data_vector_load_values (GODataVector *dat)
 			closure.vals = dat->values;
 			closure.last = -1;
 			closure.i = 0;
-			sheet_foreach_cell_in_range (start_sheet, CELL_ITER_ALL,
+			sheet_foreach_cell_in_range (start_sheet, CELL_ITER_IGNORE_SUBTOTAL,
 				r.start.col, r.start.row, r.end.col, r.end.row,
 				(CellIterFunc)cb_assign_val, &closure);
 			dat->len = closure.last + 1; /* clip */
@@ -737,7 +737,7 @@ gnm_go_data_vector_load_values (GODataVector *dat)
 					closure.vals = dat->values;
 					closure.last = last - 1;
 					closure.i = last;
-					sheet_foreach_cell_in_range (start_sheet, CELL_ITER_ALL,
+					sheet_foreach_cell_in_range (start_sheet, CELL_ITER_IGNORE_SUBTOTAL,
 						r.start.col, r.start.row, r.end.col, r.end.row,
 						(CellIterFunc)cb_assign_val, &closure);
 					last = dat->len = closure.last + 1; /* clip */
@@ -886,7 +886,7 @@ gnm_go_data_vector_get_str (GODataVector *dat, unsigned i)
 					r.end.col = start_sheet->cols.max_used;
 
 				if (r.start.col <= r.end.col && r.start.row <= r.end.row)
-					sheet_foreach_cell_in_range (start_sheet, CELL_ITER_ALL,
+					sheet_foreach_cell_in_range (start_sheet, CELL_ITER_IGNORE_SUBTOTAL,
 						r.start.col, r.start.row, r.end.col, r.end.row,
 						(CellIterFunc)cb_assign_string, vec->strs);
 			}