diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-11-20 18:18:37 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2014-11-20 18:24:31 +0000 |
| commit | 59554f0405c5146b3cf8faad76771c31bd46fbf7 (patch) | |
| tree | 9871b4e90d244b92db4333541f8c9bb1e0d99523 | |
| parent | 096e33368064b05ad16282fbb27db6f46565ee5f (diff) | |
expand complex cascading conditional operator, step 4
Change-Id: Iaef321f8f9afe436a77a15cb48b5b93003374b47
Reviewed-on: https://gerrit.libreoffice.org/13011
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
| -rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index b2c9a8206eae..2539bf798548 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -3204,10 +3204,15 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl( bool bAtCntnt = (pAnchor->GetAnchorId() == FLY_AT_PARA); if ( !pAPos ) continue; - if ( !bAtCntnt - && pAnchor->GetAnchorId() != FLY_AT_FLY - && pAnchor->GetAnchorId() != FLY_AT_CHAR) - continue; + switch ( pAnchor->GetAnchorId() ) + { + case FLY_AT_FLY: + case FLY_AT_CHAR: + case FLY_AT_PARA: + break; + default: + continue; + } if ( bCopyFlyAtFly && FLY_AT_FLY == pAnchor->GetAnchorId() ) { if( rRg.aStart > pAPos->nNode.GetIndex() + 1 ) |