sw/source/core/doc/DocumentContentOperationsManager.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 13152ad88b24cadc836a829b4424a72a152ca9b1
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Aug 9 12:11:17 2019 +0200
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Mon Aug 12 10:21:16 2019 +0200
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)
Change-Id: I3b8756c20a7472029748d9e64a941320fc10b19f
Reviewed-on: https://gerrit.libreoffice.org/77190
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit 844f9fa6ba7108b12758202c5fd08daa2a707641)
Reviewed-on: https://gerrit.libreoffice.org/77214
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index ca85201f0fdf..beeb00ca4d12 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4605,6 +4605,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
