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

[Noel Grandin (via logerrit)]

 sfx2/source/doc/doctemplates.cxx    |    2 +-
 sfx2/source/inc/sfxurlrelocator.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ee57ac14739f6bb03b1fd2031f547859c578f7ec
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 18:44:58 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 22:18:02 2021 +0200

    osl::Mutex->std::mutex in SfxURLRelocator_Impl
    
    Change-Id: Ifda4e66599e1de1e511b5733ccba50317f578444
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119828
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 9670f7d4c2f6..a56f9a36db88 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2670,7 +2670,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs()
 {
     if ( !mxOfficeInstDirs.is() )
     {
-        osl::MutexGuard aGuard( maMutex );
+        std::lock_guard aGuard( maMutex );
         if ( !mxOfficeInstDirs.is() )
         {
             OSL_ENSURE( mxContext.is(), "No service manager!" );
diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 0384f9a70782..3a1fa7729445 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -25,11 +25,11 @@
 #include <com/sun/star/util/XMacroExpander.hpp>
 
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
+#include <mutex>
 
 class SfxURLRelocator_Impl
 {
-    ::osl::Mutex maMutex;
+    std::mutex maMutex;
     css::uno::Reference< css::uno::XComponentContext >               mxContext;
     css::uno::Reference< css::util::XOfficeInstallationDirectories > mxOfficeInstDirs;
     css::uno::Reference< css::util::XMacroExpander >                 mxMacroExpander;