diff options
Diffstat (limited to 'fpicker/source/win32/filepicker/controlaccess.cxx')
| -rw-r--r-- | fpicker/source/win32/filepicker/controlaccess.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx index cde1ee52f6..b21fa64e55 100644 --- a/fpicker/source/win32/filepicker/controlaccess.cxx +++ b/fpicker/source/win32/filepicker/controlaccess.cxx @@ -64,14 +64,14 @@ namespace // private CheckboxSetState }; const size_t SIZE_CHECKBOX_SETVALUE_FUNCTION_TABLE = - sizeof( CheckboxSetValueFunctionTable ) / sizeof( CTRL_SETVALUE_FUNCTION_T ); + SAL_N_ELEMENTS( CheckboxSetValueFunctionTable ); CTRL_GETVALUE_FUNCTION_T CheckboxGetValueFunctionTable[] = { CheckboxGetState }; const size_t SIZE_CHECKBOX_GETVALUE_FUNCTION_TABLE = - sizeof( CheckboxGetValueFunctionTable ) / sizeof( CTRL_GETVALUE_FUNCTION_T ); + SAL_N_ELEMENTS( CheckboxGetValueFunctionTable ); CTRL_SETVALUE_FUNCTION_T ListboxSetValueFunctionTable[] = { @@ -83,7 +83,7 @@ namespace // private ListboxSetSelectedItem }; const size_t SIZE_LISTBOX_SETVALUE_FUNCTION_TABLE = - sizeof( ListboxSetValueFunctionTable ) / sizeof( CTRL_SETVALUE_FUNCTION_T ); + SAL_N_ELEMENTS( ListboxSetValueFunctionTable ); CTRL_GETVALUE_FUNCTION_T ListboxGetValueFunctionTable[] = { @@ -98,7 +98,7 @@ namespace // private ListboxGetSelectedItemIndex }; const size_t SIZE_LISTBOX_GETVALUE_ACTION_TABLE = - sizeof( ListboxGetValueFunctionTable ) / sizeof( CTRL_GETVALUE_FUNCTION_T ); + SAL_N_ELEMENTS( ListboxGetValueFunctionTable ); struct _ENTRY { @@ -226,9 +226,10 @@ CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) { CTRL_CLASS aCtrlClass = UNKNOWN; - TCHAR aClassName[256]; + const size_t nClassNameSize = 256; + TCHAR aClassName[nClassNameSize]; - int nRet = GetClassName(hwndCtrl,aClassName,(sizeof(aClassName)/sizeof(TCHAR))); + int nRet = GetClassName(hwndCtrl,aClassName,nClassNameSize); if (nRet) { if (0 == _tcsicmp(aClassName,TEXT("button"))) |