diff options
| author | David Tardon <dtardon@redhat.com> | 2011-01-02 13:07:07 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-01-14 15:58:28 +0100 |
| commit | 06c08a36bc7961b33dbb7bb55c197f5fa9c9b6c8 (patch) | |
| tree | d204a330d04d0adf0eff417d05326de217d4674f /fpicker | |
| parent | b2015dfa3600594460e3b7c4b510f1dbf011c131 (diff) | |
use SAL_N_ELEMENTS to compute array size
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/resourceprovider.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/unx/gnome/resourceprovider.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/win32/filepicker/controlaccess.cxx | 8 | ||||
| -rw-r--r-- | fpicker/source/win32/misc/resourceprovider.cxx | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx index 7c6b651d30..8681492be3 100644 --- a/fpicker/source/aqua/resourceprovider.cxx +++ b/fpicker/source/aqua/resourceprovider.cxx @@ -95,8 +95,8 @@ _Entry OtherCtrlIdToResIdTable[] = { }; -const sal_Int32 SIZE_TABLE = sizeof( CtrlIdToResIdTable ) / sizeof( _Entry ); -const sal_Int32 OTHER_SIZE_TABLE = sizeof( OtherCtrlIdToResIdTable ) / sizeof( _Entry ); +const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); +const sal_Int32 OTHER_SIZE_TABLE = SAL_N_ELEMENTS( OtherCtrlIdToResIdTable ); //------------------------------------------------------------ // diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx index 86daf325d6..0f86159530 100644 --- a/fpicker/source/unx/gnome/resourceprovider.cxx +++ b/fpicker/source/unx/gnome/resourceprovider.cxx @@ -94,8 +94,8 @@ _Entry OtherCtrlIdToResIdTable[] = { }; -const sal_Int32 SIZE_TABLE = sizeof( CtrlIdToResIdTable ) / sizeof( _Entry ); -const sal_Int32 OTHER_SIZE_TABLE = sizeof( OtherCtrlIdToResIdTable ) / sizeof( _Entry ); +const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); +const sal_Int32 OTHER_SIZE_TABLE = SAL_N_ELEMENTS( OtherCtrlIdToResIdTable ); //------------------------------------------------------------ // diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx index cde1ee52f6..723b08cf5e 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 { diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 4b500d7d04..9e46dc010f 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -85,7 +85,7 @@ _Entry CtrlIdToResIdTable[] = { { FOLDER_PICKER_DEF_DESCRIPTION, STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION } }; -const sal_Int32 SIZE_TABLE = sizeof( CtrlIdToResIdTable ) / sizeof( _Entry ); +const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); //------------------------------------------------------------ // |