accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 841f48fcb5431b241eca406209cd67df9dccd9ec Author: Arnaud Versini <[email protected]> Date: Sun Dec 18 15:48:45 2016 +0100 accessibility: prevent possible deadlock Change-Id: I1dc409644ed2e2bdd0cd38c8343c4ada1af7127b Reviewed-on: https://gerrit.libreoffice.org/32137 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index e9fc495..2f70633 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 ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
