diff options
| -rw-r--r-- | include/unotools/accessiblestatesethelper.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/accessibility/accessiblestatesethelper.cxx | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index f8803026f264..86d49508ac50 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -29,6 +29,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/servicehelper.hxx> +#include <memory> class AccessibleStateSetHelperImpl; @@ -144,7 +145,7 @@ protected: private: /// The implementation of this helper interface. - AccessibleStateSetHelperImpl* mpHelperImpl; + std::unique_ptr<AccessibleStateSetHelperImpl> mpHelperImpl; }; } diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index 1608b9743da5..aa9e8a756adf 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -126,31 +126,27 @@ inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState) //===== internal ============================================================ AccessibleStateSetHelper::AccessibleStateSetHelper () - : mpHelperImpl(nullptr) + : mpHelperImpl(new AccessibleStateSetHelperImpl) { - mpHelperImpl = new AccessibleStateSetHelperImpl(); } AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 _nInitialStates ) - : mpHelperImpl(nullptr) + : mpHelperImpl(new AccessibleStateSetHelperImpl) { - mpHelperImpl = new AccessibleStateSetHelperImpl(); mpHelperImpl->AddStates( _nInitialStates ); } AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelper& rHelper) : cppu::WeakImplHelper1<XAccessibleStateSet>() - , mpHelperImpl(nullptr) { if (rHelper.mpHelperImpl) - mpHelperImpl = new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl); + mpHelperImpl.reset(new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl)); else - mpHelperImpl = new AccessibleStateSetHelperImpl(); + mpHelperImpl.reset(new AccessibleStateSetHelperImpl()); } AccessibleStateSetHelper::~AccessibleStateSetHelper() { - delete mpHelperImpl; } //===== XAccessibleStateSet ============================================== |