svx/source/accessibility/AccessibleTextHelper.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a11a06d38e145139a2a1c7d51510b4fc2222c3e1
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Jul 19 19:03:05 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jul 20 21:04:29 2021 +0200
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.gran...@collabora.co.uk>
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");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
