[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/transfrm.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c777efbcbc5bbc3c78b7c0176447adf25b1e697e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 16 15:58:11 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Wed Aug 18 10:18:59 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/+/120578
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index cec57ecbbbe7..c8d0133ab58d 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -647,6 +647,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);
 
@@ -690,6 +691,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
 
         //restore geometry
         rSdrObjCustomShape.SetMergedItem(aInitialGeometry);
+        pView->GetModel()->SetChanged(bOrigModelChangeState);
     }
 
     for (int i = 0; i < 2; ++i)