diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-03 21:00:37 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-13 19:47:41 +0100 |
| commit | cf861f5ff9cd54c1d4541406070c598c89f51d17 (patch) | |
| tree | bb515fc3ba35c967cfb675350db4d31b9ab409e2 /winaccessibility | |
| parent | ec3cbe98c3aad0ca1d435ea8eccab2eced4b6f86 (diff) | |
winaccessibility: use SAL_N_ELEMENTS
Change-Id: I479117e0794375f1ec0c96b78db22b3569b456ec
(cherry picked from commit a5c7ed21584b024d52d32917d1b07462a00e7405)
Diffstat (limited to 'winaccessibility')
| -rw-r--r-- | winaccessibility/source/UAccCOM/AccActionBase.cxx | 3 | ||||
| -rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 2 | ||||
| -rw-r--r-- | winaccessibility/source/UAccCOM/acccommon.h | 4 | ||||
| -rw-r--r-- | winaccessibility/source/service/AccObject.cxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/winaccessibility/source/UAccCOM/AccActionBase.cxx b/winaccessibility/source/UAccCOM/AccActionBase.cxx index 982e58f21677..d23b12659659 100644 --- a/winaccessibility/source/UAccCOM/AccActionBase.cxx +++ b/winaccessibility/source/UAccCOM/AccActionBase.cxx @@ -334,6 +334,7 @@ OLECHAR* CAccActionBase::getOLECHARFromKeyCode(long key) } map[] = { +#define CODEENTRY(key) {KEYCODE_##key, L#key} {MODIFIER_SHIFT, L"SHIFT" }, {MODIFIER_CTRL, L"CTRL" }, {MODIFIER_ALT, L"ALT" }, @@ -386,7 +387,7 @@ OLECHAR* CAccActionBase::getOLECHARFromKeyCode(long key) { KEYCODE_CONTEXTMENU, L"CONTEXTMENU" }, { KEYCODE_HELP, L"HELP" }, }; - static long nCount = countof(map); + static long nCount = SAL_N_ELEMENTS(map); long min = 0; long max = nCount-1; diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index dbe23c0b7a1f..22c9e18148ad 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -3098,7 +3098,7 @@ STDMETHODIMP CMAccessible:: get_states(AccessibleStates __RPC_FAR *states ) *states = 0x0; for( int i = 0; i < count; i++ ) { - for( int j = 0; j < sizeof(UNO_STATES) / sizeof(UNO_STATES[0]); j++ ) + for( int j = 0; j < SAL_N_ELEMENTS(UNO_STATES); j++ ) { if( pStates[i] == UNO_STATES[j] ) { diff --git a/winaccessibility/source/UAccCOM/acccommon.h b/winaccessibility/source/UAccCOM/acccommon.h index 9ca1382c8e30..9dc336a58632 100644 --- a/winaccessibility/source/UAccCOM/acccommon.h +++ b/winaccessibility/source/UAccCOM/acccommon.h @@ -63,10 +63,6 @@ inline BOOL ImplIsEqualGUID(REFGUID rguid1, REFGUID rguid2) #define InlineIsEqualGUID ImplIsEqualGUID //End -//for AccAction.cxx -#define CODEENTRY(key) \ - {KEYCODE_##key, L#key} -#define countof(x) (sizeof(x)/sizeof(x[0])) #define SELECT L"Select" #define PRESS L"Press" diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index b8ea002f57b1..47998877da9b 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -792,7 +792,7 @@ void AccObject::UpdateRole() XAccessibleContext* pContext = m_xAccContextRef.get(); m_pIMAcc->Put_XAccRole( ROLE_SYSTEM_WINDOW ); short iRoleIndex = pContext->getAccessibleRole(); - if (( 0 <= iRoleIndex) && ( iRoleIndex <= (sizeof(ROLE_TABLE)/(sizeof(short)*2)))) + if ((0 <= iRoleIndex) && (iRoleIndex < SAL_N_ELEMENTS(ROLE_TABLE))) { short iIA2Role = ROLE_TABLE[iRoleIndex][1] ; m_pIMAcc->Put_XAccRole( iIA2Role ); |