[gnumeric] Style: fix last fix.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Style: fix last fix.
- Date: Mon, 4 Jan 2016 21:38:16 +0000 (UTC)
commit af937f24da1e3e0c6f051e5c726f6c61db955759
Author: Morten Welinder <terra gnome org>
Date: Mon Jan 4 16:37:56 2016 -0500
Style: fix last fix.
ChangeLog | 5 +++++
src/sheet-style.c | 14 ++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9592aa6..d09fd91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-04 Morten Welinder <terra gnome org>
+
+ * src/sheet-style.c (sheet_style_apply_range)
+ (sheet_style_set_range): Silently ignore inverted ranges.
+
2016-01-03 Morten Welinder <terra gnome org>
* src/sheet-style.c (sheet_style_apply_range)
diff --git a/src/sheet-style.c b/src/sheet-style.c
index 96efa5f..5201520 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -1379,7 +1379,12 @@ sheet_style_set_range (Sheet *sheet, GnmRange const *range,
g_return_if_fail (IS_SHEET (sheet));
g_return_if_fail (range != NULL);
- g_return_if_fail (range_is_sane (range));
+
+ if (range->start.col > range->end.col ||
+ range->start.row > range->end.row) {
+ gnm_style_unref (style);
+ return;
+ }
r = *range;
range_ensure_sanity (&r, sheet);
@@ -1770,7 +1775,12 @@ sheet_style_apply_range (Sheet *sheet, GnmRange const *range, GnmStyle *pstyle)
g_return_if_fail (IS_SHEET (sheet));
g_return_if_fail (range != NULL);
- g_return_if_fail (range_is_sane (range));
+
+ if (range->start.col > range->end.col ||
+ range->start.row > range->end.row) {
+ gnm_style_unref (pstyle);
+ return;
+ }
r = *range;
range_ensure_sanity (&r, sheet);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]