diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-09 12:11:17 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-20 18:51:21 +0100 |
| commit | 5ae142a2169e3db0fd138e91e71e3d696580d453 (patch) | |
| tree | 65a6797caacf17c8bc034bbd7a1a4033c00d52fe /sw | |
| parent | 5e79482c28db7d8e479c603eb3e9eb276ad4ad7d (diff) | |
tdf#126626 sw: fix duplicate SwUndoInsLayFormat in single-node Copy
Fly Undo created later in SwUndoInserts::SetInsertRange(); suppress it
in DocumentContentOperationsManager::CopyImpl().
(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
(cherry picked from commit 844f9fa6ba7108b12758202c5fd08daa2a707641)
Change-Id: I3b8756c20a7472029748d9e64a941320fc10b19f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89094
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 5b07f7b48fb8..137eb9a593ec 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -4608,6 +4608,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, // copy at-char flys in rPam aInsPos = *pDestTextNd; // update to new (start) node for flys + // tdf#126626 prevent duplicate Undos + ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo()); CopyFlyInFlyImpl(aRg, &rPam, aInsPos, false); break; |