framework/source/uiconfiguration/uicategorydescription.cxx | 10 +++++----- stoc/source/javaloader/javaloader.cxx | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-)
New commits: commit 58738b92255a2508d28c89088658fd21807e5826 Author: Noel Grandin <[email protected]> AuthorDate: Wed Feb 1 14:14:56 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Feb 2 07:00:41 2023 +0000 osl::Mutex->std::mutex in JavaComponentLoader::getJavaLoader Change-Id: Iecde82fcd1c637d4447b2bca491308a2becc38cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146467 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index c8ad708ec676..b6d67a6bc923 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -67,6 +67,7 @@ // this one is header-only #include <comphelper/sequence.hxx> +#include <mutex> #include <thread> #include <utility> @@ -297,8 +298,8 @@ void JavaComponentLoader::disposing() const css::uno::Reference<XImplementationLoader> & JavaComponentLoader::getJavaLoader(OUString & rRemoteArg) { - static Mutex ourMutex; - MutexGuard aGuard(ourMutex); + static std::mutex ourMutex; + std::unique_lock aGuard(ourMutex); if (m_javaLoader.is()) return m_javaLoader; commit 02950f16926564317cee90dffd8cda526bf096f2 Author: Noel Grandin <[email protected]> AuthorDate: Wed Feb 1 19:16:01 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Feb 2 07:00:31 2023 +0000 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 <[email protected]> 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 );
