From 0b9649e287abe80870a8caa0e40fdb591e22ef4d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 1 Aug 2021 18:34:58 +0200 Subject: osl::Mutex->std::mutex in ThumbnailViewItemAcc Change-Id: I9667e378542e7254c52fd57e379ae19a69ff08b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119825 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sfx2/source/control/thumbnailviewacc.cxx | 6 +++--- sfx2/source/control/thumbnailviewacc.hxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sfx2/source') diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index e723ad9efe31..36c321bf3b24 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -517,7 +517,7 @@ ThumbnailViewItemAcc::~ThumbnailViewItemAcc() void ThumbnailViewItemAcc::ParentDestroyed() { - const ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); mpParent = nullptr; } @@ -731,7 +731,7 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale() void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { - const ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); if( !rxListener.is() ) return; @@ -753,7 +753,7 @@ void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Refer void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { - const ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); if( rxListener.is() ) { diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 48c7d70bb79c..2e31843d6438 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX #define INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX -#include #include #include #include @@ -32,6 +31,7 @@ #include #include +#include #include #include @@ -164,7 +164,7 @@ private: ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > mxEventListeners; - ::osl::Mutex maMutex; + std::mutex maMutex; ThumbnailViewItem* mpParent; bool mbIsTransientChildrenDisabled; -- cgit