summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdogrp.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-03-30 20:27:55 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-03-31 06:27:11 +0000
commita5a571307fb3306b74ab46b085cde6388270a770 (patch)
tree66d4ce12bb5236c50ab6a5d253bc8c6d8b5d292d /svx/source/svdraw/svdogrp.cxx
parent17d821af6bb9df93569836a92f6bed975587fc6c (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/svdogrp.cxx')
-rw-r--r--svx/source/svdraw/svdogrp.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 62a368220264..3ba147e89433 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -218,7 +218,7 @@ SdrObjList* SdrObjGroup::GetSubList() const
return pSub.get();
}
-const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
+const tools::Rectangle& SdrObjGroup::GetCurrentBoundRect() const
{
// <aOutRect> has to contain the bounding rectangle
if ( pSub->GetObjCount()!=0 )
@@ -229,7 +229,7 @@ const Rectangle& SdrObjGroup::GetCurrentBoundRect() const
return aOutRect;
}
-const Rectangle& SdrObjGroup::GetSnapRect() const
+const tools::Rectangle& SdrObjGroup::GetSnapRect() const
{
// <aOutRect> has to contain the bounding rectangle
if ( pSub->GetObjCount()!=0 )
@@ -369,9 +369,9 @@ long SdrObjGroup::GetShearAngle(bool /*bVertical*/) const
}
-void SdrObjGroup::NbcSetSnapRect(const Rectangle& rRect)
+void SdrObjGroup::NbcSetSnapRect(const tools::Rectangle& rRect)
{
- Rectangle aOld(GetSnapRect());
+ tools::Rectangle aOld(GetSnapRect());
long nMulX=rRect.Right()-rRect.Left();
long nDivX=aOld.Right()-aOld.Left();
long nMulY=rRect.Bottom()-rRect.Top();
@@ -389,7 +389,7 @@ void SdrObjGroup::NbcSetSnapRect(const Rectangle& rRect)
}
-void SdrObjGroup::NbcSetLogicRect(const Rectangle& rRect)
+void SdrObjGroup::NbcSetLogicRect(const tools::Rectangle& rRect)
{
NbcSetSnapRect(rRect);
}
@@ -503,10 +503,10 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
}
-void SdrObjGroup::SetSnapRect(const Rectangle& rRect)
+void SdrObjGroup::SetSnapRect(const tools::Rectangle& rRect)
{
- Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
- Rectangle aOld(GetSnapRect());
+ tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aOld(GetSnapRect());
long nMulX=rRect.Right()-rRect.Left();
long nDivX=aOld.Right()-aOld.Left();
long nMulY=rRect.Bottom()-rRect.Top();
@@ -528,7 +528,7 @@ void SdrObjGroup::SetSnapRect(const Rectangle& rRect)
}
-void SdrObjGroup::SetLogicRect(const Rectangle& rRect)
+void SdrObjGroup::SetLogicRect(const tools::Rectangle& rRect)
{
SetSnapRect(rRect);
}
@@ -537,7 +537,7 @@ void SdrObjGroup::SetLogicRect(const Rectangle& rRect)
void SdrObjGroup::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();
MovePoint(aRefPoint,rSiz);
if (pSub->GetObjCount()!=0) {
// first move the connectors, then everything else
@@ -581,7 +581,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
NbcMirrorGluePoints(aRef1,aRef2);
}
}
- Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
ResizePoint(aRefPoint,rRef,xFact,yFact);
if (pSub->GetObjCount()!=0) {
// move the connectors first, everything else afterwards
@@ -611,7 +611,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nAngle, double sn, double cs)
{
if (nAngle!=0) {
SetGlueReallyAbsolute(true);
- Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
RotatePoint(aRefPoint,rRef,sn,cs);
// move the connectors first, everything else afterwards
SdrObjList* pOL=pSub.get();
@@ -636,7 +636,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nAngle, double sn, double cs)
void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
{
SetGlueReallyAbsolute(true);
- Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
MirrorPoint(aRefPoint,rRef1,rRef2); // implementation missing in SvdEtc!
// move the connectors first, everything else afterwards
SdrObjList* pOL=pSub.get();
@@ -661,7 +661,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
{
if (nAngle!=0) {
SetGlueReallyAbsolute(true);
- Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
ShearPoint(aRefPoint,rRef,tn);
// move the connectors first, everything else afterwards
SdrObjList* pOL=pSub.get();
@@ -685,7 +685,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nAngle, double tn, bool bVShear)
void SdrObjGroup::SetAnchorPos(const Point& rPnt)
{
- Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
+ tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect();
bool bChg=aAnchor!=rPnt;
aAnchor=rPnt;
Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());