diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-20 15:55:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-20 17:54:49 +0000 |
| commit | 7d359bd6720d7867564dbc408e892843ec178945 (patch) | |
| tree | 0fca01e1b6179cb79dfec16127dd3e2b73d20d2a /comphelper | |
| parent | a9c147e20a90ab91376ea8f2d086d89197b38a75 (diff) | |
osl::Mutex->std::mutex in OfficeInstallationDirectories
Change-Id: Ic5209df42786451b58d20f58d4d8e88c0f22b07e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147341
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 4cb3eb5e3702..582bdc125f78 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -211,7 +211,7 @@ void OfficeInstallationDirectories::initDirs() if ( m_xOfficeBrandDir) return; - osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if ( m_xOfficeBrandDir ) return; diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index cc0881c236fd..09ded59b9a53 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -20,11 +20,11 @@ #pragma once #include <cppuhelper/implbase.hxx> -#include <cppuhelper/basemutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XOfficeInstallationDirectories.hpp> +#include <mutex> #include <optional> namespace com::sun::star::uno { class XComponentContext; } @@ -37,7 +37,7 @@ typedef cppu::WeakImplHelper< css::util::XOfficeInstallationDirectories, css::lang::XServiceInfo > UnoImplBase; -class OfficeInstallationDirectories : public cppu::BaseMutex, public UnoImplBase +class OfficeInstallationDirectories : public UnoImplBase { public: explicit OfficeInstallationDirectories( @@ -65,6 +65,7 @@ public: private: void initDirs(); + std::mutex m_aMutex; css::uno::Reference< css::uno::XComponentContext > m_xCtx; std::optional<OUString> m_xOfficeBrandDir; std::optional<OUString> m_xUserDir; |