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

[Noel Grandin (via logerrit)]

 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |    2 +-
 comphelper/source/officeinstdir/officeinstallationdirectories.hxx |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7d359bd6720d7867564dbc408e892843ec178945
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Feb 20 15:55:18 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Feb 20 17:54:49 2023 +0000

    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.gran...@collabora.co.uk>

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;