diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-14 19:56:49 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-03-16 20:37:25 +0100 |
| commit | b0dae8c4c57aa50bbff7b3fd4d84476636bf1677 (patch) | |
| tree | 75ea8968abeafc21be6d8cf8a244e90989332b0a /sw/inc/switerator.hxx | |
| parent | 059b2b0385e632459c3f0a7c110b7a5ab6b6ce51 (diff) | |
Fixes for moving stuff to SwIterator
Change-Id: I834afb711920e480045a9f932770dab27dd1f3ad
Diffstat (limited to 'sw/inc/switerator.hxx')
| -rw-r--r-- | sw/inc/switerator.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/inc/switerator.hxx b/sw/inc/switerator.hxx index 4a9f277b0afb..440c4e63a281 100644 --- a/sw/inc/switerator.hxx +++ b/sw/inc/switerator.hxx @@ -35,34 +35,34 @@ public: if(!aClientIter.m_pPosition) return nullptr; aClientIter.m_pCurrent = nullptr; - return PTR_CAST(TElementType,aClientIter.Next()); + return Next(); } TElementType* Last() { aClientIter.m_aSearchType = TYPE(TElementType); - GoEnd(); + aClientIter.GoEnd(); if(!aClientIter.m_pPosition) return nullptr; - if(aClientIter.m_pPosition->IsA(TYPE(TElementType)) + if(aClientIter.m_pPosition->IsA(TYPE(TElementType))) return PTR_CAST(TElementType,aClientIter.m_pPosition); - return PTR_CAST(TElementType,aClientIter.Previous()); + return Previous(); } TElementType* Next() { if( aClientIter.m_pPosition == aClientIter.m_pCurrent ) - aClientIter.m_pPosition = static_cast<SwClient*>(aClientIter.m_pPosition->m_pRight); + aClientIter.m_pPosition = aClientIter.GetRighOfPos(); while(aClientIter.m_pPosition && !aClientIter.m_pPosition->IsA( TYPE(TElementType) ) ) - aClientIter.m_pPosition = static_cast<SwClient*>(aClientIter.m_pPosition->m_pRight); + aClientIter.m_pPosition = aClientIter.GetRighOfPos(); return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition); } TElementType* Previous() { - aClientIter.m_pPosition = static_cast<SwClient*>(aClientIter.m_pPosition->m_pLeft); + aClientIter.m_pPosition = aClientIter.GetLeftOfPos(); while(aClientIter.m_pPosition && !aClientIter.m_pPosition->IsA( TYPE(TElementType) ) ) - aClientIter.m_pPosition = static_cast<SwClient*>(aClientIter.m_pPosition->m_pLeft); + aClientIter.m_pPosition = aClientIter.GetLeftOfPos(); return PTR_CAST(TElementType,aClientIter.m_pCurrent = aClientIter.m_pPosition); } - static TElementType* FirstElement( const TSource& rMod ) { SwClient* p = SwClientIter(rMod).First(TYPE(TElementType)); return PTR_CAST(TElementType,p); } + static TElementType* FirstElement( const TSource& rMod ) { return SwIterator<TElementType, TSource>(rMod).First(); } bool IsChanged() { return aClientIter.IsChanged(); } }; |