Kaydet (Commit) a583f445 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

Move SwClientIter::Last() to SwIterator

Change-Id: I7ec3feaec7a07871a3470f7f41dd203fa0f83fd0
üst 82a0260f
...@@ -263,16 +263,6 @@ class SwClientIter SAL_FINAL : public sw::Ring<SwClientIter> ...@@ -263,16 +263,6 @@ class SwClientIter SAL_FINAL : public sw::Ring<SwClientIter>
static SW_DLLPUBLIC SwClientIter* our_pClientIters; static SW_DLLPUBLIC SwClientIter* our_pClientIters;
SwClient* Last( TypeId nType )
{
m_aSearchType = nType;
GoEnd();
if(!m_pPosition)
return nullptr;
if( m_pPosition->IsA( m_aSearchType ) )
return m_pPosition;
return Previous();
}
SwClient* Next() SwClient* Next()
{ {
if( m_pPosition == m_pCurrent ) if( m_pPosition == m_pCurrent )
......
...@@ -37,7 +37,16 @@ public: ...@@ -37,7 +37,16 @@ public:
aClientIter.m_pCurrent = nullptr; aClientIter.m_pCurrent = nullptr;
return PTR_CAST(TElementType,aClientIter.Next()); return PTR_CAST(TElementType,aClientIter.Next());
} }
TElementType* Last() { SwClient* p = aClientIter.Last( TYPE(TElementType)); return PTR_CAST(TElementType,p); } TElementType* Last()
{
aClientIter.m_aSearchType = TYPE(TElementType);
GoEnd();
if(!aClientIter.m_pPosition)
return nullptr;
if(aClientIter.m_pPosition->IsA(TYPE(TElementType))
return PTR_CAST(TElementType,aClientIter.m_pPosition);
return PTR_CAST(TElementType,aClientIter.Previous());
}
TElementType* Next() { SwClient* p = aClientIter.Next(); return PTR_CAST(TElementType,p); } TElementType* Next() { SwClient* p = aClientIter.Next(); return PTR_CAST(TElementType,p); }
TElementType* Previous() { SwClient* p = aClientIter.Previous(); return PTR_CAST(TElementType,p); } TElementType* Previous() { SwClient* p = aClientIter.Previous(); return PTR_CAST(TElementType,p); }
static TElementType* FirstElement( const TSource& rMod ) { SwClient* p = SwClientIter(rMod).First(TYPE(TElementType)); return PTR_CAST(TElementType,p); } static TElementType* FirstElement( const TSource& rMod ) { SwClient* p = SwClientIter(rMod).First(TYPE(TElementType)); return PTR_CAST(TElementType,p); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment