[gnumeric] Sheet Style: take range into account for sizes too.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Sheet Style: take range into account for sizes too.
- Date: Fri, 19 Oct 2012 20:29:20 +0000 (UTC)
commit d71315c4beee6665a629c38ffcbcb348f192a7c4
Author: Morten Welinder <terra gnome org>
Date: Fri Oct 19 16:29:01 2012 -0400
Sheet Style: take range into account for sizes too.
src/sheet-style.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/sheet-style.c b/src/sheet-style.c
index d8cd4d7..eba3d97 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -2426,8 +2426,6 @@ cb_style_list_add_node (GnmStyle *style,
range.end.col = MIN (corner_col + width - 1, ss->max_cols - 1);
range.end.row = MIN (corner_row + height - 1, ss->max_rows - 1);
- data->area += range_width (&range) * range_height (&range);
-
if (apply_to) {
range.start.col -= apply_to->start.col;
if (range.start.col < 0)
@@ -2444,6 +2442,8 @@ cb_style_list_add_node (GnmStyle *style,
range.end.row -= apply_to->start.row;
}
+ data->area += range_width (&range) * range_height (&range);
+
sr = gnm_style_region_new (&range, style);
g_ptr_array_add (data->accum, sr);
@@ -2690,7 +2690,7 @@ internal_style_list (Sheet const *sheet, GnmRange const *r,
sheet->tile_top_level, 0, 0, r,
cb_style_list_add_node, &data);
- sheet_area = (size_t)data.sheet_size->max_cols * data.sheet_size->max_rows;
+ sheet_area = (size_t)range_height (r) * range_width (r);
if (data.style_filter ? (data.area > sheet_area) : (data.area != sheet_area))
g_warning ("Strange size issue in internal_style_list");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]