[Libreoffice-commits] core.git: sw/source

[Bjoern Michaelsen]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   17 +++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 096e33368064b05ad16282fbb27db6f46565ee5f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 20 17:22:26 2014 +0100

    expand complex cascading conditional operator, step 2
    
    Change-Id: Id87035ac3d673cd9fd3f28ff1ef1325f421d10b6
    Reviewed-on: https://gerrit.libreoffice.org/13009
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 9d93f36..b2c9a82 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3208,11 +3208,18 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
                 && pAnchor->GetAnchorId() != FLY_AT_FLY
                 && pAnchor->GetAnchorId() != FLY_AT_CHAR)
             continue;
-        if (( bCopyFlyAtFly && FLY_AT_FLY == pAnchor->GetAnchorId() )
-                    ? rRg.aStart <= pAPos->nNode.GetIndex() + 1
-                    : ( m_rDoc.getIDocumentRedlineAccess().IsRedlineMove()
-                            ? rRg.aStart < pAPos->nNode
-                            : rRg.aStart <= pAPos->nNode ))
+        if ( bCopyFlyAtFly && FLY_AT_FLY == pAnchor->GetAnchorId() )
+        {
+            if( rRg.aStart > pAPos->nNode.GetIndex() + 1 )
+                continue;
+        }
+        else
+        {
+            if ( m_rDoc.getIDocumentRedlineAccess().IsRedlineMove()
+                    ? rRg.aStart >= pAPos->nNode
+                    : rRg.aStart > pAPos->nNode )
+                continue;
+        }
         {
             if ( pAPos->nNode > rRg.aEnd )
                 continue;