diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-10 19:29:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-10 22:19:40 +0200 |
| commit | 06bc9956769cef5e0f45d621453517e95845bbdb (patch) | |
| tree | 47cf7883def6843284041a6b25c5b7234781a4d8 | |
| parent | fb8973f31f111229be5184f4e4223e963ced2c7b (diff) | |
we throw away the original of the clone
so we can take ownership of the original instead
Change-Id: I2399aa77b22e606008a5aed2bc73361e13b68455
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104174
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/editsrc.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 0aff723b16b4..c0d63ee01d1e 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1497,7 +1497,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& // rich text std::unique_ptr< EditTextObject > xEditObj( XclImpStringHelper::CreateTextObject( GetRoot(), *maTextData.mxString ) ); - std::unique_ptr<OutlinerParaObject> pOutlineObj(new OutlinerParaObject( *xEditObj )); + std::unique_ptr<OutlinerParaObject> pOutlineObj(new OutlinerParaObject(std::move(xEditObj))); pOutlineObj->SetOutlinerMode( OutlinerMode::TextObject ); pTextObj->NbcSetOutlinerParaObject( std::move(pOutlineObj) ); } diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index a54ff4f0e6ee..6b3fa37447e6 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -169,9 +169,7 @@ void ScAnnotationEditSource::UpdateData() if( SdrObject* pObj = GetCaptionObj() ) { - std::unique_ptr<EditTextObject> pEditObj = pEditEngine->CreateTextObject(); - std::unique_ptr<OutlinerParaObject> pOPO( new OutlinerParaObject( *pEditObj ) ); - pEditObj.reset(); + std::unique_ptr<OutlinerParaObject> pOPO( new OutlinerParaObject(pEditEngine->CreateTextObject()) ); pOPO->SetOutlinerMode( OutlinerMode::TextObject ); pObj->NbcSetOutlinerParaObject( std::move(pOPO) ); pObj->ActionChanged(); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 74a7e880829e..2bb012ea6782 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1185,11 +1185,9 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj, } bool bVertical = pTextObj->IsVerticalWriting(); - std::unique_ptr<EditTextObject> pTemporaryText = m_pDrawEditEngine->CreateTextObject(); - std::unique_ptr<OutlinerParaObject> pOp( new OutlinerParaObject(*pTemporaryText) ); + std::unique_ptr<OutlinerParaObject> pOp(new OutlinerParaObject(m_pDrawEditEngine->CreateTextObject())); pOp->SetOutlinerMode( OutlinerMode::TextObject ); pOp->SetVertical( bVertical ); - pTemporaryText.reset(); pTextObj->NbcSetOutlinerParaObject( std::move(pOp) ); pTextObj->SetVerticalWriting(bVertical); |