summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-27 17:12:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-28 12:47:31 +0100
commitefe22f3fa2375c233b86d9a4556e2cd7eed85f9d (patch)
tree6c8283a52080c266f54ea416befd31d3f7456893 /include
parent398d10a506f9f1c4109d012f22f0e85ee571fe9f (diff)
drop old tools/gen methods in reportdesign..xmloff
Change-Id: I398831c526ba51d861557fa6c13c0e2fb44dfbe0 Reviewed-on: https://gerrit.libreoffice.org/50447 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdpntv.hxx2
-rw-r--r--include/svx/svdtrans.hxx16
-rw-r--r--include/tools/gen.hxx2
3 files changed, 10 insertions, 10 deletions
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 24bdb25d7d41..209a6ff183d8 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -391,7 +391,7 @@ public:
void SetGridCoarse(const Size& rSiz) { maGridBig=rSiz; }
void SetGridFine(const Size& rSiz) {
maGridFin=rSiz;
- if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width();
+ if (maGridFin.Height()==0) maGridFin.setHeight(maGridFin.Width());
if (mbGridVisible) InvalidateAllWin();
}
const Size& GetGridCoarse() const { return maGridBig; }
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 97bf7a5456a4..75a1bcff5789 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -113,27 +113,27 @@ inline void ResizePoint(Point& rPnt, const Point& rRef, const Fraction& xFract,
{
double nxFract = xFract.IsValid() ? static_cast<double>(xFract) : 1.0;
double nyFract = yFract.IsValid() ? static_cast<double>(yFract) : 1.0;
- rPnt.X() = rRef.X() + svx::Round( (rPnt.X() - rRef.X()) * nxFract );
- rPnt.Y() = rRef.Y() + svx::Round( (rPnt.Y() - rRef.Y()) * nyFract );
+ rPnt.setX(rRef.X() + svx::Round( (rPnt.X() - rRef.X()) * nxFract ));
+ rPnt.setY(rRef.Y() + svx::Round( (rPnt.Y() - rRef.Y()) * nyFract ));
}
inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs)
{
long dx=rPnt.X()-rRef.X();
long dy=rPnt.Y()-rRef.Y();
- rPnt.X()=svx::Round(rRef.X()+dx*cs+dy*sn);
- rPnt.Y()=svx::Round(rRef.Y()+dy*cs-dx*sn);
+ rPnt.setX(svx::Round(rRef.X()+dx*cs+dy*sn));
+ rPnt.setY(svx::Round(rRef.Y()+dy*cs-dx*sn));
}
inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear)
{
if (!bVShear) { // Horizontal
if (rPnt.Y()!=rRef.Y()) { // else not needed
- rPnt.X()-=svx::Round((rPnt.Y()-rRef.Y())*tn);
+ rPnt.AdjustX(-svx::Round((rPnt.Y()-rRef.Y())*tn));
}
} else { // or else vertical
if (rPnt.X()!=rRef.X()) { // else not needed
- rPnt.Y()-=svx::Round((rPnt.X()-rRef.X())*tn);
+ rPnt.AdjustY(-svx::Round((rPnt.X()-rRef.X())*tn));
}
}
}
@@ -144,11 +144,11 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad
if (bVertical) {
long dy=rPnt.Y()-rCenter.Y();
nAngle=static_cast<double>(dy)/static_cast<double>(rRad.Y());
- rPnt.Y()=rCenter.Y();
+ rPnt.setY(rCenter.Y());
} else {
long dx=rCenter.X()-rPnt.X();
nAngle=static_cast<double>(dx)/static_cast<double>(rRad.X());
- rPnt.X()=rCenter.X();
+ rPnt.setX(rCenter.X());
}
return nAngle;
}
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index 754f6c3b459c..38f80404e1f6 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -88,7 +88,7 @@ public:
long AdjustY( long nVertMove ) { nB += nVertMove; return nB; }
void RotateAround( long& rX, long& rY, short nOrientation ) const;
-
+ void RotateAround( Point&, short nOrientation ) const;
Point& operator += ( const Point& rPoint );
Point& operator -= ( const Point& rPoint );