diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-04 14:31:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-11 08:25:59 +0200 |
commit | e23678f58113b4bb6624a2c0cf3170bcd2d7577e (patch) | |
tree | 7b006e334e634193e3cd4150b57b4263551fe2cd /svx | |
parent | ee28d75d495c9e115397e0825b14bd3cbf67d5f3 (diff) |
loplugin:useuniqueptr in AccessibleCell
Change-Id: I8502e7695ad9d28d57d1cb5c7f01c7bacd4a69aa
Reviewed-on: https://gerrit.libreoffice.org/55517
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/table/accessiblecell.cxx | 5 | ||||
-rw-r--r-- | svx/source/table/accessiblecell.hxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 08754ad21160..75eba41d2d43 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -83,7 +83,7 @@ void AccessibleCell::Init() { // non-empty text -> use full-fledged edit source right away - mpText = new AccessibleTextHelper( o3tl::make_unique<SvxTextEditSource>(mxCell->GetObject(), mxCell.get(), *pView, *pWindow) ); + mpText.reset( new AccessibleTextHelper( o3tl::make_unique<SvxTextEditSource>(mxCell->GetObject(), mxCell.get(), *pView, *pWindow) ) ); if( mxCell.is() && mxCell.get()->IsActiveCell() ) mpText->SetFocus(); mpText->SetEventSource(this); @@ -520,8 +520,7 @@ void AccessibleCell::disposing() if (mpText != nullptr) { mpText->Dispose(); - delete mpText; - mpText = nullptr; + mpText.reset(); } // Cleanup. Remove references to objects to allow them to be diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index aae99550d083..780b68625fd6 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -119,7 +119,7 @@ protected: sal_Int32 mnIndexInParent; /// The accessible text engine. May be NULL if it can not be created. - AccessibleTextHelper* mpText; + std::unique_ptr<AccessibleTextHelper> mpText; sdr::table::CellRef mxCell; |