From 91fe6b97952aa6f7cef58327fd085a17db38ad95 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 15 Apr 2024 11:44:47 +0200
Subject: Merging upstream version 4:24.2.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 sw/source/uibase/docvw/SidebarWinAcc.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'sw/source/uibase/docvw/SidebarWinAcc.cxx')

diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index f489bc140b..3b2b4c758e 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -23,9 +23,9 @@
 #include <viewsh.hxx>
 #include <accmap.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <mutex>
 
 namespace sw::sidebarwindows {
 
@@ -47,7 +47,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 
         void ChangeAnchor( const SwFrame* pAnchorFrame )
         {
-            std::scoped_lock aGuard(maMutex);
+            SolarMutexGuard aGuard;
 
             mpAnchorFrame = pAnchorFrame;
         }
@@ -55,7 +55,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
             getAccessibleParent() override
         {
-            std::scoped_lock aGuard(maMutex);
+            SolarMutexGuard aGuard;
 
             css::uno::Reference< css::accessibility::XAccessible > xAccParent;
 
@@ -70,7 +70,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
 
         virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override
         {
-            std::scoped_lock aGuard(maMutex);
+            SolarMutexGuard aGuard;
 
             sal_Int64 nIndex( -1 );
 
@@ -87,8 +87,6 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent
     private:
         SwViewShell& mrViewShell;
         const SwFrame* mpAnchorFrame;
-
-        std::mutex maMutex;
 };
 
 }
-- 
cgit v1.2.3