diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-02-25 17:52:23 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-25 17:59:40 +0100 |
commit | 4f4e4e40f5b79a4dba46ffedd11cafa7beb08a87 (patch) | |
tree | c158b93b176b084eac024c0e3b5e94e18911f50f /filter | |
parent | e39c551c6133d0ff2b7074f64ea66563ebcce14b (diff) |
loplugin: improve indentation
Change-Id: Idb847766d93dc222d6c55889616da21eeac212ee
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 9 | ||||
-rw-r--r-- | filter/source/graphicfilter/epict/epict.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 3 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 31 |
5 files changed, 23 insertions, 26 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index ed33a1e56ea9..34a464f3df4a 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1324,14 +1324,11 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css:: // !? ... such situation can occur, if an item was added and(!) removed before it was flushed :-) if (!bExistsInConfigLayer && !bExistsInMemory) eState = E_ITEM_UNCHANGED; - else - if (!bExistsInConfigLayer && bExistsInMemory) + else if (!bExistsInConfigLayer && bExistsInMemory) eState = E_ITEM_ADDED; - else - if (bExistsInConfigLayer && bExistsInMemory) + else if (bExistsInConfigLayer && bExistsInMemory) eState = E_ITEM_CHANGED; - else - if (bExistsInConfigLayer && !bExistsInMemory) + else if (bExistsInConfigLayer && !bExistsInMemory) eState = E_ITEM_REMOVED; return eState; diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 23feea383de4..9b95717af7cb 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2143,10 +2143,10 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) MayCallback(); if (pPict->GetError()) - bStatus=sal_False; + bStatus=sal_False; if (bStatus==sal_False) - break; + break; } } diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 217974fdfa88..75adc97ca68e 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2134,7 +2134,7 @@ void EscherPropertyContainer::LookForPolarHandles( const MSO_SPT eShapeType, sal sal_Bool EscherPropertyContainer::GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ) { if ( rkProp.State != beans::PropertyState_DIRECT_VALUE ) - return sal_False; + return sal_False; sal_Bool bUseFixedFloat = ( nAdjustmentsWhichNeedsToBeConverted & ( 1 << nIndex ) ) != 0; if ( rkProp.Value.getValueTypeClass() == uno::TypeClass_DOUBLE ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 18247bfa6131..cc8de5869794 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5485,8 +5485,7 @@ void SvxMSDffManager::CheckTxBxStoryChain() nChain = pObj->nTxBxComp; bSetReplaceFALSE = !pObj->bReplaceByFly; } - else - if( !pObj->bReplaceByFly ) + else if( !pObj->bReplaceByFly ) { // object that must NOT be replaced by frame? bSetReplaceFALSE = sal_True; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 99f662c5bb69..41bf1777cffd 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1072,29 +1072,30 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi pTObj->SetMergedItem( SdrTextAutoGrowHeightItem( bFitShapeToText ) ); } - pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) ); - pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) ); + pTObj->SetMergedItem( SdrTextVertAdjustItem( eTVA ) ); + pTObj->SetMergedItem( SdrTextHorzAdjustItem( eTHA ) ); - if ( nMinFrameHeight < 0 ) - nMinFrameHeight = 0; + if ( nMinFrameHeight < 0 ) + nMinFrameHeight = 0; if ( !pTObj->ISA( SdrObjCustomShape ) ) pTObj->SetMergedItem( SdrTextMinFrameHeightItem( nMinFrameHeight ) ); - if ( nMinFrameWidth < 0 ) - nMinFrameWidth = 0; + if ( nMinFrameWidth < 0 ) + nMinFrameWidth = 0; if ( !pTObj->ISA( SdrObjCustomShape ) ) pTObj->SetMergedItem( SdrTextMinFrameWidthItem( nMinFrameWidth ) ); - // set margins at the borders of the textbox - pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) ); - pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) ); - pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) ); - pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) ); - pTObj->SetMergedItem( SdrTextFixedCellHeightItem( sal_True ) ); + // set margins at the borders of the textbox + pTObj->SetMergedItem( SdrTextLeftDistItem( nTextLeft ) ); + pTObj->SetMergedItem( SdrTextRightDistItem( nTextRight ) ); + pTObj->SetMergedItem( SdrTextUpperDistItem( nTextTop ) ); + pTObj->SetMergedItem( SdrTextLowerDistItem( nTextBottom ) ); + pTObj->SetMergedItem( SdrTextFixedCellHeightItem( sal_True ) ); + + if ( !pTObj->ISA( SdrObjCustomShape ) ) + pTObj->SetSnapRect( rTextRect ); + pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage ); - if ( !pTObj->ISA( SdrObjCustomShape ) ) - pTObj->SetSnapRect( rTextRect ); - pTObj = ReadObjText( &aTextObj, pTObj, rData.pPage ); if ( pTObj ) { /* check if our new snaprect makes trouble, |