diff options
Diffstat (limited to 'winaccessibility')
-rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 4 | ||||
-rw-r--r-- | winaccessibility/source/service/AccObject.cxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 74a6518c8c01..ce2a303b6142 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -22,6 +22,8 @@ #include "MAccessible.h" #include <algorithm> +#include <cstddef> + #include "AccAction.h" #include "AccRelation.h" #include "AccComponent.h" @@ -3063,7 +3065,7 @@ STDMETHODIMP CMAccessible:: get_states(AccessibleStates __RPC_FAR *states ) *states = 0x0; for( int i = 0; i < count; i++ ) { - for( int j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ ) + for( std::size_t j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ ) { if( pStates[i] == UNO_STATES[j] ) { diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index 8b60ddf412fd..47118d59c01f 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -800,8 +800,8 @@ void AccObject::UpdateRole() XAccessibleContext* pContext = m_xAccContextRef.get(); m_pIMAcc->Put_XAccRole( ROLE_SYSTEM_WINDOW ); - short iRoleIndex = pContext->getAccessibleRole(); - if ((0 <= iRoleIndex) && (iRoleIndex < SAL_N_ELEMENTS(ROLE_TABLE))) + sal_Int16 iRoleIndex = pContext->getAccessibleRole(); + if ((0 <= iRoleIndex) && (sal_uInt16(iRoleIndex) < SAL_N_ELEMENTS(ROLE_TABLE))) { short iIA2Role = ROLE_TABLE[iRoleIndex][1] ; m_pIMAcc->Put_XAccRole( iIA2Role ); |