summaryrefslogtreecommitdiff
path: root/ucb/source/cacher/contentresultsetwrapper.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-22 14:22:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-25 13:33:36 +0100
commitf82434b54517cad96416df93e9b5d70c9b0ada45 (patch)
tree7b8e6eec8bb015ef43ab687153e7b0bbfb5dc553 /ucb/source/cacher/contentresultsetwrapper.cxx
parent5cb225b0b3dbb55fd44899b1fb16bdcfeb866849 (diff)
loplugin:useuniqueptr in ContentResultSetWrapper
Change-Id: I798e5b06a5b2f9377f22a86f7b630ffdc20e10c6 Reviewed-on: https://gerrit.libreoffice.org/48559 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/cacher/contentresultsetwrapper.cxx')
-rw-r--r--ucb/source/cacher/contentresultsetwrapper.cxx16
1 files changed, 6 insertions, 10 deletions
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 3f9f8aea3639..32e6f3edf59b 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -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 );
}