diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-10-01 00:21:00 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-10-01 06:35:49 +0200 |
| commit | 981654f6e0d57c2c6dd1bbf740a6b67941146497 (patch) | |
| tree | f7cf40ccf38d4666280b647c77ea7859e97f89e4 /sfx2 | |
| parent | 1fc63383ccd8af144d681ba405f5ead863ac24e1 (diff) | |
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 <mike.kaganski@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/control/request.cxx | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index dfbf7c8b33b6..0381423f1034 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -396,7 +396,7 @@ void SfxBindings::SetState if ( nRegLevel ) { SfxItemIter aIter(rSet); - for ( const SfxPoolItem *pItem = aIter.FirstItem(); + for ( const SfxPoolItem *pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem() ) Invalidate( pItem->Which() ); @@ -410,7 +410,7 @@ void SfxBindings::SetState // Iterate over the itemset, update if the slot bound //! Bug: Use WhichIter and possibly send VoidItems up SfxItemIter aIter(rSet); - for ( const SfxPoolItem *pItem = aIter.FirstItem(); + for ( const SfxPoolItem *pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem() ) { diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 51e04d3966d0..e7cf277145f3 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -901,7 +901,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode nCall, if ( pArgs ) { SfxItemIter aIter(*pArgs); - for ( const SfxPoolItem *pArg = aIter.FirstItem(); + for ( const SfxPoolItem *pArg = aIter.GetCurItem(); pArg; pArg = aIter.NextItem() ) MappedPut_Impl( aSet, *pArg ); @@ -991,7 +991,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, { SfxAllItemSet aSet( pShell->GetPool() ); SfxItemIter aIter(rArgs); - for ( const SfxPoolItem *pArg = aIter.FirstItem(); + for ( const SfxPoolItem *pArg = aIter.GetCurItem(); pArg; pArg = aIter.NextItem() ) MappedPut_Impl( aSet, *pArg ); @@ -1765,7 +1765,7 @@ bool SfxDispatcher::FillState_(const SfxSlotServer& rSvr, SfxItemSet& rState, { SfxInterface *pIF = pSh->GetInterface(); SfxItemIter aIter( rState ); - for ( const SfxPoolItem *pItem = aIter.FirstItem(); + for ( const SfxPoolItem *pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem() ) { 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() ); |