Kaydet (Commit) f82434b5 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ContentResultSetWrapper

Change-Id: I798e5b06a5b2f9377f22a86f7b630ffdc20e10c6
Reviewed-on: https://gerrit.libreoffice.org/48559Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5cb225b0
......@@ -132,10 +132,6 @@ void ContentResultSetWrapper::impl_init()
ContentResultSetWrapper::~ContentResultSetWrapper()
{
//call impl_deinit() at start of destructor of derived class
delete m_pDisposeEventListeners;
delete m_pPropertyChangeListeners;
delete m_pVetoableChangeListeners;
};
void ContentResultSetWrapper::impl_deinit()
......@@ -178,16 +174,16 @@ void ContentResultSetWrapper::impl_getPropertyChangeListenerContainer()
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
if ( !m_pPropertyChangeListeners )
m_pPropertyChangeListeners =
new PropertyChangeListenerContainer_Impl( m_aContainerMutex );
m_pPropertyChangeListeners.reset(
new PropertyChangeListenerContainer_Impl( m_aContainerMutex ) );
}
void ContentResultSetWrapper::impl_getVetoableChangeListenerContainer()
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
if ( !m_pVetoableChangeListeners )
m_pVetoableChangeListeners =
new PropertyChangeListenerContainer_Impl( m_aContainerMutex );
m_pVetoableChangeListeners.reset(
new PropertyChangeListenerContainer_Impl( m_aContainerMutex ) );
}
void ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const PropertyChangeEvent& rEvt )
......@@ -437,8 +433,8 @@ void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEvent
osl::Guard< osl::Mutex > aGuard( m_aMutex );
if ( !m_pDisposeEventListeners )
m_pDisposeEventListeners =
new OInterfaceContainerHelper2( m_aContainerMutex );
m_pDisposeEventListeners.reset(
new OInterfaceContainerHelper2( m_aContainerMutex ) );
m_pDisposeEventListeners->addInterface( Listener );
}
......
......@@ -35,6 +35,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <memory>
class ContentResultSetWrapperListener;
......@@ -87,11 +88,11 @@ private:
bool m_bDisposed; ///Dispose call ready.
bool m_bInDispose;///In dispose call
osl::Mutex m_aContainerMutex;
comphelper::OInterfaceContainerHelper2*
std::unique_ptr<comphelper::OInterfaceContainerHelper2>
m_pDisposeEventListeners;
PropertyChangeListenerContainer_Impl*
std::unique_ptr<PropertyChangeListenerContainer_Impl>
m_pPropertyChangeListeners;
PropertyChangeListenerContainer_Impl*
std::unique_ptr<PropertyChangeListenerContainer_Impl>
m_pVetoableChangeListeners;
......
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