[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5ae142a2169e3db0fd138e91e71e3d696580d453
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Aug 9 12:11:17 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Feb 20 18:51:21 2020 +0100

    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 at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

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;