diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-10 18:51:37 +0200 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-06-15 00:05:22 +0200 |
commit | ec090def44c5ad9f86356f9f6d8bd058cf932821 (patch) | |
tree | 24f2fc6dd43048f92100159b36d0edfa9d5ed3f7 | |
parent | Resolves: tdf#133862 crash in customize toolbar in embedded math (diff) | |
download | core-ec090def44c5ad9f86356f9f6d8bd058cf932821.tar.gz core-ec090def44c5ad9f86356f9f6d8bd058cf932821.zip |
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@cib.de>
(cherry picked from commit 63a43218c369a43624e6bdbe880b7caa40a3b61a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96092
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 78f1f48839bbeaf3e6af768cfc74c6443336d075)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96184
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |