summaryrefslogtreecommitdiff
path: root/basic/source/basmgr
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-12-17 18:54:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-18 19:08:16 +0100
commit4f043fb3e78429277ba94f05f57fae408d6bda12 (patch)
tree4e01e8ad6596fd4b70fe17dd3ad2613b26d4aee0 /basic/source/basmgr
parent6b16793cd13e540c1dfc1686df948c0dbcbe8068 (diff)
osl::Mutex->std::mutex in CurrDirPool
Change-Id: I889f643266c6f087c34f681e71f27d8ab493e04c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127073 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic/source/basmgr')
-rw-r--r--basic/source/basmgr/vbahelper.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 7fa101a8259e..caccb9bfc16e 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -21,6 +21,7 @@
#include <basic/vbahelper.hxx>
#include <map>
+#include <mutex>
#include <vector>
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/frame/Desktop.hpp>
@@ -140,7 +141,7 @@ void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Ref
struct CurrDirPool
{
- ::osl::Mutex maMutex;
+ std::mutex maMutex;
std::map< OUString, OUString > maCurrDirs;
};
@@ -167,7 +168,7 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c
static CurrDirPool StaticCurrDirPool;
CurrDirPool& rPool = StaticCurrDirPool;
- ::osl::MutexGuard aGuard( rPool.maMutex );
+ std::unique_lock aGuard( rPool.maMutex );
try
{
uno::Reference< frame::XModuleManager2 > xModuleManager( lclCreateModuleManager() );