winaccessibility/source/UAccCOM/MAccessible.cxx | 36 ++++++++++++------------
winaccessibility/source/service/AccObject.cxx | 19 +++++-------
2 files changed, 26 insertions(+), 29 deletions(-)
New commits:
commit d84c06577f3198d6c6bd05176429724897d918e6
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jan 5 15:32:06 2022 +0000
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jan 6 10:11:21 2022 +0100
wina11y: Don't use space in qualified name
While 'MyClass:: MyMethod' (with a space in it) is valid in C++,
it's unusual and may break a naive plain-text search for
a specific class member definition.
Change-Id: I8c9779865715a0b4f1a66d3e35b874f2cec19193
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128016
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index c905cc82b875..495f8b49f196 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1802,7 +1802,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::role(long
__RPC_FAR *role)
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_nActions(long __RPC_FAR
*nActions)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_nActions(long __RPC_FAR
*nActions)
{
SolarMutexGuard g;
@@ -1833,12 +1833,12 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_nActions(long __RPC_FAR *nA
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: scrollToPoint(enum
IA2CoordinateType, long, long)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::scrollToPoint(enum
IA2CoordinateType, long, long)
{
return E_NOTIMPL;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: scrollTo(enum IA2ScrollType)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::scrollTo(enum IA2ScrollType)
{
return E_NOTIMPL;
}
@@ -1865,7 +1865,7 @@ static XAccessible* getTheParentOfMember(XAccessible*
pXAcc)
return nullptr;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_groupPosition(long
__RPC_FAR *groupLevel,long __RPC_FAR *similarItemsInGroup,long __RPC_FAR
*positionInGroup)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long
__RPC_FAR *groupLevel,long __RPC_FAR *similarItemsInGroup,long __RPC_FAR
*positionInGroup)
{
SolarMutexGuard g;
@@ -2041,13 +2041,13 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_groupPosition(long __RPC_FA
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_extendedStates( long,
BSTR __RPC_FAR *__RPC_FAR *, long __RPC_FAR *)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_extendedStates(long, BSTR
__RPC_FAR *__RPC_FAR *, long __RPC_FAR *)
{
return E_NOTIMPL;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_uniqueID(long __RPC_FAR
*uniqueID)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_uniqueID(long __RPC_FAR
*uniqueID)
{
SolarMutexGuard g;
@@ -2064,7 +2064,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_uniqueID(long __RPC_FAR *un
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_windowHandle(HWND
__RPC_FAR *windowHandle)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_windowHandle(HWND
__RPC_FAR *windowHandle)
{
SolarMutexGuard g;
@@ -3001,7 +3001,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::Get_XAccChildID(long* childID)
return S_OK;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_states(AccessibleStates
__RPC_FAR *states )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_states(AccessibleStates
__RPC_FAR *states)
{
SolarMutexGuard g;
@@ -3040,29 +3040,29 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_states(AccessibleStates __R
}
// return the UNO roles
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_extendedRole( BSTR
__RPC_FAR * )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_extendedRole(BSTR
__RPC_FAR *)
{
return E_NOTIMPL;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_localizedExtendedRole(
BSTR __RPC_FAR * )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_localizedExtendedRole(BSTR
__RPC_FAR *)
{
return E_NOTIMPL;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_nExtendedStates( long
__RPC_FAR * )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_nExtendedStates(long
__RPC_FAR *)
{
return E_NOTIMPL;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_localizedExtendedStates(
long, BSTR __RPC_FAR *__RPC_FAR *, long __RPC_FAR *)
+COM_DECLSPEC_NOTHROW STDMETHODIMP
CMAccessible::get_localizedExtendedStates(long, BSTR __RPC_FAR *__RPC_FAR *,
long __RPC_FAR *)
{
return E_NOTIMPL;
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_indexInParent( long
__RPC_FAR *accParentIndex)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_indexInParent(long
__RPC_FAR *accParentIndex)
{
ENTER_PROTECTED_BLOCK
ISDESTROY()
@@ -3079,7 +3079,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_indexInParent( long __RPC_F
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_locale( IA2Locale
__RPC_FAR *locale )
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_locale( IA2Locale
__RPC_FAR *locale )
{
ENTER_PROTECTED_BLOCK
ISDESTROY()
@@ -3099,7 +3099,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_locale( IA2Locale __RPC_FAR
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_appName( BSTR __RPC_FAR
*name)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_appName(BSTR __RPC_FAR
*name)
{
SolarMutexGuard g;
@@ -3112,7 +3112,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_appName( BSTR __RPC_FAR *na
return S_OK;
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_appVersion(BSTR __RPC_FAR
*version)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_appVersion(BSTR __RPC_FAR
*version)
{
SolarMutexGuard g;
@@ -3124,7 +3124,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_appVersion(BSTR __RPC_FAR *
return S_OK;
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_toolkitName(BSTR
__RPC_FAR *name)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_toolkitName(BSTR __RPC_FAR
*name)
{
SolarMutexGuard g;
@@ -3136,7 +3136,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::
get_toolkitName(BSTR __RPC_FAR
return S_OK;
LEAVE_PROTECTED_BLOCK
}
-COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_toolkitVersion(BSTR
__RPC_FAR *version)
+COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_toolkitVersion(BSTR
__RPC_FAR *version)
{
SolarMutexGuard g;
diff --git a/winaccessibility/source/service/AccObject.cxx
b/winaccessibility/source/service/AccObject.cxx
index a9ed6c87a104..87556090941f 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -968,7 +968,7 @@ void AccObject::UpdateLocation()
* @param
* @return If the method is correctly processed.
*/
-bool AccObject:: UpdateAccessibleInfoFromUnoToMSAA ( )
+bool AccObject::UpdateAccessibleInfoFromUnoToMSAA()
{
if( nullptr == m_pIMAcc || !m_xAccContextRef.is() )
{
commit 9cbd17314f4e4c04dc5e912bdb2030daddcd2f75
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Jan 5 14:49:24 2022 +0000
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Jan 6 10:11:08 2022 +0100
wina11y: Use range-based for in AccObject::UpdateState
Change-Id: I29793e63ddc040ccbae99012090e975bd80cafc3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128011
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/source/service/AccObject.cxx
b/winaccessibility/source/service/AccObject.cxx
index cbda17fa3e77..a9ed6c87a104 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -786,28 +786,25 @@ void AccObject::UpdateState()
return;
}
- Sequence<short> pStates = pRState->getStates();
- int count = pStates.getLength();
-
bool isEnable = false;
bool isShowing = false;
bool isEditable = false;
bool isVisible = false;
bool isFocusable = false;
- for( int iIndex = 0;iIndex < count;iIndex++ )
+ for (const sal_Int16 nState : pRState->getStates())
{
- if( pStates[iIndex] == ENABLED )
+ if (nState == ENABLED)
isEnable = true;
- else if( pStates[iIndex] == SHOWING)
+ else if (nState == SHOWING)
isShowing = true;
- else if( pStates[iIndex] == VISIBLE)
+ else if (nState == VISIBLE)
isVisible = true;
- else if( pStates[iIndex] == EDITABLE )
+ else if (nState == EDITABLE)
isEditable = true;
- else if (pStates[iIndex] == FOCUSABLE)
+ else if (nState == FOCUSABLE)
isFocusable = true;
- IncreaseState( pStates[iIndex]);
+ IncreaseState(nState);
}
bool bIsMenuItem = m_accRole == MENU_ITEM || m_accRole == RADIO_MENU_ITEM
|| m_accRole == CHECK_MENU_ITEM;
