Kaydet (Commit) c9ff3efd authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Noel Grandin

tdf#89329: use unique_ptr for pImpl in accessiblestatesethelper

Change-Id: I768bfd5a19a2633e6d6cd37f919c20cbfc76824e
Reviewed-on: https://gerrit.libreoffice.org/25905Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 52af06b4
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <comphelper/servicehelper.hxx> #include <comphelper/servicehelper.hxx>
#include <memory>
class AccessibleStateSetHelperImpl; class AccessibleStateSetHelperImpl;
...@@ -144,7 +145,7 @@ protected: ...@@ -144,7 +145,7 @@ protected:
private: private:
/// The implementation of this helper interface. /// The implementation of this helper interface.
AccessibleStateSetHelperImpl* mpHelperImpl; std::unique_ptr<AccessibleStateSetHelperImpl> mpHelperImpl;
}; };
} }
......
...@@ -126,31 +126,27 @@ inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState) ...@@ -126,31 +126,27 @@ inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
//===== internal ============================================================ //===== internal ============================================================
AccessibleStateSetHelper::AccessibleStateSetHelper () AccessibleStateSetHelper::AccessibleStateSetHelper ()
: mpHelperImpl(nullptr) : mpHelperImpl(new AccessibleStateSetHelperImpl)
{ {
mpHelperImpl = new AccessibleStateSetHelperImpl();
} }
AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 _nInitialStates ) AccessibleStateSetHelper::AccessibleStateSetHelper ( const sal_Int64 _nInitialStates )
: mpHelperImpl(nullptr) : mpHelperImpl(new AccessibleStateSetHelperImpl)
{ {
mpHelperImpl = new AccessibleStateSetHelperImpl();
mpHelperImpl->AddStates( _nInitialStates ); mpHelperImpl->AddStates( _nInitialStates );
} }
AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelper& rHelper) AccessibleStateSetHelper::AccessibleStateSetHelper (const AccessibleStateSetHelper& rHelper)
: cppu::WeakImplHelper1<XAccessibleStateSet>() : cppu::WeakImplHelper1<XAccessibleStateSet>()
, mpHelperImpl(nullptr)
{ {
if (rHelper.mpHelperImpl) if (rHelper.mpHelperImpl)
mpHelperImpl = new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl); mpHelperImpl.reset(new AccessibleStateSetHelperImpl(*rHelper.mpHelperImpl));
else else
mpHelperImpl = new AccessibleStateSetHelperImpl(); mpHelperImpl.reset(new AccessibleStateSetHelperImpl());
} }
AccessibleStateSetHelper::~AccessibleStateSetHelper() AccessibleStateSetHelper::~AccessibleStateSetHelper()
{ {
delete mpHelperImpl;
} }
//===== XAccessibleStateSet ============================================== //===== XAccessibleStateSet ==============================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment