summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapper_Impl.cxx
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga.extern@allotropia.de>2024-02-20 20:26:25 +0100
committerBalazs Varga <balazs.varga.extern@allotropia.de>2024-02-21 20:36:38 +0100
commit7cf3d5e3073dc5cffc64b6d9b32513e90087a3d4 (patch)
treeb344da09b7fca3c5e97c1bd3c8fe9aed9ba9738d /writerfilter/source/dmapper/DomainMapper_Impl.cxx
parent215a7afd6042c35a45509cea3eae69254d676429 (diff)
tdf#158360 - sw, ooxml import - fix insertTextPortion crash
Before this patch da8dead8e9282010893cbd12519e107baf03cd1a SvxUnoTextBase::insertTextPortion returned an empty XTextRange in case of texts in comment. (SwTextAPIObject) Lets use finishParagraphInsert which also give back an empty XTextRange. regression from commit: da8dead8e9282010893cbd12519e107baf03cd1a (tdf#73537 - sc: show author and creation date in calc comments) Change-Id: I0b33e5b3cae32718a62a7be04b9a88562f85652c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163670 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f73504824ea0..0b1ff5e0e6e3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3287,7 +3287,10 @@ void DomainMapper_Impl::MergeAtContentImageRedlineWithNext(const css::uno::Refer
{
xTOCTextCursor->goLeft(1, false);
}
- xTextRange = xTextAppend->insertTextPortion(rString, aValues, xTOCTextCursor);
+ if (IsInComments())
+ xTextRange = xTextAppend->finishParagraphInsert(aValues, xTOCTextCursor);
+ else
+ xTextRange = xTextAppend->insertTextPortion(rString, aValues, xTOCTextCursor);
SAL_WARN_IF(!xTextRange.is(), "writerfilter.dmapper", "insertTextPortion failed");
if (!xTextRange.is())
throw uno::Exception("insertTextPortion failed", nullptr);