diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-09-20 20:51:54 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2016-09-23 08:34:12 +0000 |
| commit | 6bdcb730faa5b996882b4648b86b7caf93b8f421 (patch) | |
| tree | fc2795cb0b1d5df82aff3354e61c4da253424a6c /sw/source/core/layout/pagechg.cxx | |
| parent | Revert "Revert "remove SfxPoolItemArrayBase_Impl typedef"" (diff) | |
| download | core-6bdcb730faa5b996882b4648b86b7caf93b8f421.tar.gz core-6bdcb730faa5b996882b4648b86b7caf93b8f421.zip | |
Replace SWRECTFN macro with a class
Change-Id: Ib400c5930be84d26665b0e12a61508c8fbfd7f08
Reviewed-on: https://gerrit.libreoffice.org/29105
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/core/layout/pagechg.cxx')
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index e795c1d8bf0f..8113d539300a 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -108,8 +108,8 @@ void SwBodyFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder { bNoGrid = false; long nSum = pGrid->GetBaseHeight() + pGrid->GetRubyHeight(); - SWRECTFN( this ) - long nSize = (Frame().*fnRect->fnGetWidth)(); + SwRectFnSet aRectFnSet(this); + long nSize = (Frame().*aRectFnSet->fnGetWidth)(); long nBorder = 0; if( GRID_LINES_CHARS == pGrid->GetGridType() ) { @@ -119,11 +119,11 @@ void SwBodyFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder nSize -= nBorder; nBorder /= 2; } - (Prt().*fnRect->fnSetPosX)( nBorder ); - (Prt().*fnRect->fnSetWidth)( nSize ); + (Prt().*aRectFnSet->fnSetPosX)( nBorder ); + (Prt().*aRectFnSet->fnSetWidth)( nSize ); // Height of body frame: - nBorder = (Frame().*fnRect->fnGetHeight)(); + nBorder = (Frame().*aRectFnSet->fnGetHeight)(); // Number of possible lines in area of body frame: long nNumberOfLines = nBorder / nSum; @@ -139,8 +139,8 @@ void SwBodyFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorder const bool bAdjust = static_cast<SwPageFrame*>(GetUpper())->GetFormat()->GetDoc()-> GetFootnoteIdxs().empty(); - (Prt().*fnRect->fnSetPosY)( bAdjust ? nBorder : 0 ); - (Prt().*fnRect->fnSetHeight)( nSize ); + (Prt().*aRectFnSet->fnSetPosY)( bAdjust ? nBorder : 0 ); + (Prt().*aRectFnSet->fnSetHeight)( nSize ); } } if( bNoGrid ) |