[Libreoffice-commits] core.git: xmlhelp/source

[Noel Grandin (via logerrit)]

 xmlhelp/source/cxxhelp/inc/tvread.hxx |    3 ++-
 xmlhelp/source/treeview/tvread.cxx    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7a4a107283dd43a35434f73cd7fbf291c8837b6d
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 31 19:15:24 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jul 31 22:32:14 2021 +0200

    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 at collabora.co.uk>

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() )
     {