sw/source/core/doc/DocumentContentOperationsManager.cxx | 22 ++++++---------- 1 file changed, 9 insertions(+), 13 deletions(-)
New commits: commit 3fcb0c3aa8d58a819aa21eb9743eaa6da7394819 Author: Bjoern Michaelsen <[email protected]> Date: Thu Nov 20 19:03:43 2014 +0100 expand complex cascading conditional operator, step 5 Change-Id: Ia96f59911f20e4baf342a512a010c84e91b1f21d Reviewed-on: https://gerrit.libreoffice.org/13012 Reviewed-by: Björn Michaelsen <[email protected]> Tested-by: Björn Michaelsen <[email protected]> diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 6e10d06..7fa56d1 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -3182,7 +3182,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( const SwNodeRange& rRg, const sal_Int32 nEndContentIndex, const SwNodeIndex& rStartIdx, - const bool bCopyFlyAtFly, + bool bCopyFlyAtFly, const bool bMergedFirstNode ) const { // First collect all Flys, sort them according to their ordering number, @@ -3207,24 +3207,20 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( switch ( pAnchor->GetAnchorId() ) { case FLY_AT_FLY: + if( bCopyFlyAtFly && rRg.aStart > pAPos->nNode.GetIndex() + 1 ) + continue; + break; case FLY_AT_CHAR: case FLY_AT_PARA: - break; + bCopyFlyAtFly = false; + break; default: continue; } - if ( bCopyFlyAtFly && FLY_AT_FLY == pAnchor->GetAnchorId() ) - { - if( rRg.aStart > pAPos->nNode.GetIndex() + 1 ) - continue; - } - else - { - if ( m_rDoc.getIDocumentRedlineAccess().IsRedlineMove() + if ( !bCopyFlyAtFly && ( m_rDoc.getIDocumentRedlineAccess().IsRedlineMove() ? rRg.aStart >= pAPos->nNode - : rRg.aStart > pAPos->nNode ) - continue; - } + : rRg.aStart > pAPos->nNode )) + continue; if ( pAPos->nNode > rRg.aEnd ) continue; //frames at the last source node are not always copied:
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
