diff options
Diffstat (limited to 'sw/source/core/frmedt/feshview.cxx')
| -rw-r--r-- | sw/source/core/frmedt/feshview.cxx | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index cc88b7e5bb2f..787db5fbecf7 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -331,12 +331,20 @@ bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj ) * for the nearest fly frame in the given direction. */ -#define LESS_X( aPt1, aPt2, bOld ) ( aPt1.getX() < aPt2.getX() || \ - ( aPt1.getX() == aPt2.getX() && ( aPt1.getY() < aPt2.getY() || \ - ( aPt1.getY() == aPt2.getY() && bOld ) ) ) ) -#define LESS_Y( aPt1, aPt2, bOld ) ( aPt1.getY() < aPt2.getY() || \ - ( aPt1.getY() == aPt2.getY() && ( aPt1.getX() < aPt2.getX() || \ - ( aPt1.getX() == aPt2.getX() && bOld ) ) ) ) +static bool LessX( Point const & aPt1, Point const & aPt2, bool bOld ) +{ + return aPt1.getX() < aPt2.getX() + || ( aPt1.getX() == aPt2.getX() + && ( aPt1.getY() < aPt2.getY() + || ( aPt1.getY() == aPt2.getY() && bOld ) ) ); +} +static bool LessY( Point const & aPt1, Point const & aPt2, bool bOld ) +{ + return aPt1.getY() < aPt2.getY() + || ( aPt1.getY() == aPt2.getY() + && ( aPt1.getX() < aPt2.getX() + || ( aPt1.getX() == aPt2.getX() && bOld ) ) ); +} bool SwFEShell::MoveAnchor( SwMove nDir ) { @@ -495,30 +503,30 @@ bool SwFEShell::MoveAnchor( SwMove nDir ) switch( nDir ) { case SwMove::RIGHT: { - bAccept = LESS_X( aCenter, aNew, bOld ) + bAccept = LessX( aCenter, aNew, bOld ) && ( !pNewFly || - LESS_X( aNew, aBest, false ) ); + LessX( aNew, aBest, false ) ); break; } case SwMove::LEFT: { - bAccept = LESS_X( aNew, aCenter, !bOld ) + bAccept = LessX( aNew, aCenter, !bOld ) && ( !pNewFly || - LESS_X( aBest, aNew, true ) ); + LessX( aBest, aNew, true ) ); break; } case SwMove::UP: { - bAccept = LESS_Y( aNew, aCenter, !bOld ) + bAccept = LessY( aNew, aCenter, !bOld ) && ( !pNewFly || - LESS_Y( aBest, aNew, true ) ); + LessY( aBest, aNew, true ) ); break; } case SwMove::DOWN: { - bAccept = LESS_Y( aCenter, aNew, bOld ) + bAccept = LessY( aCenter, aNew, bOld ) && ( !pNewFly || - LESS_Y( aNew, aBest, false ) ); + LessY( aNew, aBest, false ) ); break; } } |