diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-19 17:51:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-20 21:04:02 +0200 |
| commit | 5dcdfa148f6def1cdee628e6f7f1ec2421f45e82 (patch) | |
| tree | ac1afc05ab7c5675a516c07d7a071c29e5132df8 /vcl/source/helper | |
| parent | 0f580560e917f37df94ed2e7ddff59661ae93d79 (diff) | |
osl::Mutex->std::mutex in DisplayConnectionDispatch
Change-Id: I590595adbd89fa3d4833de2743b71168448d4c2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119283
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/helper')
| -rw-r--r-- | vcl/source/helper/displayconnectiondispatch.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/helper/displayconnectiondispatch.cxx b/vcl/source/helper/displayconnectiondispatch.cxx index 85c4e8cdee01..72c3a435a57c 100644 --- a/vcl/source/helper/displayconnectiondispatch.cxx +++ b/vcl/source/helper/displayconnectiondispatch.cxx @@ -56,7 +56,7 @@ void DisplayConnectionDispatch::terminate() SolarMutexReleaser aRel; - MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); Any aEvent; std::vector< css::uno::Reference< XEventHandler > > aLocalList( m_aHandlers ); for (auto const& elem : aLocalList) @@ -65,14 +65,14 @@ void DisplayConnectionDispatch::terminate() void SAL_CALL DisplayConnectionDispatch::addEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler, sal_Int32 /*eventMask*/ ) { - MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); m_aHandlers.push_back( handler ); } void SAL_CALL DisplayConnectionDispatch::removeEventHandler( const Any& /*window*/, const css::uno::Reference< XEventHandler >& handler ) { - MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); m_aHandlers.erase( std::remove(m_aHandlers.begin(), m_aHandlers.end(), handler), m_aHandlers.end() ); } @@ -99,7 +99,7 @@ bool DisplayConnectionDispatch::dispatchEvent( void const * pData, int nBytes ) aEvent <<= aSeq; ::std::vector< css::uno::Reference< XEventHandler > > handlers; { - MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); handlers = m_aHandlers; } for (auto const& handle : handlers) |