[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - editeng/source

[Caolán McNamara (via logerrit)]

 editeng/source/outliner/outliner.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6842e0f786c7f3fc859bd7337427d7a4b37befed
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Feb 19 20:43:33 2022 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Feb 21 13:23:28 2022 +0100

    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 <caol...@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/+/130158
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index d50bdc9b3895..00b5ff202992 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -381,6 +381,7 @@ std::optional<OutlinerParaObject> 
Outliner::CreateParaObject( sal_Int32 nStartPa
         aParagraphDataVector[nPara-nStartPara] = *GetParagraph(nPara);
     }
 
+    xText->ClearPortionInfo(); // tdf#147166 the PortionInfo is unwanted here
     OutlinerParaObject aPObj(std::move(xText), 
std::move(aParagraphDataVector), bIsEditDoc);
     aPObj.SetOutlinerMode(GetOutlinerMode());