diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-23 14:58:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-29 07:17:39 +0100 |
| commit | 8a0935a9bc255df3f197ca484594e1cfb6514801 (patch) | |
| tree | 9df8754826f99188dbb6aaa5f5026334fc4f4f20 /ucb/source/ucp | |
| parent | 084571ee6ce7daf0d94f6c3e1ef7186edcf2b969 (diff) | |
loplugin:useuniqueptr in XResultSet_impl
Change-Id: I2f333d0d0784fc76f6a3b7a6a9e61b82b856afa0
Reviewed-on: https://gerrit.libreoffice.org/48703
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/ucp')
| -rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 16 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filrset.hxx | 7 |
2 files changed, 9 insertions, 14 deletions
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 81dd63afaea8..1d949a9996dd 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -88,10 +88,6 @@ XResultSet_impl::~XResultSet_impl() if( m_nIsOpen ) m_aFolder.close(); - - delete m_pDisposeEventListeners; - delete m_pRowCountListeners; - delete m_pIsFinalListeners; } @@ -109,8 +105,8 @@ XResultSet_impl::addEventListener( osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pDisposeEventListeners ) - m_pDisposeEventListeners = - new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); + m_pDisposeEventListeners.reset( + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ) ); m_pDisposeEventListeners->addInterface( Listener ); } @@ -681,8 +677,8 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pIsFinalListeners ) - m_pIsFinalListeners = - new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); + m_pIsFinalListeners.reset( + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ) ); m_pIsFinalListeners->addInterface( xListener ); } @@ -690,8 +686,8 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( { osl::MutexGuard aGuard( m_aMutex ); if ( ! m_pRowCountListeners ) - m_pRowCountListeners = - new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ); + m_pRowCountListeners.reset( + new comphelper::OInterfaceContainerHelper2( m_aEventListenerMutex ) ); m_pRowCountListeners->addInterface( xListener ); } else diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 22f77d574891..c2ee576a3e65 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -439,10 +439,9 @@ class XResultSet_impl : public Notifier, osl::Mutex m_aMutex; osl::Mutex m_aEventListenerMutex; - comphelper::OInterfaceContainerHelper2* m_pDisposeEventListeners; - - comphelper::OInterfaceContainerHelper2* m_pRowCountListeners; - comphelper::OInterfaceContainerHelper2* m_pIsFinalListeners; + std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pDisposeEventListeners; + std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pRowCountListeners; + std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pIsFinalListeners; css::uno::Reference< css::ucb::XDynamicResultSetListener > m_xListener; |