xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 8 ++++---- xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 499adc4cc3597486a49b3781ba21e3c216668ea4 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sat Jul 31 18:57:57 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Sun Aug 1 10:41:25 2021 +0200 osl::Mutex->std::mutex in XMLBasicExporterBase Change-Id: I5178e6bc6566186081e7a21e91cd8ca221b74cac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119751 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx index 3f0351a1f97e..c714bea9743f 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx @@ -60,7 +60,7 @@ namespace xmlscript void XMLBasicExporterBase::initialize( const Sequence< Any >& aArguments ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); if ( aArguments.getLength() != 1 ) { @@ -79,7 +79,7 @@ namespace xmlscript void XMLBasicExporterBase::setSourceDocument( const Reference< XComponent >& rxDoc ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); m_xModel.set( rxDoc, UNO_QUERY ); @@ -93,7 +93,7 @@ namespace xmlscript sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /*aDescriptor*/ ) { - ::osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); bool bReturn = true; @@ -306,7 +306,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / void XMLBasicExporterBase::cancel() { - ::osl::MutexGuard aGuard( m_aMutex ); + std::lock_guard aGuard( m_aMutex ); // cancel export } diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx index e58eebe6005f..1ed5e9e5d356 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/implbase.hxx> -#include <osl/mutex.hxx> +#include <mutex> namespace xmlscript { @@ -39,7 +39,7 @@ namespace xmlscript class XMLBasicExporterBase : public XMLBasicExporterBase_BASE { private: - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; css::uno::Reference< css::frame::XModel > m_xModel; bool const m_bOasis;