Skip to content

C
core
Kaydet (Commit) 5a0d2a4e authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

simplify SwClientIter dtor 

Change-Id: Ibf41f0c53b0454029601dd1cac479bdd82f50f0c
üst 5730b4b7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
sw/source/core/attr/calbck.cxx
Dosyayı görüntüle @ 5a0d2a4e
...@@ -377,8 +377,7 @@ SwClientIter::SwClientIter( const SwModify& rModify ) ...@@ -377,8 +377,7 @@ SwClientIter::SwClientIter( const SwModify& rModify )
SwClientIter::~SwClientIter() SwClientIter::~SwClientIter()
{ {
if( pClientIters ) assert(pClientIters);
{
// reorganize list of ClientIters // reorganize list of ClientIters
if( pClientIters == this ) if( pClientIters == this )
pClientIters = pNxtIter; pClientIters = pNxtIter;
...@@ -386,14 +385,12 @@ SwClientIter::~SwClientIter() ...@@ -386,14 +385,12 @@ SwClientIter::~SwClientIter()
{ {
SwClientIter* pTmp = pClientIters; SwClientIter* pTmp = pClientIters;
while( pTmp->pNxtIter != this ) while( pTmp->pNxtIter != this )
if( nullptr == ( pTmp = pTmp->pNxtIter ) )
{ {
OSL_ENSURE( this, "Lost my pointer" ); assert(pTmp);
return ; pTmp = pTmp->pNxtIter;
} }
pTmp->pNxtIter = pNxtIter; pTmp->pNxtIter = pNxtIter;
} }
}
} }
SwClient* SwClientIter::operator++() SwClient* SwClientIter::operator++()
......
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