diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-22 21:51:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 08:54:54 +0200 |
| commit | da340c48ecd67e1b97546842dae013306caa6ace (patch) | |
| tree | b7b9931a06c5b78fd0de15ac986cadc9d1bddcfc /svl | |
| parent | 240bb9e223a7c22c02e8821d47f15b793f02e5a1 (diff) | |
osl::Mutex->std::mutex in SvtLanguageOptions
Change-Id: I5b24c729f63f2f51b2a2bebc8539e8c61cf77bee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119388
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/config/languageoptions.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index f00812b30b8d..4f3f7671eda7 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -23,12 +23,12 @@ #include <svl/ctloptions.hxx> #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> -#include <osl/mutex.hxx> #include <rtl/instance.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <unotools/syslocale.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <mutex> #ifdef _WIN32 #if !defined WIN32_LEAN_AND_MEAN @@ -40,12 +40,12 @@ using namespace ::com::sun::star; // global -namespace { struct ALMutex : public rtl::Static< ::osl::Mutex, ALMutex > {}; } +namespace { struct ALMutex : public rtl::Static< std::mutex, ALMutex > {}; } SvtLanguageOptions::SvtLanguageOptions( bool _bDontLoad ) { // Global access, must be guarded (multithreading) - ::osl::MutexGuard aGuard( ALMutex::get() ); + std::lock_guard aGuard( ALMutex::get() ); m_pCJKOptions.reset(new SvtCJKOptions( _bDontLoad )); m_pCTLOptions.reset(new SvtCTLOptions( _bDontLoad )); @@ -55,7 +55,7 @@ SvtLanguageOptions::SvtLanguageOptions( bool _bDontLoad ) SvtLanguageOptions::~SvtLanguageOptions() { // Global access, must be guarded (multithreading) - ::osl::MutexGuard aGuard( ALMutex::get() ); + std::lock_guard aGuard( ALMutex::get() ); m_pCTLOptions->RemoveListener(this); m_pCJKOptions->RemoveListener(this); |