summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-06-22 21:04:47 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-06-23 09:02:21 +0200
commite0d0274c2b806f5148b413926ec2e58c75ce04a1 (patch)
tree1c85d0372eabba28a4b883bfda08418c7ae9fb7d /sw/source/core/unocore
parent28f3d9c23bc269cf4c49a4f1f282b0cd27e66fef (diff)
tdf#119081 sw: fix RTF paste into outer table cell
Regression from commit ed654c4aa7f9f10fcb16127349009bc0c38b12e8 (Revert "fdo#43869 use the old rtf importer for paste", 2012-11-30), the direct problem is that SwXText::insertTextPortion() is now used by writerfilter, so in case it's not as good as the internal API used by the old RTF filter, we have a problem. This function calls SwXCell::CreateCursor(), which calls SwXCell::createTextCursor(), which uses Move() to go to the first content node in the cell, but that means we end up at the inner cell's XText for an outer cell. So later when we want to go to the end of the outer cell, we can't, as that would be a different XText and we throw an exception. Fix the problem by instead using createTextCursorByRange(), which immediately positions the cursor at the insert position, so the XText will be correct. FWIW, the ODF import at SwXMLImport::setTextInsertMode() also uses createTextCursorByRange() to handle this situation. Change-Id: I1db13b860bc60771d98c2b4099be73f4bf41c375 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96901 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r--sw/source/core/unocore/unotext.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index ee5185b12f2b..394e8ae7de56 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1354,8 +1354,7 @@ SwXText::insertTextPortion(
throw uno::RuntimeException();
}
uno::Reference< text::XTextRange > xRet;
- const uno::Reference< text::XTextCursor > xTextCursor = CreateCursor();
- xTextCursor->gotoRange(xInsertPosition, false);
+ const uno::Reference<text::XTextCursor> xTextCursor = createTextCursorByRange(xInsertPosition);
const uno::Reference< lang::XUnoTunnel > xRangeTunnel(
xTextCursor, uno::UNO_QUERY_THROW );