diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-01 19:16:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-02 07:00:31 +0000 |
| commit | 02950f16926564317cee90dffd8cda526bf096f2 (patch) | |
| tree | d5c9859f70441bba8acc0c78fab4632d1f7af665 /framework | |
| parent | 17523906a875f84e3c435127700bcd9ae932997b (diff) | |
osl::Mutex->std::mutex in ConfigurationAccess_UICategory
Change-Id: I55da051ad9368920224f2c762c9f95b3ea85098a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146472
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uiconfiguration/uicategorydescription.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 620384fadb14..8820a871fd27 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -47,7 +47,7 @@ namespace { class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper<XNameAccess,XContainerListener> { - osl::Mutex aMutex; + std::mutex aMutex; public: ConfigurationAccess_UICategory( std::u16string_view aModuleName, const Reference< XNameAccess >& xGenericUICommands, const Reference< XComponentContext >& rxContext ); virtual ~ConfigurationAccess_UICategory() override; @@ -112,7 +112,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( std::u16string_v ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() { // SAFE - osl::MutexGuard g(aMutex); + std::unique_lock g(aMutex); Reference< XContainer > xContainer( m_xConfigAccess, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener(m_xConfigListener); @@ -121,7 +121,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() // XNameAccess Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId ) { - osl::MutexGuard g(aMutex); + std::unique_lock g(aMutex); if ( !m_bConfigAccessInitialized ) { initializeConfigAccess(); @@ -242,7 +242,7 @@ Any ConfigurationAccess_UICategory::getUINameFromCache( const OUString& rId ) Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() { // SAFE - osl::MutexGuard g(aMutex); + std::unique_lock g(aMutex); if ( !m_bConfigAccessInitialized ) { @@ -332,7 +332,7 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve { // SAFE // remove our reference to the config access - osl::MutexGuard g(aMutex); + std::unique_lock g(aMutex); Reference< XInterface > xIfac1( aEvent.Source, UNO_QUERY ); Reference< XInterface > xIfac2( m_xConfigAccess, UNO_QUERY ); |