diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-02 19:00:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-03 13:21:25 +0200 |
| commit | 86143150ac287d497d7b887435de580cfb8486b9 (patch) | |
| tree | 9302399ed693b916f238462af32db70ac6f72df7 | |
| parent | 5891746d5cf459ea87ad79ea231f2aedaafb7b39 (diff) | |
osl::Mutex->std::mutex in TemplateFolderCacheImpl
Change-Id: Iaec29ac3706cac485032840776ba3a63b3727905
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119896
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index df219f93fcf6..1faa04470f41 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -41,6 +41,7 @@ #include <comphelper/processfactory.hxx> +#include <mutex> #include <vector> #include <algorithm> @@ -384,7 +385,7 @@ namespace svt TemplateFolderContent m_aPreviousState; // the current state of the template dirs (as found on the HD) TemplateFolderContent m_aCurrentState; // the previous state of the template dirs (as found in the cache file) - osl::Mutex m_aMutex; + std::mutex m_aMutex; // will be lazy inited; never access directly; use getOfficeInstDirs(). uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; @@ -757,7 +758,7 @@ namespace svt { if ( !m_xOfficeInstDirs.is() ) { - osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); if ( !m_xOfficeInstDirs.is() ) { uno::Reference< uno::XComponentContext > xCtx( |