From 5126c94cea90251f73b7b383e23ffa473ac5f5f0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 10 Mar 2023 14:05:01 +0200
Subject: osl::Mutex->std::mutex in OOfficeRestartManager

Change-Id: I473d604346280cb24c299e0e6d6ca2621a2200a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148658
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 comphelper/source/misc/officerestartmanager.cxx | 4 ++--
 comphelper/source/misc/officerestartmanager.hxx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'comphelper/source/misc')

diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index 39c61a4e53a3..86eb18f623c9 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -39,7 +39,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
         throw uno::RuntimeException();
 
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        std::unique_lock aGuard( m_aMutex );
 
         // if the restart already running there is no need to trigger it again
         if ( m_bRestartRequested )
@@ -76,7 +76,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
 
 sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeInitialized )
 {
-    ::osl::MutexGuard aGuard( m_aMutex );
+    std::unique_lock aGuard( m_aMutex );
 
     if ( bOfficeInitialized && !m_bOfficeInitialized )
         m_bOfficeInitialized = bOfficeInitialized;
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index bc95668b9399..ecf59c543270 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/awt/XCallback.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <osl/mutex.hxx>
+#include <mutex>
 #include <cppuhelper/implbase.hxx>
 #include <utility>
 
@@ -35,7 +35,7 @@ class OOfficeRestartManager : public ::cppu::WeakImplHelper< css::task::XRestart
                                                            , css::awt::XCallback
                                                            , css::lang::XServiceInfo >
 {
-    ::osl::Mutex m_aMutex;
+    std::mutex m_aMutex;
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     bool m_bOfficeInitialized;
-- 
cgit