diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 10:36:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-03 08:22:52 +0200 |
| commit | c3a8dc07be1beeccbefb9242a1fd1f270cb531ba (patch) | |
| tree | 4c24e04b024c3a9f8f89c3cd3ba717bc94d7c868 /svx | |
| parent | c35f95b3ec48e6057d4ddafe688daff1cede59c0 (diff) | |
loplugin:useuniqueptr in SdrItemBrowserControl
Change-Id: I9da160c4d20109ef539e1877968044a168b3e7e2
Reviewed-on: https://gerrit.libreoffice.org/53757
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svdibrow.hxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 21104c99829d..e735cee9db59 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -39,7 +39,7 @@ friend class ImpItemEdit; OUString aWNameMemorized; Link<SdrItemBrowserControl&,void> aEntryChangedHdl; Link<SdrItemBrowserControl&,void> aSetDirtyHdl; - ImpItemListRow* pCurrentChangeEntry; + std::unique_ptr<ImpItemListRow> pCurrentChangeEntry; long nLastWhichOfs; sal_uInt16 nLastWhich; bool bWhichesButNames; @@ -83,7 +83,7 @@ public: */ virtual OUString GetCellText(long _nRow, sal_uInt16 _nColId) const override; - const ImpItemListRow* GetCurrentChangeEntry() const { return pCurrentChangeEntry; } + const ImpItemListRow* GetCurrentChangeEntry() const { return pCurrentChangeEntry.get(); } OUString GetNewEntryValue() const { return pEditControl->GetText(); } void SetEntryChangedHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aEntryChangedHdl=rLink; } void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink) { aSetDirtyHdl=rLink; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 0128792cfc4e..b8976cfa12c4 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -220,7 +220,7 @@ void SdrItemBrowserControl::dispose() { pEditControl.disposeAndClear(); - delete pCurrentChangeEntry; + pCurrentChangeEntry.reset(); Clear(); BrowseBox::dispose(); @@ -501,7 +501,7 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) } aNewName += " - Type 'del' to reset to default."; pParent->SetText(aNewName); - pCurrentChangeEntry=new ImpItemListRow(*pEntry); + pCurrentChangeEntry.reset(new ImpItemListRow(*pEntry)); bRet = true; } return bRet; @@ -520,8 +520,7 @@ void SdrItemBrowserControl::BreakChangeEntry() { if (pEditControl!=nullptr) { pEditControl.disposeAndClear(); - delete pCurrentChangeEntry; - pCurrentChangeEntry=nullptr; + pCurrentChangeEntry.reset(); vcl::Window* pParent=GetParent(); pParent->SetText(aWNameMemorized); SetMode(MYBROWSEMODE); |