[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/colfrm.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5a53c9262a3c7623b7d29e8afe46fddcbea003d3
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 17 18:53:49 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Jun 20 01:24:57 2020 +0200

    tdf#134009 sw: prevent spurious undos in SwColumnFrame::DestroyImpl()
    
    SwUndoFrameFormatDelete is created for every destroyed column frame.
    
    Change-Id: I11e0399487a41c52768175faf3a3699b302ad317
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96558
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 102a99e46bca9fb292cc1b2e7604020eb9ca43f4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96576
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index b241257b4bda..dfb438953688 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -52,6 +52,9 @@ void SwColumnFrame::DestroyImpl()
         //I'm the only one, delete the format.
         //Get default format before, so the base class can cope with it.
         pDoc->GetDfltFrameFormat()->Add( this );
+        // tdf#134009, like #i32968# avoid SwUndoFrameFormatDelete creation,
+        // the format is owned by the SwColumnFrame, see lcl_AddColumns()
+        ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
         pDoc->DelFrameFormat( pFormat );
     }