desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 +-
desktop/source/deployment/manager/dp_extensionmanager.hxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f7d6f437ad81cc51d78cffb413dd90a7a8dd960d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Mar 7 13:43:42 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Mar 8 06:43:54 2023 +0000
osl::Mutex->std::mutex in ExtensionManager
Change-Id: I33c39076093dc0c23b5e7c85cbdf0a88e6231d2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148435
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 44bd4648eff0..b51f4c77b47b 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -627,7 +627,7 @@ Reference<css::deployment::XPackage>
ExtensionManager::addExtension(
static_cast<cppu::OWeakObject*>(this), 0);
//We must make sure that the xTmpExtension is not create twice, because
this
//would remove the first one.
- ::osl::MutexGuard addGuard(m_addMutex);
+ std::unique_lock addGuard(m_addMutex);
Reference<css::deployment::XPackageManager>
xTmpRepository(getTmpRepository());
// make sure xTmpRepository is alive as long as xTmpExtension is; as
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx
b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 0e08314c36f6..a70f4fbd2e26 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/deployment/XPackageManagerFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/mutex.hxx>
+#include <mutex>
#include <vector>
#include <unordered_map>
@@ -146,7 +146,7 @@ private:
css::uno::Reference<css::deployment::XPackageManagerFactory>
m_xPackageManagerFactory;
//only to be used within addExtension
- ::osl::Mutex m_addMutex;
+ std::mutex m_addMutex;
/* contains the names of all repositories (except tmp) in order of there
priority. That is, the first element is "user" followed by "shared" and
then "bundled"
