diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-11-21 18:14:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-22 07:55:13 +0100 |
| commit | b67257c5dc54b37495a755005192e4cf186aef25 (patch) | |
| tree | c811ab27f684839185bd417d7950c62c603aded6 /framework/source/uiconfiguration | |
| parent | 60e185446eef9c4084b22901f1ffb41b36628b6e (diff) | |
osl::Mutex->std::mutex in GlobalSettings_Access
Change-Id: I5162a157fd07870bf768947b32e8afe8f1fb0a02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125629
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/uiconfiguration')
| -rw-r--r-- | framework/source/uiconfiguration/globalsettings.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index f880e7354fd2..2c517205e2db 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -28,6 +28,7 @@ #include <rtl/ref.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/implbase.hxx> +#include <mutex> // Defines @@ -64,7 +65,7 @@ class GlobalSettings_Access : public ::cppu::WeakImplHelper< private: void impl_initConfigAccess(); - osl::Mutex m_mutex; + std::mutex m_mutex; bool m_bDisposed : 1, m_bConfigRead : 1; OUString m_aNodeRefStates; @@ -91,7 +92,7 @@ GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::un // XComponent void SAL_CALL GlobalSettings_Access::dispose() { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); m_xConfigAccess.clear(); m_bDisposed = true; } @@ -107,14 +108,14 @@ void SAL_CALL GlobalSettings_Access::removeEventListener( const css::uno::Refere // XEventListener void SAL_CALL GlobalSettings_Access::disposing( const css::lang::EventObject& ) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); m_xConfigAccess.clear(); } // settings access bool GlobalSettings_Access::HasToolbarStatesInfo() { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); if ( m_bDisposed ) return false; @@ -148,7 +149,7 @@ bool GlobalSettings_Access::HasToolbarStatesInfo() bool GlobalSettings_Access::GetToolbarStateInfo( GlobalSettings::StateInfo eStateInfo, css::uno::Any& aValue ) { - osl::MutexGuard g(m_mutex); + std::unique_lock g(m_mutex); if ( m_bDisposed ) return false; |