diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-31 19:15:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-31 22:32:14 +0200 |
| commit | 7a4a107283dd43a35434f73cd7fbf291c8837b6d (patch) | |
| tree | 9d3bcbe4b9c19d8af8c7b3c7a7be60d7aeb0a5f0 /xmlhelp | |
| parent | e66fdb597b30fc701bb068824d0ae4d89fecd55f (diff) | |
osl::Mutex->std::mutex in TreeFileIterator
Change-Id: Ie4e102c03aef8ded29561359c58e6c78cfebbdc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119755
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvread.hxx | 3 | ||||
| -rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index 31ec7fedfbf6..fad7fa42fcdd 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -19,6 +19,7 @@ #pragma once +#include <mutex> #include <vector> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> @@ -258,7 +259,7 @@ namespace treeview { void implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv, const css::uno::Reference< css::deployment::XPackage >& xPackage ); - osl::Mutex m_aMutex; + std::mutex m_aMutex; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA; diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 3b7ecf190cc6..c374b4242585 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -1081,7 +1081,7 @@ OUString TreeFileIterator::expandURL( const OUString& aURL ) static Reference< util::XMacroExpander > xMacroExpander; static Reference< uri::XUriReferenceFactory > xFac; - osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); if( !xMacroExpander.is() || !xFac.is() ) { |