diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2017-12-21 07:13:16 +0100 |
---|---|---|
committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2017-12-27 16:34:12 +0100 |
commit | df1a10dafd3a2263d6e46edcaa6e6c0a64a80598 (patch) | |
tree | a1410b1d4202b403e7d072dac2e27e2f59806a92 /svx | |
parent | 13153921bc8b548dd41915146ace9733e21c966f (diff) |
Directly access own data members, remove unused methods
Change-Id: Id86d66738da2f6e4b86d4a4ee8da54940c751787
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svddrag.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index e2d5cb5e5d39..ce0637eebb61 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -58,30 +58,30 @@ void SdrDragStat::Reset() void SdrDragStat::Reset(const Point& rPnt) { Reset(); - SetStart(rPnt); + mvPnts[0]=rPnt; aPos0=rPnt; - SetRealNow(rPnt); + aRealNow=rPnt; } void SdrDragStat::NextMove(const Point& rPnt) { - aPos0=GetNow(); - SetRealNow(rPnt); - SetNow(GetRealNow()); + aPos0=mvPnts.back(); + aRealNow=rPnt; + mvPnts.back()=rPnt; } void SdrDragStat::NextPoint() { - Point aPnt(GetNow()); - mvPnts.emplace_back(GetRealNow()); - SetPrev(aPnt); + Point aPnt(mvPnts.back()); + mvPnts.emplace_back(aRealNow); + mvPnts[GetPrevPos()] = aPnt; } void SdrDragStat::PrevPoint() { - if (mvPnts.size()>=2) { // one has to remain at all times + if (mvPnts.size()>1) { // one has to remain at all times mvPnts.erase(mvPnts.begin()+mvPnts.size()-2); - SetNow( GetRealNow() ); + mvPnts.back() = aRealNow; } } @@ -98,7 +98,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt) Fraction SdrDragStat::GetXFact() const { - long nMul=GetNow().X()-aRef1.X(); + long nMul=mvPnts.back().X()-aRef1.X(); long nDiv=GetPrev().X()-aRef1.X(); if (nDiv==0) nDiv=1; if (bHorFixed) { nMul=1; nDiv=1; } @@ -107,7 +107,7 @@ Fraction SdrDragStat::GetXFact() const Fraction SdrDragStat::GetYFact() const { - long nMul=GetNow().Y()-aRef1.Y(); + long nMul=mvPnts.back().Y()-aRef1.Y(); long nDiv=GetPrev().Y()-aRef1.Y(); if (nDiv==0) nDiv=1; if (bVerFixed) { nMul=1; nDiv=1; } @@ -116,9 +116,9 @@ Fraction SdrDragStat::GetYFact() const void SdrDragStat::TakeCreateRect(tools::Rectangle& rRect) const { - rRect=tools::Rectangle(GetStart(),GetNow()); - if (GetPointCount()>=2) { - Point aBtmRgt(GetPoint(1)); + rRect=tools::Rectangle(mvPnts[0], mvPnts.back()); + if (mvPnts.size()>1) { + Point aBtmRgt(mvPnts[1]); rRect.Right()=aBtmRgt.X(); rRect.Bottom()=aBtmRgt.Y(); } |