diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-09 12:49:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-14 11:19:04 +0200 |
| commit | d0242b11638938c8873643ee3fc768e4a3a52b95 (patch) | |
| tree | 67cb986679802823602bb2b96f9dbaa419a85501 /editeng/source | |
| parent | 311c5a98b8cc6d5e4ef97a59c113cfd7df59312a (diff) | |
loplugin:useuniqueptr in EditTextObjectImpl
Change-Id: I8c0aca098cb2453f3780ea123b35848eb417e5f1
Reviewed-on: https://gerrit.libreoffice.org/54177
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng/source')
| -rw-r--r-- | editeng/source/editeng/editobj.cxx | 6 | ||||
| -rw-r--r-- | editeng/source/editeng/editobj2.hxx | 8 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 5ae80f43b67c..b76e99ea4d95 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -688,11 +688,7 @@ OUString EditTextObjectImpl::GetText(sal_Int32 nPara) const void EditTextObjectImpl::ClearPortionInfo() { - if ( pPortionInfo ) - { - delete pPortionInfo; - pPortionInfo = nullptr; - } + pPortionInfo.reset(); } bool EditTextObjectImpl::HasOnlineSpellErrors() const diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 44fc5ac82c47..26576d4fdb1b 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -184,7 +184,7 @@ private: ContentInfosType aContents; SfxItemPool* pPool; - XParaPortionList* pPortionInfo; + std::unique_ptr<XParaPortionList> pPortionInfo; sal_uInt32 nObjSettings; sal_uInt16 nMetric; @@ -227,9 +227,9 @@ public: ContentInfosType& GetContents() { return aContents;} const ContentInfosType& GetContents() const { return aContents;} SfxItemPool* GetPool() const { return pPool; } - XParaPortionList* GetPortionInfo() const { return pPortionInfo; } - void SetPortionInfo( XParaPortionList* pP ) - { pPortionInfo = pP; } + XParaPortionList* GetPortionInfo() const { return pPortionInfo.get(); } + void SetPortionInfo( std::unique_ptr<XParaPortionList> pP ) + { pPortionInfo = std::move(pP); } sal_Int32 GetParagraphCount() const; OUString GetText(sal_Int32 nParagraph) const; diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 930f873d7fd6..e2f7e2412dd0 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1095,7 +1095,7 @@ std::unique_ptr<EditTextObject> ImpEditEngine::CreateTextObject( EditSelection a if ( bAllowBigObjects && bOnlyFullParagraphs && IsFormatted() && GetUpdateMode() && ( nTextPortions >= nBigObjectStart ) ) { XParaPortionList* pXList = new XParaPortionList( GetRefDevice(), aPaperSize.Width(), nStretchX, nStretchY ); - pTxtObj->mpImpl->SetPortionInfo(pXList); + pTxtObj->mpImpl->SetPortionInfo(std::unique_ptr<XParaPortionList>(pXList)); for ( nNode = nStartNode; nNode <= nEndNode; nNode++ ) { const ParaPortion* pParaPortion = GetParaPortions()[nNode]; |