diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-10 16:07:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 08:42:59 +0200 |
| commit | ff8442fd85f2e281a564e3dc832a751a3a9c3072 (patch) | |
| tree | 05d4a59e914d53a357f99a8ce6146cb3e35f47c3 /editeng/source/outliner/outliner.cxx | |
| parent | 672660031e4ca38205e2068b1e321268a844a68b (diff) | |
pass EditTextObject around using std::unique_ptr
Change-Id: I71f4529c2e02fd0ac2561191e4cb35e18e206037
Reviewed-on: https://gerrit.libreoffice.org/52682
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source/outliner/outliner.cxx')
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 64f0dc4e4816..d3de3a85f89b 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -385,7 +385,7 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 if (nCount <= 0) return nullptr; - EditTextObject* pText = pEditEngine->CreateTextObject( nStartPara, nCount ); + std::unique_ptr<EditTextObject> pText = pEditEngine->CreateTextObject( nStartPara, nCount ); const bool bIsEditDoc(OutlinerMode::TextObject == ImplGetOutlinerMode()); ParagraphDataVector aParagraphDataVector(nCount); const sal_Int32 nLastPara(nStartPara + nCount - 1); @@ -397,7 +397,6 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 OutlinerParaObject* pPObj = new OutlinerParaObject(*pText, aParagraphDataVector, bIsEditDoc); pPObj->SetOutlinerMode(GetMode()); - delete pText; return pPObj; } @@ -2119,11 +2118,9 @@ NonOverflowingText *Outliner::GetNonOverflowingText() const OutlinerParaObject *Outliner::GetEmptyParaObject() const { - EditTextObject *pEmptyText = pEditEngine->GetEmptyTextObject(); + std::unique_ptr<EditTextObject> pEmptyText = pEditEngine->GetEmptyTextObject(); OutlinerParaObject* pPObj = new OutlinerParaObject( *pEmptyText ); pPObj->SetOutlinerMode(GetMode()); - - delete pEmptyText; return pPObj; } |