diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-10-29 15:01:37 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-04 12:30:39 -0500 |
commit | 222d79a895f5ee6b4ae3459d72e863e776c535e8 (patch) | |
tree | 4a1f753dd50fbbc7466526c25ddd42332140ff11 /svx/source/svdraw/svdocapt.cxx | |
parent | e2f674e475b8705c02962e564956952108060ade (diff) |
Rename aRect -> maRect for a member variable.
Conflicts:
svx/source/svdraw/svdoashp.cxx
svx/source/svdraw/svdocirc.cxx
svx/source/svdraw/svdograf.cxx
svx/source/svdraw/svdoole2.cxx
svx/source/svdraw/svdorect.cxx
svx/source/svdraw/svdotext.cxx
svx/source/svdraw/svdotxdr.cxx
svx/source/svdraw/svdotxtr.cxx
Change-Id: I12dc6c12ee44753c63b15f03276cdaa24e57d395
Diffstat (limited to 'svx/source/svdraw/svdocapt.cxx')
-rw-r--r-- | svx/source/svdraw/svdocapt.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 1390794f6cf6..d556b6493fac 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -330,7 +330,7 @@ bool SdrCaptionObj::beginSpecialDrag(SdrDragStat& rDrag) const return false; rDrag.SetNoSnap(true); - rDrag.SetActionRect(aRect); + rDrag.SetActionRect(maRect); Point aHit(rDrag.GetStart()); @@ -367,7 +367,7 @@ bool SdrCaptionObj::applySpecialDrag(SdrDragStat& rDrag) if(!pHdl) { - aRect.Move(aDelt.X(),aDelt.Y()); + maRect.Move(aDelt.X(),aDelt.Y()); } else { @@ -436,7 +436,7 @@ void SdrCaptionObj::ImpRecalcTail() { ImpCaptParams aPara; ImpGetCaptParams(aPara); - ImpCalcTail(aPara,aTailPoly,aRect); + ImpCalcTail(aPara, aTailPoly, maRect); SetRectsDirty(); SetXPolyDirty(); } @@ -544,14 +544,14 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect bool SdrCaptionObj::BegCreate(SdrDragStat& rStat) { - if (aRect.IsEmpty()) return false; // Create currently only works with the given Rect + if (maRect.IsEmpty()) return false; // Create currently only works with the given Rect ImpCaptParams aPara; ImpGetCaptParams(aPara); - aRect.SetPos(rStat.GetNow()); + maRect.SetPos(rStat.GetNow()); aTailPoly[0]=rStat.GetStart(); - ImpCalcTail(aPara,aTailPoly,aRect); - rStat.SetActionRect(aRect); + ImpCalcTail(aPara,aTailPoly,maRect); + rStat.SetActionRect(maRect); return true; } @@ -559,9 +559,9 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat) { ImpCaptParams aPara; ImpGetCaptParams(aPara); - aRect.SetPos(rStat.GetNow()); - ImpCalcTail(aPara,aTailPoly,aRect); - rStat.SetActionRect(aRect); + maRect.SetPos(rStat.GetNow()); + ImpCalcTail(aPara,aTailPoly,maRect); + rStat.SetActionRect(maRect); SetBoundRectDirty(); bSnapRectDirty=true; return true; @@ -571,8 +571,8 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { ImpCaptParams aPara; ImpGetCaptParams(aPara); - aRect.SetPos(rStat.GetNow()); - ImpCalcTail(aPara,aTailPoly,aRect); + maRect.SetPos(rStat.GetNow()); + ImpCalcTail(aPara,aTailPoly,maRect); SetRectsDirty(); return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2); } @@ -589,7 +589,7 @@ void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/) basegfx::B2DPolyPolygon SdrCaptionObj::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const { basegfx::B2DPolyPolygon aRetval; - const basegfx::B2DRange aRange(aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom()); + const basegfx::B2DRange aRange(maRect.Left(), maRect.Top(), maRect.Right(), maRect.Bottom()); aRetval.append(basegfx::tools::createPolygonFromRect(aRange)); aRetval.append(aTailPoly.getB2DPolygon()); return aRetval; @@ -664,7 +664,7 @@ void SdrCaptionObj::NbcSetSnapRect(const Rectangle& rRect) const Rectangle& SdrCaptionObj::GetLogicRect() const { - return aRect; + return maRect; } void SdrCaptionObj::NbcSetLogicRect(const Rectangle& rRect) |