summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-02-19 20:43:33 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2022-02-21 13:23:52 +0100
commit88d66dc654c54cdbf4d429fd4e616eda5a78a3a4 (patch)
tree55dcffd8cd410ee628dd537deb78111ac8684c01
parent455a69825ab6cfd9595c4c763181cc797c859816 (diff)
tdf#147166 EditTextObjectImpl copy ctor doesn't exactly copy EditTextObjectImpl
and this is apparently relied on, so eliding the copy gives unexpected results. EditTextObjectImpl::Clone returns a copy of *this, but the EditTextObjectImpl copy ctor explicitly does not copy the "PortionInfo" member, so in: commit fb8973f31f111229be5184f4e4223e963ced2c7b Author: Caolán McNamara <caolanm@redhat.com> Date: Sat Oct 10 19:21:38 2020 +0100 ofz#23492 the only user of this ctor throws away the original of the clone so we can take ownership of the original instead where the copy was optimized away we want from a state where there was a new EditTextObjectImpl with an empty PortionInfo member to one where the PortionInfo of the EditTextObjectImpl was retained. So explicitly clear this unwanted info. It's very hard to make rational judgements about code if a copy behaves differently than the orignal :-( Change-Id: I642d60841d6bdccbf830f8a2ccdbd9f542a8aa18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130202 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--editeng/source/outliner/outliner.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 9c474131352c..d48e4a542723 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -383,6 +383,7 @@ std::unique_ptr<OutlinerParaObject> Outliner::CreateParaObject( sal_Int32 nStart
aParagraphDataVector[nPara-nStartPara] = *GetParagraph(nPara);
}
+ xText->ClearPortionInfo(); // tdf#147166 the PortionInfo is unwanted here
std::unique_ptr<OutlinerParaObject> pPObj(new OutlinerParaObject(std::move(xText), aParagraphDataVector, bIsEditDoc));
pPObj->SetOutlinerMode(GetMode());