diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-17 18:49:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-19 11:19:20 +0100 |
| commit | fd1fda8feacd1d006960e4505ad21dea213f1ec1 (patch) | |
| tree | 2271683158bfa30252bd823891af75a0d19d1edb /accessibility | |
| parent | 3152f5a33e787e33ec0dfef8c75d7bbf95194c00 (diff) | |
osl::Mutex->std::mutex in AccessibleBrowseBoxAccess
Change-Id: Idc6e32b81190b3940a42ddb4bb30f1eff35b59fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127070
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/extended/AccessibleBrowseBox.hxx | 3 | ||||
| -rw-r--r-- | accessibility/source/extended/AccessibleBrowseBox.cxx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index f6109299e333..e2d5de3f2600 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -24,6 +24,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <vcl/accessibletableprovider.hxx> +#include <mutex> namespace accessibility { @@ -196,7 +197,7 @@ class AccessibleBrowseBoxAccess final : public ::vcl::IAccessibleBrowseBox { private: - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; css::uno::Reference< css::accessibility::XAccessible > m_xParent; ::vcl::IAccessibleTableProvider& m_rBrowseBox; diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 7dd780508816..8c620b98260b 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -281,7 +281,7 @@ AccessibleBrowseBoxAccess::~AccessibleBrowseBoxAccess() void AccessibleBrowseBoxAccess::dispose() { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); if (m_xContext.is()) { @@ -293,7 +293,7 @@ void AccessibleBrowseBoxAccess::dispose() css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() { - ::osl::MutexGuard aGuard( m_aMutex ); + std::unique_lock aGuard( m_aMutex ); // if the context died meanwhile (there is no listener, so it won't tell us explicitly when this happens), // then reset and re-create. |