diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-17 18:43:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-18 18:18:32 +0100 |
| commit | 580b5227144c6d71b1dc2663fc741ed29f119767 (patch) | |
| tree | 9c6a503773409bd027d02f25f019bcaa5dfc55a8 /ucbhelper | |
| parent | 9547114247c09a90f283e42c4db947ae57e9529c (diff) | |
osl::Mutex->std::mutex in ResultSetImplHelper
Change-Id: I7567369120593579740e23668d3426a25377a105
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127068
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/provider/resultsethelper.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 5ff9e6c27483..77c901d62ee7 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -88,13 +88,13 @@ css::uno::Sequence< OUString > SAL_CALL ResultSetImplHelper::getSupportedService // virtual void SAL_CALL ResultSetImplHelper::dispose() { - osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() ) { lang::EventObject aEvt; aEvt.Source = static_cast< lang::XComponent * >( this ); - m_pDisposeEventListeners->disposeAndClear( aEvt ); + m_pDisposeEventListeners->disposeAndClear( aGuard, aEvt ); } } @@ -103,10 +103,10 @@ void SAL_CALL ResultSetImplHelper::dispose() void SAL_CALL ResultSetImplHelper::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) { - osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( !m_pDisposeEventListeners ) - m_pDisposeEventListeners.reset(new cppu::OInterfaceContainerHelper( m_aMutex )); + m_pDisposeEventListeners.reset(new comphelper::OInterfaceContainerHelper4<css::lang::XEventListener>()); m_pDisposeEventListeners->addInterface( Listener ); } @@ -116,7 +116,7 @@ void SAL_CALL ResultSetImplHelper::addEventListener( void SAL_CALL ResultSetImplHelper::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) { - osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_pDisposeEventListeners ) m_pDisposeEventListeners->removeInterface( Listener ); @@ -130,7 +130,7 @@ void SAL_CALL ResultSetImplHelper::removeEventListener( uno::Reference< sdbc::XResultSet > SAL_CALL ResultSetImplHelper::getStaticResultSet() { - osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_xListener.is() ) throw css::ucb::ListenerAlreadySetException(); @@ -144,7 +144,7 @@ ResultSetImplHelper::getStaticResultSet() void SAL_CALL ResultSetImplHelper::setListener( const uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) { - osl::ClearableMutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_bStatic || m_xListener.is() ) throw css::ucb::ListenerAlreadySetException(); @@ -173,7 +173,7 @@ void SAL_CALL ResultSetImplHelper::setListener( 0, // Count; not used css::ucb::ListActionType::WELCOME, aInfo ) }; - aGuard.clear(); + aGuard.unlock(); Listener->notify( css::ucb::ListEvent( @@ -229,8 +229,6 @@ void SAL_CALL ResultSetImplHelper::connectToCache( void ResultSetImplHelper::init( bool bStatic ) { - osl::MutexGuard aGuard( m_aMutex ); - if ( m_bInitDone ) return; |