[Libreoffice-commits] core.git: sw/source
Michael Stahl (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jun 11 07:39:43 UTC 2020
sw/source/core/doc/DocumentContentOperationsManager.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 63a43218c369a43624e6bdbe880b7caa40a3b61a
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 10 18:51:37 2020 +0200
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Jun 11 09:39:10 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>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index a174dccbbee1..4151f9d6b562 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4833,10 +4833,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;
}
More information about the Libreoffice-commits
mailing list