mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wina11y: Drop "using namespace css:accessibility::AccessibleRole"

Browse Source 
And while at it, also replace the local variable that holds
the role with 2 `sal_Int16` ones adhering to our naming scheme
instead of calling it "Role".

Change-Id: Ia49cfd23f919098eaea929601c4c432be3fcfe63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159383
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2023-11-13 15:54:06 +01:00
parent d6c6472bbe
commit 4ae31181cd
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
winaccessibility/source/UAccCOM/MAccessible.cxx
View File

@@ -188,9 +188,6 @@ void lcl_addIA2State(AccessibleStates& rStates, sal_Int64 nUnoState, sal_Int16 n
} }
using namespace com::sun::star::accessibility::AccessibleRole;
AccObjectWinManager* CMAccessible::g_pAccObjectManager = nullptr; AccObjectWinManager* CMAccessible::g_pAccObjectManager = nullptr;
CMAccessible::CMAccessible(): CMAccessible::CMAccessible():
@@ -1822,14 +1819,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR
m_xAccessible->getAccessibleContext(); m_xAccessible->getAccessibleContext();
if(!pRContext.is()) if(!pRContext.is())
return E_FAIL; return E_FAIL;
long Role = pRContext->getAccessibleRole(); const sal_Int16 nRole = pRContext->getAccessibleRole();
*groupLevel = 0; *groupLevel = 0;
*similarItemsInGroup = 0; *similarItemsInGroup = 0;
*positionInGroup = 0; *positionInGroup = 0;
if (Role != AccessibleRole::DOCUMENT && Role != AccessibleRole::DOCUMENT_PRESENTATION && if (nRole != AccessibleRole::DOCUMENT && nRole != AccessibleRole::DOCUMENT_PRESENTATION &&
Role != AccessibleRole::DOCUMENT_SPREADSHEET && Role != AccessibleRole::DOCUMENT_TEXT) nRole != AccessibleRole::DOCUMENT_SPREADSHEET && nRole != AccessibleRole::DOCUMENT_TEXT)
{ {
Reference< XAccessibleGroupPosition > xGroupPosition( pRContext, UNO_QUERY ); Reference< XAccessibleGroupPosition > xGroupPosition( pRContext, UNO_QUERY );
if ( xGroupPosition.is() ) if ( xGroupPosition.is() )
@@ -1854,7 +1851,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR
Reference<XAccessibleContext> pRParentContext = pParentAcc->getAccessibleContext(); Reference<XAccessibleContext> pRParentContext = pParentAcc->getAccessibleContext();
if( Role == RADIO_BUTTON ) if (nRole == AccessibleRole::RADIO_BUTTON)
{ {
int index = 0; int index = 0;
int number = 0; int number = 0;
@@ -1874,7 +1871,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR
{ {
if( getTheParentOfMember(pRParentContext->getAccessibleChild(j).get()) if( getTheParentOfMember(pRParentContext->getAccessibleChild(j).get())
== static_cast<XAccessible*>(pRAcc.get()) && == static_cast<XAccessible*>(pRAcc.get()) &&
pRParentContext->getAccessibleChild(j)->getAccessibleContext()->getAccessibleRole() == RADIO_BUTTON) pRParentContext->getAccessibleChild(j)->getAccessibleContext()->getAccessibleRole() == AccessibleRole::RADIO_BUTTON)
number++; number++;
if (pRParentContext->getAccessibleChild(j).get() == m_xAccessible.get()) if (pRParentContext->getAccessibleChild(j).get() == m_xAccessible.get())
index = number; index = number;
@@ -1887,7 +1884,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR
return S_OK; return S_OK;
} }
else if ( COMBO_BOX == Role ) else if (nRole == AccessibleRole::COMBO_BOX)
{ {
*groupLevel = 1; *groupLevel = 1;
*similarItemsInGroup = 0; *similarItemsInGroup = 0;
@@ -1935,7 +1932,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR
} }
return S_OK; return S_OK;
} }
else if ( PAGE_TAB == Role ) else if (nRole == AccessibleRole::PAGE_TAB)
{ {
*groupLevel = 1; *groupLevel = 1;
sal_Int64 nChildCount = pRParentContext->getAccessibleChildCount(); sal_Int64 nChildCount = pRParentContext->getAccessibleChildCount();
@@ -1958,8 +1955,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR
{ {
level++; level++;
pRParentContext = pParentAcc->getAccessibleContext(); pRParentContext = pParentAcc->getAccessibleContext();
Role = pRParentContext->getAccessibleRole(); const sal_Int16 nParentRole = pRParentContext->getAccessibleRole();
if( (Role == TREE) || (Role == LIST) ) if ((nParentRole == AccessibleRole::TREE) || (nParentRole == AccessibleRole::LIST))
isFound = true; isFound = true;
pParentAcc = pRParentContext->getAccessibleParent(); pParentAcc = pRParentContext->getAccessibleParent();
} }