summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svddrgmt.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svddrgmt.cxx')
-rw-r--r--svx/source/svdraw/svddrgmt.cxx68
1 files changed, 34 insertions, 34 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 6233184ab494..1cb2f5aa8bd3 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -997,8 +997,8 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
Point aDif(aPnt-DragStat().GetStart());
getSdrDragView().CheckSnap(Ref1()+aDif,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
getSdrDragView().CheckSnap(Ref2()+aDif,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
- aPnt.X()+=nBestXSnap;
- aPnt.Y()+=nBestYSnap;
+ aPnt.AdjustX(nBestXSnap );
+ aPnt.AdjustY(nBestYSnap );
}
if (aPnt!=DragStat().GetNow())
@@ -1061,8 +1061,8 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
// eliminate rounding errors for certain values
if (nSA==9000)
{
- if (nNewAngle==0 || nNewAngle==18000) aPnt.Y()=aRef.Y();
- if (nNewAngle==9000 || nNewAngle==27000) aPnt.X()=aRef.X();
+ if (nNewAngle==0 || nNewAngle==18000) aPnt.setY(aRef.Y() );
+ if (nNewAngle==9000 || nNewAngle==27000) aPnt.setX(aRef.X() );
}
if (nSA==4500)
@@ -1560,8 +1560,8 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
const tools::Rectangle& aSR=GetMarkedRect();
long nMovedx=aNoSnapPnt.X()-DragStat().GetStart().X();
long nMovedy=aNoSnapPnt.Y()-DragStat().GetStart().Y();
- Point aLO(aSR.TopLeft()); aLO.X()+=nMovedx; aLO.Y()+=nMovedy;
- Point aRU(aSR.BottomRight()); aRU.X()+=nMovedx; aRU.Y()+=nMovedy;
+ Point aLO(aSR.TopLeft()); aLO.AdjustX(nMovedx ); aLO.AdjustY(nMovedy );
+ Point aRU(aSR.BottomRight()); aRU.AdjustX(nMovedx ); aRU.AdjustY(nMovedy );
Point aLU(aLO.X(),aRU.Y());
Point aRO(aRU.X(),aLO.Y());
ImpCheckSnap(aLO);
@@ -1607,15 +1607,15 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
if (aSR2.Left()<aLR.Left())
{
- aPt1.X()-=aSR2.Left()-aLR.Left();
+ aPt1.AdjustX( -(aSR2.Left()-aLR.Left()) );
}
else if (aSR2.Right()>aLR.Right())
{
- aPt1.X()-=aSR2.Right()-aLR.Right();
+ aPt1.AdjustX( -(aSR2.Right()-aLR.Right()) );
}
}
else
- aPt1.X()=DragStat().GetStart().X(); // no space to move to
+ aPt1.setX(DragStat().GetStart().X() ); // no space to move to
if (aSR2.Top()>aLR.Top() || aSR2.Bottom()<aLR.Bottom())
{ // any space to move to?
@@ -1623,15 +1623,15 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
if (aSR2.Top()<aLR.Top())
{
- aPt1.Y()-=aSR2.Top()-aLR.Top();
+ aPt1.AdjustY( -(aSR2.Top()-aLR.Top()) );
}
else if (aSR2.Bottom()>aLR.Bottom())
{
- aPt1.Y()-=aSR2.Bottom()-aLR.Bottom();
+ aPt1.AdjustY( -(aSR2.Bottom()-aLR.Bottom()) );
}
}
else
- aPt1.Y()=DragStat().GetStart().Y(); // no space to move to
+ aPt1.setY(DragStat().GetStart().Y() ); // no space to move to
}
if (getSdrDragView().IsDraggingGluePoints())
@@ -1660,10 +1660,10 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_)
{
Point aPt((*pGPL)[nGlueNum].GetAbsolutePos(*pObj));
aPt+=aPt1; // move by this much
- if (aPt.X()<aBound.Left() ) aPt1.X()-=aPt.X()-aBound.Left() ;
- if (aPt.X()>aBound.Right() ) aPt1.X()-=aPt.X()-aBound.Right() ;
- if (aPt.Y()<aBound.Top() ) aPt1.Y()-=aPt.Y()-aBound.Top() ;
- if (aPt.Y()>aBound.Bottom()) aPt1.Y()-=aPt.Y()-aBound.Bottom();
+ if (aPt.X()<aBound.Left() ) aPt1.AdjustX( -(aPt.X()-aBound.Left()) ) ;
+ if (aPt.X()>aBound.Right() ) aPt1.AdjustX( -(aPt.X()-aBound.Right()) ) ;
+ if (aPt.Y()<aBound.Top() ) aPt1.AdjustY( -(aPt.Y()-aBound.Top()) ) ;
+ if (aPt.Y()>aBound.Bottom()) aPt1.AdjustY( -(aPt.Y()-aBound.Bottom()) );
}
}
}
@@ -1858,14 +1858,14 @@ void SdrDragResize::MoveSdrDrag(const Point& rNoSnapPnt)
}
if (aPnt.X()<aLR.Left())
- aPnt.X()=aLR.Left();
+ aPnt.setX(aLR.Left() );
else if (aPnt.X()>aLR.Right())
- aPnt.X()=aLR.Right();
+ aPnt.setX(aLR.Right() );
if (aPnt.Y()<aLR.Top())
- aPnt.Y()=aLR.Top();
+ aPnt.setY(aLR.Top() );
else if (aPnt.Y()>aLR.Bottom())
- aPnt.Y()=aLR.Bottom();
+ aPnt.setY(aLR.Bottom() );
if (aRef.X()>aSR.Left())
{
@@ -2303,9 +2303,9 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
if (!bSlant && !bResize)
{ // shear, but no resize
if (bVertical)
- aPnt.X()=aP0.X();
+ aPnt.setX(aP0.X() );
else
- aPnt.Y()=aP0.Y();
+ aPnt.setY(aP0.Y() );
}
Point aRef(DragStat().GetRef1());
@@ -3100,22 +3100,22 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
if (bVertical)
{
- aNeuCenter.X()=aStart.X();
- aNeuCenter.Y()=aMarkCenter.Y();
+ aNeuCenter.setX(aStart.X() );
+ aNeuCenter.setY(aMarkCenter.Y() );
}
if (!getSdrDragView().IsCrookAtCenter())
{
switch (GetDragHdlKind())
{
- case SdrHdlKind::UpperLeft: aNeuCenter.X()=aMarkRect.Right(); bLft=true; break;
- case SdrHdlKind::Upper: aNeuCenter.Y()=aMarkRect.Bottom(); bUpr=true; break;
- case SdrHdlKind::UpperRight: aNeuCenter.X()=aMarkRect.Left(); bRgt=true; break;
- case SdrHdlKind::Left : aNeuCenter.X()=aMarkRect.Right(); bLft=true; break;
- case SdrHdlKind::Right: aNeuCenter.X()=aMarkRect.Left(); bRgt=true; break;
- case SdrHdlKind::LowerLeft: aNeuCenter.X()=aMarkRect.Right(); bLft=true; break;
- case SdrHdlKind::Lower: aNeuCenter.Y()=aMarkRect.Top(); bLwr=true; break;
- case SdrHdlKind::LowerRight: aNeuCenter.X()=aMarkRect.Left(); bRgt=true; break;
+ case SdrHdlKind::UpperLeft: aNeuCenter.setX(aMarkRect.Right() ); bLft=true; break;
+ case SdrHdlKind::Upper: aNeuCenter.setY(aMarkRect.Bottom() ); bUpr=true; break;
+ case SdrHdlKind::UpperRight: aNeuCenter.setX(aMarkRect.Left() ); bRgt=true; break;
+ case SdrHdlKind::Left : aNeuCenter.setX(aMarkRect.Right() ); bLft=true; break;
+ case SdrHdlKind::Right: aNeuCenter.setX(aMarkRect.Left() ); bRgt=true; break;
+ case SdrHdlKind::LowerLeft: aNeuCenter.setX(aMarkRect.Right() ); bLft=true; break;
+ case SdrHdlKind::Lower: aNeuCenter.setY(aMarkRect.Top() ); bLwr=true; break;
+ case SdrHdlKind::LowerRight: aNeuCenter.setX(aMarkRect.Left() ); bRgt=true; break;
default: bAtCenter=true;
}
}
@@ -3147,14 +3147,14 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt)
{
a=static_cast<double>(dy1)/static_cast<double>(dx1); // slope of the radius
nNeuRad=(static_cast<long>(dy1*a)+dx1) /2;
- aNeuCenter.X()+=nNeuRad;
+ aNeuCenter.AdjustX(nNeuRad );
nPntWink=GetAngle(aPnt-aNeuCenter);
}
else
{
a=static_cast<double>(dx1)/static_cast<double>(dy1); // slope of the radius
nNeuRad=(static_cast<long>(dx1*a)+dy1) /2;
- aNeuCenter.Y()+=nNeuRad;
+ aNeuCenter.AdjustY(nNeuRad );
nPntWink=GetAngle(aPnt-aNeuCenter)-9000;
}
generated by cgit (git 2.34.1) at 2024-06-24 12:18:45 +0000