From d24b51826109f73a23386b69879de66967a600db Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 14 Jul 2012 12:30:24 +0200 Subject: Revert "Some cppcheck cleaning" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b21661ce4200fd8040a213770a3f9e63a4b9f137. this breaks with ../framework/source/lomenubar/MenuItemInfo.hxx:49:12: error: expected ‘;’ at end of member declaration --- scripting/source/stringresource/stringresource.cxx | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'scripting') diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index b0d4eb61d065..c26492b753b8 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -113,13 +113,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; @@ -316,7 +316,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; @@ -556,7 +556,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 ) @@ -576,7 +576,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 ) @@ -656,7 +656,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 ) @@ -689,7 +689,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 ) @@ -1048,7 +1048,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) && @@ -1087,7 +1087,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 ) @@ -1182,7 +1182,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 ) @@ -1214,7 +1214,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) && @@ -1417,7 +1417,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 ) ) @@ -1726,7 +1726,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 ) -- cgit