winaccessibility: use SAL_N_ELEMENTS

Change-Id: I479117e0794375f1ec0c96b78db22b3569b456ec

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;

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] )
             {

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"

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  );