diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2016-11-16 21:04:05 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-11-17 02:49:20 +0000 |
| commit | 9008db0a8259551c292f94007afcac710b637b57 (patch) | |
| tree | d60889e7c57ffb39f021f5ec225523e3161c758f /sc | |
| parent | c03c77ef4f46b81cd000ea26c4ef154044322535 (diff) | |
Use std::unique_ptr for mpTextHelper.
Change-Id: I7cbb68a947232c6b3410815349cae306b384608c
Reviewed-on: https://gerrit.libreoffice.org/30918
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleEditObject.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/inc/AccessibleEditObject.hxx | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 66662840b995..664189b1071b 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -103,8 +103,7 @@ ScAccessibleEditObject::~ScAccessibleEditObject() void SAL_CALL ScAccessibleEditObject::disposing() { SolarMutexGuard aGuard; - if (mpTextHelper) - DELETEZ(mpTextHelper); + mpTextHelper.reset(); ScAccessibleContextBase::disposing(); } @@ -368,7 +367,11 @@ void ScAccessibleEditObject::CreateTextHelper() pAccessibleTextData.reset (new ScAccessibleEditLineTextData(nullptr, mpWindow)); } - mpTextHelper = new ::accessibility::AccessibleTextHelper(o3tl::make_unique<ScAccessibilityEditSource>(std::move(pAccessibleTextData))); + + std::unique_ptr<ScAccessibilityEditSource> pEditSrc = + o3tl::make_unique<ScAccessibilityEditSource>(std::move(pAccessibleTextData)); + + mpTextHelper = o3tl::make_unique<::accessibility::AccessibleTextHelper>(std::move(pEditSrc)); mpTextHelper->SetEventSource(this); const ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index e7d0b1aa4e61..1b35218fcfd5 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -26,6 +26,8 @@ #include "global.hxx" #include <vcl/window.hxx> +#include <memory> + namespace accessibility { class AccessibleTextHelper; @@ -184,7 +186,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; private: - accessibility::AccessibleTextHelper* mpTextHelper; + std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper; EditView* mpEditView; VclPtr<vcl::Window> mpWindow; EditObjectType meObjectType; |