diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-22 21:53:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-23 09:32:31 +0200 |
| commit | 2d98ee5f14a3343a9103771861d26920a7109b30 (patch) | |
| tree | 4bf6364767eb8c37cd16947d2fc95659f98d4a8e | |
| parent | 1fd35c6d0058e33694721a962f1fe5c0489d4336 (diff) | |
osl::Mutex->std::mutex in ValueItemAcc
Change-Id: I8b0315b9e496b930bf312d7d2565727777c70985
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119389
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svtools/source/control/valueacc.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/control/valueimp.hxx | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index a6364d784064..bca32029f785 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -73,7 +73,7 @@ ValueItemAcc::~ValueItemAcc() void ValueItemAcc::ParentDestroyed() { - const ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); mpParent = nullptr; } @@ -261,7 +261,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale() void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { - const ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); if( !rxListener.is() ) return; @@ -284,7 +284,7 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) { - const ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); if( rxListener.is() ) { diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index b980cb1f5c90..707493443b75 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> +#include <mutex> #include <vector> #define VALUESET_ITEM_NONEITEM 0xFFFE @@ -199,7 +200,7 @@ private: ::std::vector< css::uno::Reference< css::accessibility::XAccessibleEventListener > > mxEventListeners; - ::osl::Mutex maMutex; + std::mutex maMutex; ValueSetItem* mpParent; bool mbIsTransientChildrenDisabled; |