Kaydet (Commit) 9f3e8cb4 authored tarafından Arnaud Versini's avatar Arnaud Versini Kaydeden (comit) Noel Grandin

accessibility : remove useless guards and optimisze a litle

Change-Id: I1162f364d948b73b943fb973222103772fffddc3
Reviewed-on: https://gerrit.libreoffice.org/53629Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 5b77e676
...@@ -839,14 +839,20 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) ...@@ -839,14 +839,20 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( )
OExternalLockGuard aGuard( this ); OExternalLockGuard aGuard( this );
sal_Int32 nRet = 0; sal_Int32 nRet = 0;
for ( sal_Int32 i = 0, nCount = implGetAccessibleChildCount(); i < nCount; i++ ) VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
if (pToolBox)
{
sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
for ( size_t i = 0, nCount = pToolBox->GetItemCount(); i < nCount; i++ )
{ {
if ( isAccessibleChildSelected( i ) ) if ( nHighlightItemId == pToolBox->GetItemId( i ) )
{ {
nRet = 1; nRet = 1;
break; // a toolbox can only have (n)one selected child break; // a toolbox can only have (n)one selected child
} }
} }
}
return nRet; return nRet;
} }
...@@ -857,14 +863,20 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_ ...@@ -857,14 +863,20 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_
throw IndexOutOfBoundsException(); throw IndexOutOfBoundsException();
Reference< XAccessible > xChild; Reference< XAccessible > xChild;
for ( sal_Int32 i = 0, nCount = implGetAccessibleChildCount(); i < nCount; i++ ) VclPtr< ToolBox > pToolBox = GetAs< ToolBox >();
if (pToolBox)
{
sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
for ( sal_Int32 i = 0, nCount = pToolBox->GetItemCount(); i < nCount; i++ )
{ {
if ( isAccessibleChildSelected( i ) ) if ( nHighlightItemId == pToolBox->GetItemId( i ) )
{ {
xChild = getAccessibleChild( i ); xChild = getAccessibleChild( i );
break; break;
} }
} }
}
if (!xChild) if (!xChild)
throw IndexOutOfBoundsException(); throw IndexOutOfBoundsException();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment