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

do not use manual iteration

Change-Id: I71da7d2810309266b6e37fd531232ca33928f5b9
üst 4e00df4f
...@@ -907,8 +907,12 @@ void SwCrsrShell::ClearMark() ...@@ -907,8 +907,12 @@ void SwCrsrShell::ClearMark()
// is there any GetMark? // is there any GetMark?
if( m_pTblCrsr ) if( m_pTblCrsr )
{ {
while( m_pCurCrsr->GetNext() != m_pCurCrsr ) std::vector<SwViewShell*> vShells;
delete m_pCurCrsr->GetNext(); for(SwViewShell& rShell : GetRingContainer())
if(&rShell != this)
vShells.push_back(&rShell);
for(SwViewShell* pShell : vShells)
delete pShell;
m_pTblCrsr->DeleteMark(); m_pTblCrsr->DeleteMark();
m_pCurCrsr->DeleteMark(); m_pCurCrsr->DeleteMark();
...@@ -2678,7 +2682,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin, ...@@ -2678,7 +2682,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
SwCrsrShell::~SwCrsrShell() SwCrsrShell::~SwCrsrShell()
{ {
// if it is not the last view then at least the field should be updated // if it is not the last view then at least the field should be updated
if( GetNext() != this ) if( !unique() )
CheckTblBoxCntnt( m_pCurCrsr->GetPoint() ); CheckTblBoxCntnt( m_pCurCrsr->GetPoint() );
else else
ClearTblBoxCntnt(); ClearTblBoxCntnt();
......
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