diff options
| author | Kayo Hamid <revol.code@yahoo.com> | 2010-10-14 21:14:52 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-14 21:15:24 +0100 |
| commit | b7c82daa28526c566047e158ab2ace522fc442dc (patch) | |
| tree | c71f33ee622add8de9013a170a7463ed564ad6e8 /framework | |
| parent | 1b0c6da1c3bcc6a9c1412d221d029885f9998fa1 (diff) | |
Switch to use SAL_N_ELEMENTS macro, everywhere
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/backingwindow.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 6 | ||||
| -rw-r--r-- | framework/source/xml/menudocumenthandler.cxx | 2 | ||||
| -rw-r--r-- | framework/source/xml/toolboxdocumenthandler.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index f132e263a5fb..d46a536d2433 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -684,7 +684,7 @@ void BackingWindow::layoutButton( long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() ); nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side - if( nColumn >= 0 && nColumn < static_cast<int>(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) ) + if( nColumn >= 0 && nColumn < static_cast<int>(SAL_N_ELEMENTS(mnColumnWidth)) ) { if( nTextWidth > mnColumnWidth[nColumn] ) mnColumnWidth[nColumn] = nTextWidth; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 166bb11ff69a..ebcf9cc82a50 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -240,7 +240,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) if ( pResMgr->IsAvailable( aResId )) { ImageList aImageList( aResId ); - for ( sal_uInt32 i=0; i < sizeof(nConvertSlots)/sizeof(nConvertSlots[0]); ++i ) + for ( sal_uInt32 i=0; i < SAL_N_ELEMENTS(nConvertSlots); ++i ) { // das entsprechende Image dran if ( m_bShowMenuImages ) @@ -291,7 +291,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve osl::ResettableMutexGuard aLock( m_aMutex ); USHORT nMenuId = 0; - for (sal_uInt32 i=0; i < sizeof(aCommands)/sizeof(aCommands[0]); ++i) + for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i) { if ( Event.FeatureURL.Complete.equalsAscii( aCommands[i] )) { @@ -417,7 +417,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: fillPopupMenu( m_xPopupMenu ); m_aURLToDispatchMap.free(); - for (sal_uInt32 i=0; i<sizeof(aCommands)/sizeof(aCommands[0]); ++i) + for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i) { aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] ); m_xURLTransformer->parseStrict( aTargetURL ); diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx index 38506b042f63..bfc4acd04450 100644 --- a/framework/source/xml/menudocumenthandler.cxx +++ b/framework/source/xml/menudocumenthandler.cxx @@ -140,7 +140,7 @@ MenuStyleItem MenuItemStyles[ ] = { }; -sal_Int32 nMenuStyleItemEntries = sizeof( MenuItemStyles ) / sizeof( MenuItemStyles[ 0 ] ); +sal_Int32 nMenuStyleItemEntries = SAL_N_ELEMENTS( MenuItemStyles ); static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, ::rtl::OUString& rCommandURL, diff --git a/framework/source/xml/toolboxdocumenthandler.cxx b/framework/source/xml/toolboxdocumenthandler.cxx index a9244bdece5e..fa799b4e2f57 100644 --- a/framework/source/xml/toolboxdocumenthandler.cxx +++ b/framework/source/xml/toolboxdocumenthandler.cxx @@ -135,7 +135,7 @@ ToolboxStyleItem Styles[ ] = { { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, }; -sal_Int32 nStyleItemEntries = sizeof( Styles ) / sizeof( Styles[ 0 ] ); +sal_Int32 nStyleItemEntries = SAL_N_ELEMENTS( Styles ); struct ToolBarEntryProperty { |