diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-02 09:41:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-05 09:54:31 +0000 |
| commit | 90a043f2589a70f6e035ba350ff7f673ae677f2e (patch) | |
| tree | 9720f33ba9db1ae0128ef022420ef722e077c4d7 /sd | |
| parent | 18f14b9e50407e4c0b97024c122f8ce7c0efaad4 (diff) | |
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.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/framework/tools/FrameworkHelper.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/framework/FrameworkHelper.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
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> |