diff options
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/layout/flylay.cxx | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 82c4d2c211e5..a1f389eceab2 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -877,7 +877,8 @@ sal_uInt16 SwFmtCol::GetGutterWidth( bool bMin ) const } } else - { bSet = true; + { + bSet = true; nRet = nTmp; } } @@ -893,7 +894,8 @@ void SwFmtCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct ) { sal_uInt16 nHalf = nNew / 2; for ( size_t i = 0; i < m_aColumns.size(); ++i ) - { SwColumn *pCol = &m_aColumns[i]; + { + SwColumn *pCol = &m_aColumns[i]; pCol->SetLeft ( nHalf ); pCol->SetRight( nHalf ); if ( i == 0 ) @@ -911,7 +913,8 @@ void SwFmtCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nA if ( !m_aColumns.empty() ) m_aColumns.clear(); for ( sal_uInt16 i = 0; i < nNumCols; ++i ) - { SwColumn *pCol = new SwColumn; + { + SwColumn *pCol = new SwColumn; m_aColumns.push_back( pCol ); } m_bOrtho = true; diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index b9e36e059189..3bb2027cffdf 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -423,7 +423,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz ) ChgLowersProp( aTmpOldSize ); SwFrm *pLow = Lower(); do - { pLow->Calc(); + { + pLow->Calc(); // also calculate the (Column)BodyFrm ((SwLayoutFrm*)pLow)->Lower()->Calc(); pLow = pLow->GetNext(); @@ -720,7 +721,8 @@ void SwPageFrm::MoveFly( SwFlyFrm *pToMove, SwPageFrm *pDest ) { pSortedObjs->Remove( *pToMove ); if ( !pSortedObjs->size() ) - { DELETEZ( pSortedObjs ); + { + DELETEZ( pSortedObjs ); } } @@ -876,7 +878,8 @@ void SwPageFrm::PlaceFly( SwFlyFrm* pFly, SwFlyFrmFmt* pFmt ) if ( pFly ) AppendFly( pFly ); else - { OSL_ENSURE( pFmt, ":-( No Format given for Fly." ); + { + OSL_ENSURE( pFmt, ":-( No Format given for Fly." ); pFly = new SwFlyLayFrm( (SwFlyFrmFmt*)pFmt, this, this ); AppendFly( pFly ); ::RegistFlys( this, pFly ); |