summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-11-22 02:37:40 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2014-11-23 14:00:30 +0100
commitd9809a2f11a049f31cfc336d0854caa903a46c7e (patch)
tree23d328746e5208576889cb8e55f6152da269b72c /sw
parent2f8ea45940c4dd4ffb0363ef82daa5c0a734c0b7 (diff)
dead assign (clang)
Change-Id: I567d5d40642a50ab1a4690df874daffdd17506d3
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx7
1 files changed, 2 insertions, 5 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 05d527fedfd9..c73da6a98fc6 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3374,7 +3374,6 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
aAnchor.SetAnchor( &newPos );
// Check recursion: copy content in its own frame, then don't copy it.
- bool bMakeCpy = true;
if( pDest == &m_rDoc )
{
const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt();
@@ -3384,16 +3383,14 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
pSNd->GetIndex() < rStartIdx.GetIndex() &&
rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
{
- bMakeCpy = false;
aSet.erase (it++);
continue;
}
}
// Copy the format and set the new anchor
- if( bMakeCpy )
- aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(),
- aAnchor, false, true ) );
+ aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(),
+ aAnchor, false, true ) );
++it;
}