Kaydet (Commit) df1a10da authored tarafından Matteo Casalin's avatar Matteo Casalin

Directly access own data members, remove unused methods

Change-Id: Id86d66738da2f6e4b86d4a4ee8da54940c751787
üst 13153921
...@@ -77,6 +77,8 @@ class SVX_DLLPUBLIC SdrDragStat final ...@@ -77,6 +77,8 @@ class SVX_DLLPUBLIC SdrDragStat final
void Clear(); void Clear();
sal_Int32 GetPrevPos() const { return mvPnts.size()-(mvPnts.size()>1 ? 2 : 1); }
public: public:
SdrDragStat() { Reset(); } SdrDragStat() { Reset(); }
~SdrDragStat(); ~SdrDragStat();
...@@ -88,14 +90,10 @@ public: ...@@ -88,14 +90,10 @@ public:
const Point& GetPoint(sal_Int32 nNum) const { return mvPnts[nNum]; } const Point& GetPoint(sal_Int32 nNum) const { return mvPnts[nNum]; }
sal_Int32 GetPointCount() const { return mvPnts.size(); } sal_Int32 GetPointCount() const { return mvPnts.size(); }
const Point& GetStart() const { return mvPnts[0]; } const Point& GetStart() const { return mvPnts[0]; }
void SetStart(const Point &pt) { mvPnts[0] = pt; } const Point& GetPrev() const { return mvPnts[GetPrevPos()]; }
const Point& GetPrev() const { return mvPnts[GetPointCount()-(GetPointCount()>=2 ? 2:1)]; }
void SetPrev(const Point &pt) { mvPnts[GetPointCount()-(GetPointCount()>=2 ? 2:1)] = pt; }
const Point& GetPos0() const { return aPos0; } const Point& GetPos0() const { return aPos0; }
const Point& GetNow() const { return mvPnts.back(); } const Point& GetNow() const { return mvPnts.back(); }
void SetNow(Point const &pt) { mvPnts.back() = pt; } void SetNow(Point const &pt) { mvPnts.back() = pt; }
const Point& GetRealNow() const { return aRealNow; }
void SetRealNow(Point const &pt) { aRealNow = pt; }
const Point& GetRef1() const { return aRef1; } const Point& GetRef1() const { return aRef1; }
void SetRef1(const Point &pt) { aRef1 = pt; } void SetRef1(const Point &pt) { aRef1 = pt; }
const Point& GetRef2() const { return aRef2; } const Point& GetRef2() const { return aRef2; }
......
...@@ -58,30 +58,30 @@ void SdrDragStat::Reset() ...@@ -58,30 +58,30 @@ void SdrDragStat::Reset()
void SdrDragStat::Reset(const Point& rPnt) void SdrDragStat::Reset(const Point& rPnt)
{ {
Reset(); Reset();
SetStart(rPnt); mvPnts[0]=rPnt;
aPos0=rPnt; aPos0=rPnt;
SetRealNow(rPnt); aRealNow=rPnt;
} }
void SdrDragStat::NextMove(const Point& rPnt) void SdrDragStat::NextMove(const Point& rPnt)
{ {
aPos0=GetNow(); aPos0=mvPnts.back();
SetRealNow(rPnt); aRealNow=rPnt;
SetNow(GetRealNow()); mvPnts.back()=rPnt;
} }
void SdrDragStat::NextPoint() void SdrDragStat::NextPoint()
{ {
Point aPnt(GetNow()); Point aPnt(mvPnts.back());
mvPnts.emplace_back(GetRealNow()); mvPnts.emplace_back(aRealNow);
SetPrev(aPnt); mvPnts[GetPrevPos()] = aPnt;
} }
void SdrDragStat::PrevPoint() 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); mvPnts.erase(mvPnts.begin()+mvPnts.size()-2);
SetNow( GetRealNow() ); mvPnts.back() = aRealNow;
} }
} }
...@@ -98,7 +98,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt) ...@@ -98,7 +98,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt)
Fraction SdrDragStat::GetXFact() const Fraction SdrDragStat::GetXFact() const
{ {
long nMul=GetNow().X()-aRef1.X(); long nMul=mvPnts.back().X()-aRef1.X();
long nDiv=GetPrev().X()-aRef1.X(); long nDiv=GetPrev().X()-aRef1.X();
if (nDiv==0) nDiv=1; if (nDiv==0) nDiv=1;
if (bHorFixed) { nMul=1; nDiv=1; } if (bHorFixed) { nMul=1; nDiv=1; }
...@@ -107,7 +107,7 @@ Fraction SdrDragStat::GetXFact() const ...@@ -107,7 +107,7 @@ Fraction SdrDragStat::GetXFact() const
Fraction SdrDragStat::GetYFact() const Fraction SdrDragStat::GetYFact() const
{ {
long nMul=GetNow().Y()-aRef1.Y(); long nMul=mvPnts.back().Y()-aRef1.Y();
long nDiv=GetPrev().Y()-aRef1.Y(); long nDiv=GetPrev().Y()-aRef1.Y();
if (nDiv==0) nDiv=1; if (nDiv==0) nDiv=1;
if (bVerFixed) { nMul=1; nDiv=1; } if (bVerFixed) { nMul=1; nDiv=1; }
...@@ -116,9 +116,9 @@ Fraction SdrDragStat::GetYFact() const ...@@ -116,9 +116,9 @@ Fraction SdrDragStat::GetYFact() const
void SdrDragStat::TakeCreateRect(tools::Rectangle& rRect) const void SdrDragStat::TakeCreateRect(tools::Rectangle& rRect) const
{ {
rRect=tools::Rectangle(GetStart(),GetNow()); rRect=tools::Rectangle(mvPnts[0], mvPnts.back());
if (GetPointCount()>=2) { if (mvPnts.size()>1) {
Point aBtmRgt(GetPoint(1)); Point aBtmRgt(mvPnts[1]);
rRect.Right()=aBtmRgt.X(); rRect.Right()=aBtmRgt.X();
rRect.Bottom()=aBtmRgt.Y(); rRect.Bottom()=aBtmRgt.Y();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment