summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorArnaud Versini <arnaud.versini@gmail.com>2016-12-18 15:48:45 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-10 06:42:37 +0000
commit841f48fcb5431b241eca406209cd67df9dccd9ec (patch)
treeb86cd9a4fc7862712c9eee65aef7630c34c7c01b /accessibility
parent56d071c10ca8016848f1f059aa3eb197fe928844 (diff)
accessibility: prevent possible deadlock
Change-Id: I1dc409644ed2e2bdd0cd38c8343c4ada1af7127b Reviewed-on: https://gerrit.libreoffice.org/32137 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index e9fc495a67b1..2f706338a75c 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -50,7 +50,8 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
*/
::utl::AccessibleStateSetHelper* AccessibleBrowseBoxHeaderCell::implCreateStateSetHelper()
{
- ::osl::MutexGuard aGuard( getMutex() );
+ SolarMethodGuard aGuard( getMutex() );
+
::utl::AccessibleStateSetHelper*
pStateSetHelper = new ::utl::AccessibleStateSetHelper;
@@ -60,7 +61,6 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR
if( implIsShowing() )
pStateSetHelper->AddState( AccessibleStateType::SHOWING );
- SolarMutexGuard aSolarGuard;
mpBrowseBox->FillAccessibleStateSet( *pStateSetHelper, getType() );
pStateSetHelper->AddState( AccessibleStateType::VISIBLE );
pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE );