diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-07-19 19:03:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-20 21:04:29 +0200 |
| commit | a11a06d38e145139a2a1c7d51510b4fc2222c3e1 (patch) | |
| tree | 951cc32e445bdc610f4258b0806502f601ddaba8 | |
| parent | 5dcdfa148f6def1cdee628e6f7f1ec2421f45e82 (diff) | |
osl::Mutex->std::mutex in AccessibleTextHelper_Impl
Change-Id: I263295c817a188d1d499a8c92eb7f6f7be64ea79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119284
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 9fbd897ea519..f1753226aa71 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -21,9 +21,9 @@ #include <cstdlib> #include <memory> +#include <mutex> #include <utility> #include <algorithm> -#include <osl/mutex.hxx> #include <sal/log.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -109,7 +109,7 @@ namespace accessibility void SetOffset( const Point& ); Point GetOffset() const { - ::osl::MutexGuard aGuard( maMutex ); Point aPoint( maOffset ); + std::lock_guard aGuard( maMutex ); Point aPoint( maOffset ); return aPoint; } @@ -216,7 +216,7 @@ namespace accessibility // whether we (this object) has the focus set (guarded by solar mutex) bool mbThisHasFocus; - mutable ::osl::Mutex maMutex; + mutable std::mutex maMutex; /// our current offset to the containing shape/cell (guarded by maMutex) Point maOffset; @@ -732,7 +732,7 @@ namespace accessibility { // guard against non-atomic access to maOffset data structure { - ::osl::MutexGuard aGuard( maMutex ); + std::lock_guard aGuard( maMutex ); maOffset = rPoint; } @@ -1383,7 +1383,7 @@ namespace accessibility // -- object locked -- AccessibleEventObject aEvent; { - osl::MutexGuard aGuard(maMutex); + std::lock_guard aGuard(maMutex); DBG_ASSERT(mxFrontEnd.is(), "AccessibleTextHelper::FireEvent: no event source set"); |