[Libreoffice-commits] core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/framework/tools/FrameworkHelper.cxx |    4 ++--
 sd/source/ui/inc/framework/FrameworkHelper.hxx   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 90a043f2589a70f6e035ba350ff7f673ae677f2e
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Feb 2 09:41:48 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Feb 5 09:54:31 2023 +0000

    osl::Mutex->std::mutex in sd::framework::FrameworkHelper
    
    Change-Id: I84d5eb29413b3242386f1ffb1beafa9622985ded
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146558
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx 
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 1b227d7ca6fd..4fd911574abf 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -279,11 +279,11 @@ public:
 FrameworkHelper::ViewURLMap FrameworkHelper::maViewURLMap;
 
 FrameworkHelper::InstanceMap FrameworkHelper::maInstanceMap;
-osl::Mutex FrameworkHelper::maInstanceMapMutex;
+std::mutex FrameworkHelper::maInstanceMapMutex;
 
 ::std::shared_ptr<FrameworkHelper> FrameworkHelper::Instance (ViewShellBase& 
rBase)
 {
-    ::osl::MutexGuard aGuard(maInstanceMapMutex);
+    std::unique_lock aGuard(maInstanceMapMutex);
 
     InstanceMap::const_iterator iHelper (maInstanceMap.find(&rBase));
     if (iHelper != maInstanceMap.end())
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx 
b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 4d8278d90ed0..57de645de100 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -26,6 +26,7 @@
 #include <functional>
 #include <map>
 #include <memory>
+#include <mutex>
 
 namespace com::sun::star::drawing::framework { class XConfigurationController; 
}
 namespace com::sun::star::drawing::framework { class XResourceId; }
@@ -293,7 +294,7 @@ private:
     static InstanceMap maInstanceMap;
     class ViewURLMap;
     static ViewURLMap maViewURLMap;
-    static osl::Mutex maInstanceMapMutex;
+    static std::mutex maInstanceMapMutex;
 
     ViewShellBase& mrBase;
     css::uno::Reference<css::drawing::framework::XConfigurationController>