strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some cppcheck cleaning

Browse source
This commit is contained in:
Julien Nabet 2011-05-08 14:31:03 +02:00
parent 61b5d347d8
commit b21661ce42
5 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
framework/source/lomenubar/MenuItemInfo.cxx
View file

@ -73,31 +73,31 @@ MenuItemInfo::setVisible (gboolean is_visible)
//Getters
gchar*
MenuItemInfo::getLabel ()
MenuItemInfo::getLabel const()
{
return m_label;
}
gboolean
MenuItemInfo::getEnabled ()
MenuItemInfo::getEnabled const()
{
return m_is_enabled;
}
gint
MenuItemInfo::getCheckState ()
MenuItemInfo::getCheckState const()
{
return m_check_state;
}
const gchar*
MenuItemInfo::getCheckType ()
MenuItemInfo::getCheckType const()
{
return m_check_type;
}
gboolean
MenuItemInfo::getVisible ()
MenuItemInfo::getVisible const()
{
return m_is_visible;
}

10
framework/source/lomenubar/MenuItemInfo.hxx
View file

@ -45,10 +45,10 @@ class MenuItemInfo {
void setVisible (gboolean is_visible);
//Getters
gchar* getLabel ();
gboolean getEnabled ();
gint getCheckState ();
const gchar* getCheckType ();
gboolean getVisible ();
gchar* getLabel const();
gboolean getEnabled const();
gint getCheckState const();
const gchar* getCheckType const();
gboolean getVisible const();
};
#endif // __MENU_ITEM_INFO_HXX__

26
scripting/source/stringresource/stringresource.cxx
View file

@ -123,13 +123,13 @@ StringResourceImpl::StringResourceImpl( const Reference< XComponentContext >& rx
StringResourceImpl::~StringResourceImpl()
{
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
delete pLocaleItem;
}
for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != m_aDeletedLocaleItemVector.end(); it++ )
for( LocaleItemVectorIt it = m_aDeletedLocaleItemVector.begin(); it != m_aDeletedLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
delete pLocaleItem;
@ -326,7 +326,7 @@ Sequence< Locale > StringResourceImpl::getLocales( )
Sequence< Locale > aLocalSeq( nSize );
Locale* pLocales = aLocalSeq.getArray();
int iTarget = 0;
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
pLocales[iTarget] = pLocaleItem->m_locale;
@ -566,7 +566,7 @@ void StringResourceImpl::removeLocale( const Locale& locale )
if( m_pCurrentLocaleItem == pRemoveItem ||
m_pDefaultLocaleItem == pRemoveItem )
{
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != pRemoveItem )
@ -586,7 +586,7 @@ void StringResourceImpl::removeLocale( const Locale& locale )
}
}
}
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem == pRemoveItem )
@ -666,7 +666,7 @@ LocaleItem* StringResourceImpl::getItemForLocale
LocaleItem* pRetItem = NULL;
// Search for locale
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem )
@ -699,7 +699,7 @@ LocaleItem* StringResourceImpl::getClosestMatchItemForLocale( const Locale& loca
// Search for locale
for( sal_Int32 iPass = 0 ; iPass <= 2 ; ++iPass )
{
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem )
@ -1058,7 +1058,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
}
}
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != NULL && (bStoreAll || pLocaleItem->m_bModified) &&
@ -1097,7 +1097,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage
if( bUsedForStore )
{
for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin();
it != m_aChangedDefaultLocaleVector.end(); it++ )
it != m_aChangedDefaultLocaleVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != NULL )
@ -1196,7 +1196,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles
{
// Delete files for changed defaults
for( LocaleItemVectorIt it = m_aChangedDefaultLocaleVector.begin();
it != m_aChangedDefaultLocaleVector.end(); it++ )
it != m_aChangedDefaultLocaleVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != NULL )
@ -1228,7 +1228,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation
if( bUsedForStore || bKillAll )
implKillRemovedLocaleFiles( Location, aNameBase, xFileAccess );
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != NULL && (bStoreAll || bKillAll || pLocaleItem->m_bModified) &&
@ -1431,7 +1431,7 @@ Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( )
sal_Int32 iLocale = 0;
sal_Int32 iDefault = 0;
for( LocaleItemVectorConstIt it = m_aLocaleItemVector.begin();
it != m_aLocaleItemVector.end(); it++,iLocale++ )
it != m_aLocaleItemVector.end(); ++it,++iLocale )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != NULL && loadLocale( pLocaleItem ) )
@ -1740,7 +1740,7 @@ bool checkNamingSceme( const ::rtl::OUString& aName, const ::rtl::OUString& aNam
void StringResourcePersistenceImpl::implLoadAllLocales( void )
{
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); it++ )
for( LocaleItemVectorIt it = m_aLocaleItemVector.begin(); it != m_aLocaleItemVector.end(); ++it )
{
LocaleItem* pLocaleItem = *it;
if( pLocaleItem != NULL )

2
sfx2/source/appl/lnkbase2.cxx
View file

@ -630,7 +630,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt )
for( int i = 0; i < 2; ++i )
{
for( std::vector<DdeTopic*>::iterator iterTopic = rTopics.begin();
iterTopic != rTopics.end(); iterTopic++ )
iterTopic != rTopics.end(); ++iterTopic )
if( (*iterTopic)->GetName() == sTopic )
return *iterTopic;

4
sfx2/source/dialog/filtergrouping.cxx
View file

@ -1093,7 +1093,7 @@ namespace sfx2
if ( xFilterGroupManager.is() )
{
// Add both html/pdf filter as a filter group to get a separator between both groups
if ( aImportantFilterGroup.size() > 0 )
if ( !aImportantFilterGroup.empty() )
{
Sequence< StringPair > aFilters( aImportantFilterGroup.size() );
for ( sal_Int32 i = 0; i < (sal_Int32)aImportantFilterGroup.size(); i++ )
@ -1113,7 +1113,7 @@ namespace sfx2
}
}
if ( aFilterGroup.size() > 0 )
if ( !aFilterGroup.empty() )
{
Sequence< StringPair > aFilters( aFilterGroup.size() );
for ( sal_Int32 i = 0; i < (sal_Int32)aFilterGroup.size(); i++ )