diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-30 20:27:55 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 06:27:11 +0000 |
commit | a5a571307fb3306b74ab46b085cde6388270a770 (patch) | |
tree | 66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /svx/source/svdraw/svdovirt.cxx | |
parent | 17d821af6bb9df93569836a92f6bed975587fc6c (diff) |
tdf#82580 tools: rename Rectangle to tools::Rectangle
Mostly generated using
make check COMPILER_EXTERNAL_TOOL=1 CCACHE_PREFIX=clang-rename-wrapper RENAME_ARGS="-qualified-name=Rectangle -new-name=tools::Rectangle"
Except some modules have their own foo::tools namespace, so there have
to use ::tools::Rectangle. This commit just moves the class from the
global namespace, it does not update pre/postwin.h yet.
Change-Id: I42b2de3c6f769fcf28cfe086f98eb31e42a305f2
Reviewed-on: https://gerrit.libreoffice.org/35923
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'svx/source/svdraw/svdovirt.cxx')
-rw-r--r-- | svx/source/svdraw/svdovirt.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index f277a14adca8..00ee676799b3 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -108,14 +108,14 @@ SdrObjList* SdrVirtObj::GetSubList() const return rRefObj.GetSubList(); } -const Rectangle& SdrVirtObj::GetCurrentBoundRect() const +const tools::Rectangle& SdrVirtObj::GetCurrentBoundRect() const { const_cast<SdrVirtObj*>(this)->aOutRect=rRefObj.GetCurrentBoundRect(); // TODO: Optimize this. const_cast<SdrVirtObj*>(this)->aOutRect+=aAnchor; return aOutRect; } -const Rectangle& SdrVirtObj::GetLastBoundRect() const +const tools::Rectangle& SdrVirtObj::GetLastBoundRect() const { const_cast<SdrVirtObj*>(this)->aOutRect=rRefObj.GetLastBoundRect(); // TODO: Optimize this. const_cast<SdrVirtObj*>(this)->aOutRect+=aAnchor; @@ -368,7 +368,7 @@ void SdrVirtObj::NbcShear(const Point& rRef, long nAngle, double tn, bool bVShea void SdrVirtObj::Move(const Size& rSiz) { if (rSiz.Width()!=0 || rSiz.Height()!=0) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); NbcMove(rSiz); SetChanged(); BroadcastObjectChange(); @@ -379,7 +379,7 @@ void SdrVirtObj::Move(const Size& rSiz) void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative) { if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Resize(rRef-aAnchor,xFact,yFact, bUnsetRelative); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize,aBoundRect0); @@ -389,7 +389,7 @@ void SdrVirtObj::Resize(const Point& rRef, const Fraction& xFact, const Fraction void SdrVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs) { if (nAngle!=0) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Rotate(rRef-aAnchor,nAngle,sn,cs); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize,aBoundRect0); @@ -398,7 +398,7 @@ void SdrVirtObj::Rotate(const Point& rRef, long nAngle, double sn, double cs) void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Mirror(rRef1-aAnchor,rRef2-aAnchor); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize,aBoundRect0); @@ -407,7 +407,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2) void SdrVirtObj::Shear(const Point& rRef, long nAngle, double tn, bool bVShear) { if (nAngle!=0) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.Shear(rRef-aAnchor,nAngle,tn,bVShear); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize,aBoundRect0); @@ -421,18 +421,18 @@ void SdrVirtObj::RecalcSnapRect() aSnapRect+=aAnchor; } -const Rectangle& SdrVirtObj::GetSnapRect() const +const tools::Rectangle& SdrVirtObj::GetSnapRect() const { const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetSnapRect(); const_cast<SdrVirtObj*>(this)->aSnapRect+=aAnchor; return aSnapRect; } -void SdrVirtObj::SetSnapRect(const Rectangle& rRect) +void SdrVirtObj::SetSnapRect(const tools::Rectangle& rRect) { { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); - Rectangle aR(rRect); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aR(rRect); aR-=aAnchor; rRefObj.SetSnapRect(aR); SetRectsDirty(); @@ -440,35 +440,35 @@ void SdrVirtObj::SetSnapRect(const Rectangle& rRect) } } -void SdrVirtObj::NbcSetSnapRect(const Rectangle& rRect) +void SdrVirtObj::NbcSetSnapRect(const tools::Rectangle& rRect) { - Rectangle aR(rRect); + tools::Rectangle aR(rRect); aR-=aAnchor; SetRectsDirty(); rRefObj.NbcSetSnapRect(aR); } -const Rectangle& SdrVirtObj::GetLogicRect() const +const tools::Rectangle& SdrVirtObj::GetLogicRect() const { const_cast<SdrVirtObj*>(this)->aSnapRect=rRefObj.GetLogicRect(); // An abuse of aSnapRect! const_cast<SdrVirtObj*>(this)->aSnapRect+=aAnchor; // If there's trouble, we need another Rectangle Member (or a Heap). return aSnapRect; } -void SdrVirtObj::SetLogicRect(const Rectangle& rRect) +void SdrVirtObj::SetLogicRect(const tools::Rectangle& rRect) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); - Rectangle aR(rRect); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aR(rRect); aR-=aAnchor; rRefObj.SetLogicRect(aR); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize,aBoundRect0); } -void SdrVirtObj::NbcSetLogicRect(const Rectangle& rRect) +void SdrVirtObj::NbcSetLogicRect(const tools::Rectangle& rRect) { - Rectangle aR(rRect); + tools::Rectangle aR(rRect); aR-=aAnchor; SetRectsDirty(); rRefObj.NbcSetLogicRect(aR); @@ -546,7 +546,7 @@ SdrObjGeoData* SdrVirtObj::GetGeoData() const void SdrVirtObj::SetGeoData(const SdrObjGeoData& rGeo) { - Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); + tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); rRefObj.SetGeoData(rGeo); SetRectsDirty(); SendUserCall(SdrUserCallType::Resize,aBoundRect0); @@ -579,7 +579,7 @@ Pointer SdrVirtObj::GetMacroPointer(const SdrObjMacroHitRec& rRec) const return rRefObj.GetMacroPointer(rRec); // TODO: positioning offset } -void SdrVirtObj::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const +void SdrVirtObj::PaintMacro(OutputDevice& rOut, const tools::Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const { rRefObj.PaintMacro(rOut,rDirtyRect,rRec); // TODO: positioning offset } |