[gnumeric] Style: fix merging problem.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Style: fix merging problem.
- Date: Wed, 19 Jan 2022 22:29:47 +0000 (UTC)
commit 2b2e49a64c76832cbac6d9f9b4ab355a08e1f9f2
Author: Morten Welinder <terra gnome org>
Date: Wed Jan 19 17:29:24 2022 -0500
Style: fix merging problem.
ChangeLog | 1 +
src/mstyle.c | 1 +
2 files changed, 2 insertions(+)
---
diff --git a/ChangeLog b/ChangeLog
index 442e79a63..ea9be2ee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* src/mstyle.c (gnm_style_linked_sheet_changed): Add missing ref.
Fixes #597.
+ (gnm_style_merge): Mark elements from overlay as set in base.
2022-01-09 Morten Welinder <terra gnome org>
diff --git a/src/mstyle.c b/src/mstyle.c
index e0205907c..fb8386d58 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -1338,6 +1338,7 @@ gnm_style_merge (GnmStyle *base, GnmStyle const *overlay)
if (elem_is_set (overlay, i)) {
elem_clear_contents (base, i);
elem_assign_contents (base, overlay, i);
+ elem_set (base, i);
elem_changed (base, i);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]