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 /svl/source | |
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 'svl/source')
-rw-r--r-- | svl/source/items/itemset.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index f325cec50f34..364fb429c5d0 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1497,7 +1497,7 @@ void SfxItemSet::dumpAsXml(xmlTextWriterPtr pWriter) const { xmlTextWriterStartElement(pWriter, BAD_CAST("SfxItemSet")); SfxItemIter aIter(*this); - for (const SfxPoolItem* pItem = aIter.FirstItem(); pItem; pItem = aIter.NextItem()) + for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem()) pItem->dumpAsXml(pWriter); xmlTextWriterEndElement(pWriter); } diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 6a8b25576fb6..950201bef962 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -327,10 +327,9 @@ OUString SfxStyleSheetBase::GetDescription( MapUnit eMetric ) { SfxItemIter aIter( GetItemSet() ); OUStringBuffer aDesc; - const SfxPoolItem* pItem = aIter.FirstItem(); IntlWrapper aIntlWrapper(SvtSysLocale().GetUILanguageTag()); - while ( pItem ) + for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem = aIter.NextItem()) { OUString aItemPresentation; @@ -343,7 +342,6 @@ OUString SfxStyleSheetBase::GetDescription( MapUnit eMetric ) if ( !aItemPresentation.isEmpty() ) aDesc.append(aItemPresentation); } - pItem = aIter.NextItem(); } return aDesc.makeStringAndClear(); } |