diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-17 18:53:49 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-06-20 01:24:57 +0200 |
| commit | 5a53c9262a3c7623b7d29e8afe46fddcbea003d3 (patch) | |
| tree | 67507e66f94578b629e89a55390aa2af1e7c4d08 | |
| parent | 139bf8208a7f59b742afac0eefb60e2e73316145 (diff) | |
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@cib.de>
(cherry picked from commit 102a99e46bca9fb292cc1b2e7604020eb9ca43f4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96576
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | sw/source/core/layout/colfrm.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
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 ); } |