diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-17 18:53:49 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-06-18 09:38:42 +0200 |
| commit | 102a99e46bca9fb292cc1b2e7604020eb9ca43f4 (patch) | |
| tree | ec1b3fb21e873e78a3916d1b497cf760915b0d96 /sw | |
| parent | e37b8c6ec39d505570113328185ed3e6a017179f (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>
Diffstat (limited to 'sw')
| -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 ); } |