[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - cui/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 17 13:14:25 UTC 2021
cui/source/tabpages/transfrm.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 53b534991b9eb516aac019a02b61d7b1dc9db28e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 16 15:58:11 2021 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Aug 17 15:13:49 2021 +0200
Resolves: tdf#143785 save/restore SdrModel::IsChanged
Change-Id: I253915c359cf72f80b21e21ff34e0ee406e5b3a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120550
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 6dc23567639bebf18ceb8d9a3721228bffe14202)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120577
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 94ff0ef49d20..ae844703ef67 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -648,6 +648,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
*pView->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj()));
//save geometry
+ const bool bOrigModelChangeState = pView->GetModel()->IsChanged();
SdrCustomShapeGeometryItem aInitialGeometry(rSdrObjCustomShape.GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY));
EnhancedCustomShape2d aShape(rSdrObjCustomShape);
@@ -691,6 +692,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
//restore geometry
rSdrObjCustomShape.SetMergedItem(aInitialGeometry);
+ pView->GetModel()->SetChanged(bOrigModelChangeState);
}
for (int i = 0; i < 2; ++i)
More information about the Libreoffice-commits
mailing list