Skip to content

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

dead assign (clang) 

Change-Id: I567d5d40642a50ab1a4690df874daffdd17506d3
üst 2f8ea459
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
sw/source/core/doc/DocumentContentOperationsManager.cxx
Dosyayı görüntüle @ d9809a2f
...@@ -3374,7 +3374,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( ...@@ -3374,7 +3374,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
aAnchor.SetAnchor( &newPos ); aAnchor.SetAnchor( &newPos );
// Check recursion: copy content in its own frame, then don't copy it. // Check recursion: copy content in its own frame, then don't copy it.
bool bMakeCpy = true;
if( pDest == &m_rDoc ) if( pDest == &m_rDoc )
{ {
const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt(); const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt();
...@@ -3384,16 +3383,14 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( ...@@ -3384,16 +3383,14 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
pSNd->GetIndex() < rStartIdx.GetIndex() && pSNd->GetIndex() < rStartIdx.GetIndex() &&
rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() ) rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
{ {
bMakeCpy = false;
aSet.erase (it++); aSet.erase (it++);
continue; continue;
} }
} }
// Copy the format and set the new anchor // Copy the format and set the new anchor
if( bMakeCpy ) aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(),
aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(), aAnchor, false, true ) );
aAnchor, false, true ) );
++it; ++it;
} }
......
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