diff options
author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-11-29 14:03:44 +0100 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-12-07 16:03:52 +0100 |
commit | 6285dbda3aa80b0b98ac67f5438d6bab612cdac6 (patch) | |
tree | 31f9cc4595bc3fd6bc3840f3e366516decd1710b /sw/source/core/layout/layact.cxx | |
parent | 66cb8e415ecb1482cd8aad3fe7b040132e555e91 (diff) |
SwFrameBorder: Preparations and renamings
As preparation to restucture the Paint of Borders for
SwFrames (Writer), isolated and renamed some of Writer
functionality to get a better overview
Change-Id: I7b4d5acc84f0c52519c2de0e5a5caa68e75957b5
Diffstat (limited to 'sw/source/core/layout/layact.cxx')
-rw-r--r-- | sw/source/core/layout/layact.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 7b23377bb48d..af53d9e7a32e 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -205,7 +205,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if ( pCnt->IsCompletePaint() || !pCnt->IsTextFrame() ) { - SwRect aPaint( pCnt->PaintArea() ); + SwRect aPaint( pCnt->GetPaintArea() ); if ( !PaintContent_( pCnt, pPage, aPaint ) ) pCnt->ResetCompletePaint(); } @@ -219,14 +219,14 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if( bHeightDiff ) { // consider whole potential paint area. - SwRect aDrawRect( pCnt->PaintArea() ); + SwRect aDrawRect( pCnt->GetPaintArea() ); if( nOldHeight > nNewHeight ) nOldBottom = aRectFnSet.GetPrtBottom(*pCnt); aRectFnSet.SetTop( aDrawRect, nOldBottom ); PaintContent_( pCnt, pPage, aDrawRect ); } // paint content area - SwRect aPaintRect = static_cast<SwTextFrame*>(const_cast<SwContentFrame*>(pCnt))->Paint(); + SwRect aPaintRect = static_cast<SwTextFrame*>(const_cast<SwContentFrame*>(pCnt))->GetPaintSwRect(); PaintContent_( pCnt, pPage, aPaintRect ); } @@ -239,7 +239,7 @@ void SwLayAction::PaintContent( const SwContentFrame *pCnt, if( pSct->IsRetouche() && !pSct->GetNext() ) pTmp = pSct; } - SwRect aRect( pTmp->GetUpper()->PaintArea() ); + SwRect aRect( pTmp->GetUpper()->GetPaintArea() ); aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pTmp) ); if ( !PaintContent_( pCnt, pPage, aRect ) ) pCnt->ResetRetouche(); @@ -1329,7 +1329,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa { // vertical layout support SwRectFnSet aRectFnSet(pLay); - SwRect aRect( pLay->GetUpper()->PaintArea() ); + SwRect aRect( pLay->GetUpper()->GetPaintArea() ); aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pLay) ); if ( !m_pImp->GetShell()->AddPaintRect( aRect ) ) pLay->ResetRetouche(); @@ -1467,7 +1467,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) { bChanged = true; } - const SwRect aPaintFrame = pTab->PaintArea(); + const SwRect aPaintFrame = pTab->GetPaintArea(); if ( IsPaint() && bAddRect ) { @@ -1522,7 +1522,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) if ( pTab->IsRetouche() && !pTab->GetNext() ) { - SwRect aRect( pTab->GetUpper()->PaintArea() ); + SwRect aRect( pTab->GetUpper()->GetPaintArea() ); // vertical layout support aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pTab) ); if ( !m_pImp->GetShell()->AddPaintRect( aRect ) ) @@ -1540,7 +1540,7 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) { // set correct rectangle for retouche: area between bottom of table frame // and bottom of paint area of the upper frame. - SwRect aRect( pTab->GetUpper()->PaintArea() ); + SwRect aRect( pTab->GetUpper()->GetPaintArea() ); // vertical layout support aRectFnSet.SetTop( aRect, aRectFnSet.GetPrtBottom(*pTab) ); if ( !m_pImp->GetShell()->AddPaintRect( aRect ) ) |