summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2019-09-30 20:22:30 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2019-10-01 06:33:11 +0200
commit1fc63383ccd8af144d681ba405f5ead863ac24e1 (patch)
tree77d41033131babef8db1dd7ffb6e00b0f0ac3237 /include/svl
parent4814e8caa5f06c4fe438dfd7d7315e4a2410ea18 (diff)
Avoid redundant IsAtEnd: NextItem returns nullptr iif iterator is at end
To keep the check efficient, split NextItem to inline and Impl parts Change-Id: Id5877a3c5bed73aac9c39c655b106a715cf888ea Reviewed-on: https://gerrit.libreoffice.org/79894 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/itemiter.hxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx
index 913ca9cba0eb..bfcc43715ef5 100644
--- a/include/svl/itemiter.hxx
+++ b/include/svl/itemiter.hxx
@@ -45,13 +45,17 @@ public:
{
return m_rSet.m_nCount ? *(m_rSet.m_pItems.get() + m_nCurrent) : nullptr;
}
- const SfxPoolItem* NextItem();
+ const SfxPoolItem* NextItem() { return (m_nCurrent < m_nEnd) ? ImplNextItem() : nullptr; }
bool IsAtEnd() const { return m_nCurrent == m_nEnd; }
sal_uInt16 GetCurPos() const { return m_nCurrent; }
sal_uInt16 GetFirstPos() const { return m_nStart; }
sal_uInt16 GetLastPos() const { return m_nEnd; }
+
+private:
+ const SfxPoolItem* ImplNextItem();
+
};
#endif