From 46c01657d505a021673449ff0f874bc080d23ba6 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Wed, 2 May 2012 21:57:04 +0200 Subject: != instead of < for comparison with end iterator Change-Id: I7baa34c1cf7161fb55914d41b451b842ad4ab0c8 --- editeng/source/outliner/outliner.cxx | 2 +- filter/source/graphicfilter/icgm/chart.cxx | 2 +- filter/source/graphicfilter/icgm/elements.cxx | 2 +- filter/source/msfilter/svdfppt.cxx | 4 ++-- sfx2/source/view/viewsh.cxx | 2 +- svtools/inc/svtools/treelist.hxx | 2 +- svtools/source/contnr/imivctl1.cxx | 2 +- svtools/source/contnr/treelist.cxx | 2 +- svtools/source/filter/filter.cxx | 2 +- svtools/source/graphic/grfmgr2.cxx | 2 +- svx/source/form/fmexpl.cxx | 2 +- svx/source/gallery2/gallery1.cxx | 4 ++-- toolkit/source/awt/vclxgraphics.cxx | 2 +- tools/source/stream/strmunx.cxx | 2 +- unotools/source/config/options.cxx | 2 +- vcl/source/app/idlemgr.cxx | 2 +- vcl/source/window/accmgr.cxx | 2 +- vcl/source/window/toolbox.cxx | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index b1690e93d8bd..ffefcfb79004 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1352,7 +1352,7 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView ) { DBG_CHKTHIS(Outliner,0); - for ( ViewList::iterator it = aViewList.begin(); it < aViewList.end(); ++it ) + for ( ViewList::iterator it = aViewList.begin(); it != aViewList.end(); ++it ) { if ( *it == pView ) { diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx index 7e34fdfd1fe5..4651a04723d2 100644 --- a/filter/source/graphicfilter/icgm/chart.cxx +++ b/filter/source/graphicfilter/icgm/chart.cxx @@ -71,7 +71,7 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry ) } delete pTextEntry; ::std::vector< TextEntry* >::iterator it; - for ( it = maTextEntryList.begin(); it < maTextEntryList.end(); ++it ) + for ( it = maTextEntryList.begin(); it != maTextEntryList.end(); ++it ) { if ( *it == pTextEntry ) { diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index a3f5892171d8..07fef990457c 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -357,7 +357,7 @@ Bundle* CGMElements::InsertBundle( BundleList& rList, Bundle& rBundle ) Bundle* pBundle = GetBundle( rList, rBundle.GetIndex() ); if ( pBundle ) { - for ( BundleList::iterator it = rList.begin(); it < rList.end(); ++it ) { + for ( BundleList::iterator it = rList.begin(); it != rList.end(); ++it ) { if ( *it == pBundle ) { rList.erase( it ); delete pBundle; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 7f36b99859e3..d61ab392aed3 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6721,12 +6721,12 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport { // sorting fields ( hi >> lo ) ::std::vector< PPTFieldEntry* >::iterator it = FieldList.begin(); - for( ; it < FieldList.end(); ++it ) { + for( ; it != FieldList.end(); ++it ) { if ( (*it)->nPos < pEntry->nPos ) { break; } } - if ( it < FieldList.end() ) { + if ( it != FieldList.end() ) { FieldList.insert( it, pEntry ); } else { FieldList.push_back( pEntry ); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index b9615924160d..d4cb20b1ece2 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -433,7 +433,7 @@ SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient { SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True); - for( SfxInPlaceClientList::iterator it = pClientList->begin(); it < pClientList->end(); ++it ) + for( SfxInPlaceClientList::iterator it = pClientList->begin(); it != pClientList->end(); ++it ) { if ( *it == pIPClient ) { diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index c505e27e024d..0875052eb272 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -91,7 +91,7 @@ public: void remove( SvListEntry* pItem ) { for ( SvTreeEntryList_impl::iterator it = maEntryList.begin(); - it < maEntryList.end(); + it != maEntryList.end(); ++it ) { if ( *it == pItem ) { diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 4cbaa46a9648..7f7eae49683a 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2398,7 +2398,7 @@ void SvxIconChoiceCtrl_Impl::ToTop( SvxIconChoiceCtrlEntry* pEntry ) ) { for( SvxIconChoiceCtrlEntryList_impl::iterator it = pZOrderList->begin(); - it < pZOrderList->end(); + it != pZOrderList->end(); ++it ) { if ( *it == pEntry ) diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 655cdb5db89e..5008f40cd7ae 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -203,7 +203,7 @@ void SvTreeList::InsertView( SvListView* pView ) void SvTreeList::RemoveView( SvListView* pView ) { - for ( SvListView_impl::iterator it = aViewList.begin(); it < aViewList.end(); ++it ) { + for ( SvListView_impl::iterator it = aViewList.begin(); it != aViewList.end(); ++it ) { if ( *it == pView ) { aViewList.erase( it ); nRefCount--; diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index 634802fbe0de..3c1c1a532f90 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -1043,7 +1043,7 @@ GraphicFilter::~GraphicFilter() ::osl::MutexGuard aGuard( getListMutex() ); for( FilterList_impl::iterator it = pFilterHdlList->begin(); - it < pFilterHdlList->end(); + it != pFilterHdlList->end(); ++it ) { if( *it == this ) diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 5f8c8f502d97..35de9a68e750 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -236,7 +236,7 @@ void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubst void GraphicManager::ImplUnregisterObj( const GraphicObject& rObj ) { mpCache->ReleaseGraphicObject( rObj ); - for( GraphicObjectList_impl::iterator it = maObjList.begin(); it < maObjList.end(); ++it ) + for( GraphicObjectList_impl::iterator it = maObjList.begin(); it != maObjList.end(); ++it ) { if ( *it == &rObj ) { maObjList.erase( it ); diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index b55e6a45feb0..895d078798fb 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -207,7 +207,7 @@ FmEntryDataList::~FmEntryDataList() FmEntryData* FmEntryDataList::remove( FmEntryData* pItem ) { for ( FmEntryDataBaseList::iterator it = maEntryDataList.begin(); - it < maEntryDataList.end(); + it != maEntryDataList.end(); ++it ) { diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 670919b73cc8..a9d3ad62f713 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -702,7 +702,7 @@ sal_Bool Gallery::RemoveTheme( const String& rThemeName ) if( pImportEntry ) { - for ( GalleryImportThemeList::iterator it = aImportList.begin(); it < aImportList.end(); ++it ) + for ( GalleryImportThemeList::iterator it = aImportList.begin(); it != aImportList.end(); ++it ) { if ( *it == pImportEntry ) { @@ -732,7 +732,7 @@ sal_Bool Gallery::RemoveTheme( const String& rThemeName ) } } - for ( GalleryThemeList::iterator it = aThemeList.begin(); it < aThemeList.end(); ++it ) + for ( GalleryThemeList::iterator it = aThemeList.begin(); it != aThemeList.end(); ++it ) { if ( pThemeEntry == *it ) { delete pThemeEntry; diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index f954b2a2253d..8923ea34a706 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -74,7 +74,7 @@ VCLXGraphics::~VCLXGraphics() VCLXGraphicsList_impl* pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL; if ( pLst ) { - for( VCLXGraphicsList_impl::iterator it = pLst->begin(); it < pLst->end(); ++it ) + for( VCLXGraphicsList_impl::iterator it = pLst->begin(); it != pLst->end(); ++it ) { if( *it == this ) { pLst->erase( it ); diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 23171206c874..66fdd1aa2038 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -99,7 +99,7 @@ InternalStreamLock::InternalStreamLock( InternalStreamLock::~InternalStreamLock() { for ( InternalStreamLockList::iterator it = LockList::get().begin(); - it < LockList::get().end(); + it != LockList::get().end(); ++it ) { if ( this == *it ) { diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx index a38950be4e36..1085ae31dcc6 100644 --- a/unotools/source/config/options.cxx +++ b/unotools/source/config/options.cxx @@ -58,7 +58,7 @@ void ConfigurationBroadcaster::RemoveListener( utl::ConfigurationListener* pList { if ( mpList ) { for ( IMPL_ConfigurationListenerList::iterator it = mpList->begin(); - it < mpList->end(); + it != mpList->end(); ++it ) { if ( *it == pListener ) { diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 99b17c99bf8b..9baa23d027f3 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -105,7 +105,7 @@ sal_Bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) void ImplIdleMgr::RemoveIdleHdl( const Link& rLink ) { - for ( ImplIdleList::iterator it = mpIdleList->begin(); it < mpIdleList->end(); ++it ) { + for ( ImplIdleList::iterator it = mpIdleList->begin(); it != mpIdleList->end(); ++it ) { if ( (*it)->maIdleHdl == rLink ) { delete *it; mpIdleList->erase( it ); diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index d9c40a9965e6..ad127ace3b2c 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -90,7 +90,7 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) // throw it away for ( ImplAccelList::iterator it = mpAccelList->begin(); - it < mpAccelList->end(); + it != mpAccelList->end(); ++it ) { if ( *it == pAccel ) { diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 7b317a180651..adc31ccef46c 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -162,7 +162,7 @@ public: { mpBoxList->push_back( pBox ); } void erase( ToolBox* pBox ) { - for ( ImplTBList::iterator it = mpBoxList->begin(); it < mpBoxList->end(); ++it ) { + for ( ImplTBList::iterator it = mpBoxList->begin(); it != mpBoxList->end(); ++it ) { if ( *it == pBox ) { mpBoxList->erase( it ); break; -- cgit