diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-03-29 10:25:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-31 11:30:36 +0200 |
| commit | 6439005484bdf6754b910b1ce025b3fb33b6623f (patch) | |
| tree | 1a00f48ae11d3da3d928f2d3d68b3e299216328c /framework | |
| parent | 1aa4df615fa5599d05e9dd5e925b5852676185fa (diff) | |
use SAL_N_ELEMENTS more widely
found using
git grep -n 'sizeof.*/.*sizeof.*[0]'
Change-Id: Icd4a6cc1ca8ec8ebd68e1701a02789c74cf0eb2a
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 6 | ||||
| -rw-r--r-- | framework/source/fwe/xml/toolboxdocumenthandler.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 5f5925873a8a..e3cb6b54f176 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -101,13 +101,13 @@ struct MenuStyleItem const char* attrName; }; -MenuStyleItem MenuItemStyles[ ] = { +const MenuStyleItem MenuItemStyles[ ] = { { css::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE }, { css::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, { css::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } }; -sal_Int32 nMenuStyleItemEntries = (sizeof (MenuItemStyles) / sizeof (MenuItemStyles[0])); +sal_Int32 nMenuStyleItemEntries = SAL_N_ELEMENTS(MenuItemStyles); static void ExtractMenuParameters( const Sequence< PropertyValue >& rProp, OUString& rCommandURL, @@ -904,7 +904,7 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, cons if ( nStyle > 0 ) { OUString aValue; - MenuStyleItem* pStyle = MenuItemStyles; + const MenuStyleItem* pStyle = MenuItemStyles; for ( sal_Int32 nIndex = 0; nIndex < nMenuStyleItemEntries; ++nIndex, ++pStyle ) { diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index c00266227ad4..2fcf4b13385c 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -88,7 +88,7 @@ struct ToolboxStyleItem const char* attrName; }; -ToolboxStyleItem Styles[ ] = { +const ToolboxStyleItem Styles[ ] = { { css::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO }, { css::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT }, { css::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO }, @@ -99,7 +99,7 @@ ToolboxStyleItem Styles[ ] = { { css::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, }; -sal_Int32 nStyleItemEntries = sizeof (Styles) / sizeof (Styles[0]); +sal_Int32 nStyleItemEntries = SAL_N_ELEMENTS(Styles); struct ToolBarEntryProperty { @@ -757,7 +757,7 @@ throw ( SAXException, RuntimeException ) if ( nStyle > 0 ) { OUString aValue; - ToolboxStyleItem* pStyle = Styles; + const ToolboxStyleItem* pStyle = Styles; for ( sal_Int32 nIndex = 0; nIndex < nStyleItemEntries; ++nIndex, ++pStyle ) { |