Skip to content

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

use C++11 iteration 

Change-Id: I185b03dc8b747178fc442b7748dfe40762b46d32
üst e95ae327
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 14 deletions
sw/source/core/doc/doclay.cxx
Dosyayı görüntüle @ e04d4d19
...@@ -430,34 +430,32 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, ...@@ -430,34 +430,32 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
else else
{ {
// copy all Pams and then delete all // copy all Pams and then delete all
SwPaM* pTmp = (SwPaM*)&rPam;
bool bOldFlag = mbCopyIsMove; bool bOldFlag = mbCopyIsMove;
bool const bOldUndo = GetIDocumentUndoRedo().DoesUndo(); bool const bOldUndo = GetIDocumentUndoRedo().DoesUndo();
bool const bOldRedlineMove(getIDocumentRedlineAccess().IsRedlineMove()); bool const bOldRedlineMove(getIDocumentRedlineAccess().IsRedlineMove());
mbCopyIsMove = true; mbCopyIsMove = true;
GetIDocumentUndoRedo().DoUndo(false); GetIDocumentUndoRedo().DoUndo(false);
getIDocumentRedlineAccess().SetRedlineMove(true); getIDocumentRedlineAccess().SetRedlineMove(true);
do { for(const SwPaM& rTmp : rPam.GetRingContainer())
if( pTmp->HasMark() && {
*pTmp->GetPoint() != *pTmp->GetMark() ) if( rTmp.HasMark() &&
*rTmp.GetPoint() != *rTmp.GetMark() )
{ {
getIDocumentContentOperations().CopyRange( *pTmp, aPos, false ); getIDocumentContentOperations().CopyRange( *const_cast<SwPaM*>(&rTmp), aPos, false );
} }
pTmp = static_cast<SwPaM*>(pTmp->GetNext()); }
} while ( &rPam != pTmp );
getIDocumentRedlineAccess().SetRedlineMove(bOldRedlineMove); getIDocumentRedlineAccess().SetRedlineMove(bOldRedlineMove);
mbCopyIsMove = bOldFlag; mbCopyIsMove = bOldFlag;
GetIDocumentUndoRedo().DoUndo(bOldUndo); GetIDocumentUndoRedo().DoUndo(bOldUndo);
pTmp = (SwPaM*)&rPam; for(const SwPaM& rTmp : rPam.GetRingContainer())
do { {
if( pTmp->HasMark() && if( rTmp.HasMark() &&
*pTmp->GetPoint() != *pTmp->GetMark() ) *rTmp.GetPoint() != *rTmp.GetMark() )
{ {
getIDocumentContentOperations().DeleteAndJoin( *pTmp ); getIDocumentContentOperations().DeleteAndJoin( *const_cast<SwPaM*>(&rTmp) );
} }
pTmp = static_cast<SwPaM*>(pTmp->GetNext()); }
} while ( &rPam != pTmp );
} }
} while( false ); } while( false );
} }
......
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