From 981654f6e0d57c2c6dd1bbf740a6b67941146497 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Tue, 1 Oct 2019 00:21:00 +0300 Subject: Drop SfxItemIter::FirstItem It is always used right after the iterator is created, where simple GetCurItem gives the same value without reseting the position. Change-Id: I871dc7989b79e13f06436ef7928692645b5209f6 Reviewed-on: https://gerrit.libreoffice.org/79903 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- sfx2/source/control/request.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sfx2/source/control/request.cxx') diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index dfab1b879eda..d4f48cccc012 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -477,12 +477,10 @@ void SfxRequest::Done else { SfxItemIter aIter(rSet); - const SfxPoolItem* pItem = aIter.FirstItem(); - while(pItem) + for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem()) { if(!IsInvalidItem(pItem)) pArgs->Put(*pItem,pItem->Which()); - pItem = aIter.NextItem(); } } } @@ -620,7 +618,7 @@ void SfxRequest::Done_Impl { // iterate over Items SfxItemIter aIter(*pSet); - for ( const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem = aIter.NextItem() ) + for ( const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem() ) { // to determine the slot ID for the individual item sal_uInt16 nSlotId = rPool.GetSlotId( pItem->Which() ); -- cgit