diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-01 18:44:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-01 22:18:02 +0200 |
| commit | ee57ac14739f6bb03b1fd2031f547859c578f7ec (patch) | |
| tree | b18279e8b983224312e7eb471ce8c71d65c445d1 | |
| parent | 0b9649e287abe80870a8caa0e40fdb591e22ef4d (diff) | |
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@collabora.co.uk>
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/inc/sfxurlrelocator.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
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; |