[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - sw/source

[Michael Stahl (via logerrit)]

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

New commits:
commit ec090def44c5ad9f86356f9f6d8bd058cf932821
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 10 18:51:37 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Jun 15 00:05:22 2020 +0200

    tdf#132254 sw: fix block selection copy reversed order
    
    The problem is that SwEditShell::CopySelToDoc() relies on the passed
    target SwPosition being after the target range by CopyRange(), but due
    to an erroneous update of aInsPos in CopyImplImpl() it was at the
    beginning of the target range.
    
    (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
    
    Change-Id: Ie0846bd44f9349517878efcca996440bede05611
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96063
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit 63a43218c369a43624e6bdbe880b7caa40a3b61a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96092
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 78f1f48839bbeaf3e6af768cfc74c6443336d075)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96184
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 49920f65d503..b8df9802efa4 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4831,10 +4831,10 @@ bool DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
                     }
 
                     // copy at-char flys in rPam
-                    aInsPos = *pDestTextNd; // update to new (start) node for flys
+                    SwNodeIndex temp(*pDestTextNd); // update to new (start) node for flys
                     // tdf#126626 prevent duplicate Undos
                     ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
-                    CopyFlyInFlyImpl(aRg, &rPam, aInsPos, false);
+                    CopyFlyInFlyImpl(aRg, &rPam, temp, false);
 
                     break;
                 }