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 /lotuswordpro/source | |
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 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/lwpdrawobj.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpoleobject.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpsdwrect.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpsdwrect.hxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index 8361e21cf64c..19649affe271 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -780,7 +780,7 @@ XFFrame* LwpDrawRectangle::CreateStandardDrawObj(const OUString& rStyleName) double fStartX, fStartY, fWidth, fHeight; double fRotAngle = 0.0; SdwRectangle aSdwRect; - Rectangle aOriginalRect; + tools::Rectangle aOriginalRect; Point aPt0, aPt1, aPt2, aPt3; aPt0.setX(m_aVector[0].x); aPt0.setY(m_aVector[0].y); @@ -796,7 +796,7 @@ XFFrame* LwpDrawRectangle::CreateStandardDrawObj(const OUString& rStyleName) } else { - aOriginalRect = Rectangle(aPt0, aPt2); + aOriginalRect = tools::Rectangle(aPt0, aPt2); } fStartX = aOriginalRect.TopLeft().X(); diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index 2eefc3f5560d..bd514035a34c 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -124,7 +124,7 @@ public: private: sal_uInt16 cPersistentFlags; - Rectangle m_SizeRect; + tools::Rectangle m_SizeRect; }; #endif diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index 39d1b3fa501d..41f0af74477c 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -197,7 +197,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::Reference<XFFram // placement: centered if (xMyFrameLayout->GetScaleCenter()) { - Rectangle aBoundRect(static_cast<long>(left*m_aTransformData.fScaleX + fLeftMargin), + tools::Rectangle aBoundRect(static_cast<long>(left*m_aTransformData.fScaleX + fLeftMargin), static_cast<long>(top * m_aTransformData.fScaleY + fTopMargin), static_cast<long>(right * m_aTransformData.fScaleX), static_cast<long>(bottom * m_aTransformData.fScaleY)); diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx index 5937864ec3cf..d9f73ebde2b9 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.cxx +++ b/lotuswordpro/source/filter/lwpsdwrect.cxx @@ -145,7 +145,7 @@ long SdwRectangle::GetHeight() const * @short: Calculate coordinate of the original rectangle. * @return: a prz rectangle **************************************************************************/ -Rectangle SdwRectangle::GetOriginalRect() const +tools::Rectangle SdwRectangle::GetOriginalRect() const { if (m_bRotated) { @@ -157,11 +157,11 @@ Rectangle SdwRectangle::GetOriginalRect() const aCenter.Y()-(long)((double)nHeight/2+0.5)); Point aRB(aLT.X()+nWidth, aLT.Y()+nHeight); - return Rectangle(aLT, aRB); + return tools::Rectangle(aLT, aRB); } else { - return Rectangle(m_nRectCorner[3], m_nRectCorner[1]); + return tools::Rectangle(m_nRectCorner[3], m_nRectCorner[1]); } } /************************************************************************** diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx index cc3066900948..9af37440ef68 100644 --- a/lotuswordpro/source/filter/lwpsdwrect.hxx +++ b/lotuswordpro/source/filter/lwpsdwrect.hxx @@ -116,7 +116,7 @@ public: long GetHeight() const; - Rectangle GetOriginalRect() const; + tools::Rectangle GetOriginalRect() const; double GetRotationAngle() const; |