summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/ParseContext.cxx2
-rw-r--r--svx/source/form/datanavi.cxx4
-rw-r--r--svx/source/form/fmPropBrw.cxx4
-rw-r--r--svx/source/form/fmdmod.cxx2
-rw-r--r--svx/source/form/fmpage.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx14
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/form/formcontrolling.cxx4
8 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 1c7a03174cc7..0223e18b9a1a 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -148,7 +148,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::
KEY_COLLECT, KEY_FUSION, KEY_INTERSECTION
};
- sal_uInt32 nCount = SAL_N_ELEMENTS( Intl_TokenID );
+ sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0];
for (sal_uInt32 i = 0; i < nCount; i++)
{
::rtl::OString aKey = getIntlKeywordAscii(Intl_TokenID[i]);
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index bf0710c3770e..ac70be037e9f 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2902,7 +2902,7 @@ namespace svxform
&m_aCalculateBtn
};
Window** pCurrent = pWinsForHide;
- for ( ; i < SAL_N_ELEMENTS( pWinsForHide ); ++i, ++pCurrent )
+ for ( ; i < sizeof( pWinsForHide ) / sizeof( pWinsForHide[ 0 ] ); ++i, ++pCurrent )
(*pCurrent)->Hide();
Window* pWinsForMove[] =
@@ -2910,7 +2910,7 @@ namespace svxform
&m_aButtonsFL, &m_aOKBtn, &m_aEscBtn, &m_aHelpBtn
};
pCurrent = pWinsForMove;
- for ( i = 0; i < SAL_N_ELEMENTS( pWinsForMove ); ++i, ++pCurrent )
+ for ( i = 0; i < sizeof( pWinsForMove ) / sizeof( pWinsForMove[ 0 ] ); ++i, ++pCurrent )
{
Point aNewPos = (*pCurrent)->GetPosPixel();
aNewPos.Y() -= nDelta;
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index a355e819e56d..b55fbdc15a9a 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -300,7 +300,7 @@ FmPropBrw::~FmPropBrw()
, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) )
, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlContext" ) )
, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ) };
- for ( size_t i = 0; i < SAL_N_ELEMENTS(pProps); ++i )
+ for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i )
xName->removeByName( pProps[i] );
}
}
@@ -586,7 +586,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ), makeAny( xControlMap ) )
};
m_xInspectorContext.set(
- ::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ),
+ ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ),
xOwnContext ) );
bool bEnableHelpSection = lcl_shouldEnableHelpSection( m_xORB );
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 13882b6268bb..b6fd672233f2 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -86,7 +86,7 @@ using namespace ::svxform;
FM_SUN_COMPONENT_IMAGECONTROL
};
- static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);
+ static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] );
::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount );
::rtl::OUString* pStrings = aSeq.getArray();
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 7b251b0568db..b6cc1fee03d5 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -201,7 +201,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
INET_PROT_HTTPS, INET_PROT_JAVASCRIPT, INET_PROT_IMAP, INET_PROT_POP3,
INET_PROT_VIM, INET_PROT_LDAP
};
- for (sal_uInt16 i=0; i < SAL_N_ELEMENTS(s_aQuickHelpSupported); ++i)
+ for (sal_uInt16 i=0; i<sizeof(s_aQuickHelpSupported)/sizeof(s_aQuickHelpSupported[0]); ++i)
if (s_aQuickHelpSupported[i] == aProtocol)
{
aHelpText = INetURLObject::decode(aUrl.GetURLNoPass(), '%', INetURLObject::DECODE_UNAMBIGUOUS);
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 648c8572bf9a..9326e6ae868d 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1104,7 +1104,7 @@ PopupMenu* FmXFormShell::GetConversionMenu()
PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
ImageList aImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL) );
- for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i )
+ for ( size_t i = 0; i < sizeof (nConvertSlots) / sizeof (nConvertSlots[0]); ++i )
{
// das entsprechende Image dran
pNewMenu->SetItemImage(nConvertSlots[i], aImageList.GetImage(nCreateSlots[i]));
@@ -1116,7 +1116,7 @@ PopupMenu* FmXFormShell::GetConversionMenu()
//------------------------------------------------------------------------------
bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
{
- for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i )
+ for ( size_t i = 0; i < sizeof (nConvertSlots) / sizeof (nConvertSlots[0]); ++i )
if (nConvertSlots[i] == nSlotId)
return true;
return false;
@@ -1152,7 +1152,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
OSL_ENSURE( isSolelySelected( _rxObject ),
"FmXFormShell::executeControlConversionSlot: hmm ... shouldn't this parameter be redundant?" );
- for ( size_t lookupSlot = 0; lookupSlot < SAL_N_ELEMENTS( nConvertSlots ); ++lookupSlot )
+ for ( size_t lookupSlot = 0; lookupSlot < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++lookupSlot )
{
if (nConvertSlots[lookupSlot] == _nSlotId)
{
@@ -1367,10 +1367,10 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo
)
return false; // those types cannot be converted
- DBG_ASSERT(SAL_N_ELEMENTS(nConvertSlots) == SAL_N_ELEMENTS(nObjectTypes),
+ DBG_ASSERT(sizeof(nConvertSlots)/sizeof(nConvertSlots[0]) == sizeof(nObjectTypes)/sizeof(nObjectTypes[0]),
"FmXFormShell::canConvertCurrentSelectionToControl: nConvertSlots & nObjectTypes must have the same size !");
- for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i )
+ for ( size_t i = 0; i < sizeof( nConvertSlots ) / sizeof( nConvertSlots[0] ); ++i )
if (nConvertSlots[i] == nConversionSlot)
return nObjectTypes[i] != nObjectType;
@@ -2111,7 +2111,7 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
impl_updateCurrentForm( xNewCurrentForm );
// ensure some slots are updated
- for ( size_t i = 0; i < SAL_N_ELEMENTS( SelObjectSlotMap ); ++i )
+ for ( size_t i = 0; i < sizeof( SelObjectSlotMap ) / sizeof( SelObjectSlotMap[0] ); ++i )
InvalidateSlot( SelObjectSlotMap[i], sal_False);
return true;
@@ -2151,7 +2151,7 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo
pPage->GetImpl().setCurForm( m_xCurrentForm );
// ensure the UI which depends on the current form is up-to-date
- for ( size_t i = 0; i < SAL_N_ELEMENTS( DlgSlotMap ); ++i )
+ for ( size_t i = 0; i < sizeof( DlgSlotMap ) / sizeof( DlgSlotMap[0] ); ++i )
InvalidateSlot( DlgSlotMap[i], sal_False );
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 9c8d9658fb22..72834cee1fd4 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -571,8 +571,8 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME,
FM_PROP_VALUE, FM_PROP_SELECT_SEQ, FM_PROP_EFFECTIVE_VALUE
};
- sal_Int32 nDefaultValueProps = SAL_N_ELEMENTS(pDefaultValueProperties);
- OSL_ENSURE(SAL_N_ELEMENTS(aValueProperties) == nDefaultValueProps,
+ sal_Int32 nDefaultValueProps = sizeof(pDefaultValueProperties)/sizeof(pDefaultValueProperties[0]);
+ OSL_ENSURE(sizeof(aValueProperties)/sizeof(aValueProperties[0]) == nDefaultValueProps,
"FmXUndoEnvironment::propertyChange: inconsistence!");
for (sal_Int32 i=0; i<nDefaultValueProps; ++i)
{
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 35e87b547ce1..b3ed12601c6b 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -120,7 +120,7 @@ namespace svx
{ FMURL_FORM_APPLY_FILTER, SID_FM_FORM_FILTERED, FormFeature::ToggleApplyFilter },
{ FMURL_FORM_REMOVE_FILTER, SID_FM_REMOVE_FILTER_SORT, FormFeature::RemoveFilterAndSort }
};
- for ( size_t i=0; i < SAL_N_ELEMENTS(aDescriptions); ++i )
+ for ( size_t i=0; i<sizeof(aDescriptions)/sizeof(aDescriptions[0]); ++i )
s_aFeatureDescriptions.push_back( aDescriptions[i] );
}
};
@@ -468,7 +468,7 @@ namespace svx
SID_FM_FILTER_START,
SID_FM_VIEW_AS_GRID
};
- sal_Int32 nFeatureCount = SAL_N_ELEMENTS( pSupportedFeatures );
+ sal_Int32 nFeatureCount = sizeof( pSupportedFeatures ) / sizeof( pSupportedFeatures[ 0 ] );
aSupportedFeatures.resize( nFeatureCount );
::std::copy( pSupportedFeatures, pSupportedFeatures + nFeatureCount, aSupportedFeatures.begin() );
generated by cgit (git 2.34.1) at 2024-07-13 14:27:16 +0000