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/objectpositioning/tolayoutanchoredobjectposition.cxx | |
| parent | e85d92a874524f677493dda5785be11ca6e99f17 (diff) | |
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/objectpositioning/tolayoutanchoredobjectposition.cxx')
| -rw-r--r-- | sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 992dae77da8f..1186abd52e86 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -52,7 +52,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() { const SwRect aObjBoundRect( GetAnchoredObj().GetObjRect() ); - SWRECTFN( (&GetAnchorFrame()) ); + SwRectFnSet aRectFnSet(&GetAnchorFrame()); const SwFrameFormat& rFrameFormat = GetFrameFormat(); const SvxLRSpaceItem &rLR = rFrameFormat.GetLRSpace(); @@ -103,11 +103,11 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() // determine absolute 'vertical' position, depending on layout-direction // #i26791# - determine offset to 'vertical' frame // anchor position, depending on layout-direction - if( bVert ) + if( aRectFnSet.bVert ) { - OSL_ENSURE( !bRev, "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." ); + OSL_ENSURE( !aRectFnSet.bRev, "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." ); - if ( bVertL2R ) + if ( aRectFnSet.bVertL2R ) aRelPos.X() = nRelPosY; else aRelPos.X() = -nRelPosY - aObjBoundRect.Width(); @@ -159,7 +159,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() nWidth, nOffset, bDummy ); } - SwTwips nObjWidth = (aObjBoundRect.*fnRect->fnGetWidth)(); + SwTwips nObjWidth = (aObjBoundRect.*aRectFnSet->fnGetWidth)(); // determine relative horizontal position SwTwips nRelPosX; @@ -179,9 +179,9 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() nRelPosX = (nWidth / 2) - (nObjWidth / 2); else if ( text::HoriOrientation::RIGHT == eHoriOrient ) nRelPosX = nWidth - ( nObjWidth + - ( bVert ? rUL.GetLower() : rLR.GetRight() ) ); + ( aRectFnSet.bVert ? rUL.GetLower() : rLR.GetRight() ) ); else - nRelPosX = bVert ? rUL.GetUpper() : rLR.GetLeft(); + nRelPosX = aRectFnSet.bVert ? rUL.GetUpper() : rLR.GetLeft(); nRelPosX += nOffset; // no 'negative' relative horizontal position @@ -195,7 +195,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() // determine absolute 'horizontal' position, depending on layout-direction // #i26791# - determine offset to 'horizontal' frame // anchor position, depending on layout-direction - if( bVert || bVertL2R ) + if( aRectFnSet.bVert || aRectFnSet.bVertL2R ) { aRelPos.Y() = nRelPosX; |