[Libreoffice-commits] core.git: sw/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 5 16:23:15 UTC 2021
sw/source/uibase/docvw/SidebarWinAcc.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 0494ad3495efe9f72809f18abe3ca95d49d7412f
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Wed Aug 4 19:11:04 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 5 18:22:40 2021 +0200
osl::Mutex->std::mutex in SidebarWinAccessibleContext
Change-Id: Ic8cba9d900f74511ad721085f9d728b43c1be3c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120018
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index 82046d7426dd..5859ebc83199 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -25,6 +25,7 @@
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <mutex>
namespace sw::sidebarwindows {
@@ -47,7 +48,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
void ChangeAnchor( const SwFrame* pAnchorFrame )
{
- osl::MutexGuard aGuard(maMutex);
+ std::scoped_lock aGuard(maMutex);
mpAnchorFrame = pAnchorFrame;
}
@@ -55,7 +56,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleParent() override
{
- osl::MutexGuard aGuard(maMutex);
+ std::scoped_lock aGuard(maMutex);
css::uno::Reference< css::accessibility::XAccessible > xAccParent;
@@ -70,7 +71,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override
{
- osl::MutexGuard aGuard(maMutex);
+ std::scoped_lock aGuard(maMutex);
sal_Int32 nIndex( -1 );
@@ -88,7 +89,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
SwViewShell& mrViewShell;
const SwFrame* mpAnchorFrame;
- ::osl::Mutex maMutex;
+ std::mutex maMutex;
};
}
More information about the Libreoffice-commits
mailing list