diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-10 14:05:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-11 05:53:57 +0000 |
| commit | 5126c94cea90251f73b7b383e23ffa473ac5f5f0 (patch) | |
| tree | a5baee2ff3562d382cf319a9158c60e4c3e7ff22 /comphelper/source | |
| parent | 125287c157e1d0db199f5e14364948181c572c11 (diff) | |
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>
Diffstat (limited to 'comphelper/source')
| -rw-r--r-- | comphelper/source/misc/officerestartmanager.cxx | 4 | ||||
| -rw-r--r-- | comphelper/source/misc/officerestartmanager.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
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; |