diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-12-06 22:46:31 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-12-08 09:39:51 +0000 |
| commit | 34132442982c6c936dc1fa3f23bc68b22b4e2eae (patch) | |
| tree | aa873fd7db3e510f5c9f289e3817d2495e08ef9d /sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | |
| parent | 9bd471cb76e47c8db2e885232bbe9732ac2d7e2b (diff) | |
SwRectFnSet: hide pointer-to-(member)function syntax
Change-Id: I700e51dbfe0768642d482556299407f8f198e998
Reviewed-on: https://gerrit.libreoffice.org/31709
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx')
| -rw-r--r-- | sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 1186abd52e86..4e6b35352b36 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -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( aRectFnSet.bVert ) + if( aRectFnSet.IsVert() ) { - OSL_ENSURE( !aRectFnSet.bRev, "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." ); + OSL_ENSURE( !aRectFnSet.IsRev(), "<SwToLayoutAnchoredObjectPosition::CalcPosition()> - reverse layout set." ); - if ( aRectFnSet.bVertL2R ) + if ( aRectFnSet.IsVertL2R() ) aRelPos.X() = nRelPosY; else aRelPos.X() = -nRelPosY - aObjBoundRect.Width(); @@ -159,7 +159,7 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() nWidth, nOffset, bDummy ); } - SwTwips nObjWidth = (aObjBoundRect.*aRectFnSet->fnGetWidth)(); + SwTwips nObjWidth = aRectFnSet.GetWidth(aObjBoundRect); // 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 + - ( aRectFnSet.bVert ? rUL.GetLower() : rLR.GetRight() ) ); + ( aRectFnSet.IsVert() ? rUL.GetLower() : rLR.GetRight() ) ); else - nRelPosX = aRectFnSet.bVert ? rUL.GetUpper() : rLR.GetLeft(); + nRelPosX = aRectFnSet.IsVert() ? 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( aRectFnSet.bVert || aRectFnSet.bVertL2R ) + if( aRectFnSet.IsVert() || aRectFnSet.IsVertL2R() ) { aRelPos.Y() = nRelPosX; |