sw/source/core/doc/DocumentContentOperationsManager.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 9f0e9c7c52fe2685838cfd9f71a44105a3688d1d
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Feb 19 17:32:48 2016 +0100
sw: tdf#63022 fix drag-and-drop of text in same paragraph
SplitNode() inserts new node before the existing one, so pEndTextNd and
aRg.aEnd point one node too far.
Change-Id: I6cea44fafd9d2b47e77e76892a260c5a8c6849fc
(cherry picked from commit fabc45a6a902c8988eff087831f8b2f84ea8ae6c)
Reviewed-on: https://gerrit.libreoffice.org/22510
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 8fdc824..2138bf3e6 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4259,18 +4259,16 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM&
rPam, SwPosition& rPos,
rPam.Move( fnMoveBackward, fnGoContent );
if( bChg )
rPam.Exchange();
-
- aRg.aEnd = pEnd->nNode;
- pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
else if( rPos == *pEnd )
{
// The end was also moved
pEnd->nNode--;
pEnd->nContent.Assign( pDestTextNd, nContentEnd );
- aRg.aEnd = pEnd->nNode;
- pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
+ // tdf#63022 always reset pEndTextNd after SplitNode
+ aRg.aEnd = pEnd->nNode;
+ pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
NUMRULE_STATE
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
