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 /sw/inc/swrect.hxx | |
| 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 'sw/inc/swrect.hxx')
| -rw-r--r-- | sw/inc/swrect.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 9bb254515bf2..18bd97149e30 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -43,7 +43,7 @@ public: inline SwRect( long X, long Y, long Width, long Height ); //SV-SS e.g. SwRect( pWin->GetClipRect() ); - SwRect( const Rectangle &rRect ); + SwRect( const tools::Rectangle &rRect ); //Set-Methods inline void Chg( const Point& rNP, const Size &rNS ); @@ -99,7 +99,7 @@ public: inline SwRect &operator-=( const Point &rPt ); //SV-SS e.g. pWin->DrawRect( aSwRect.SVRect() ); - inline Rectangle SVRect() const; + inline tools::Rectangle SVRect() const; // Output operator for debugging. friend SvStream& WriteSwRect( SvStream &rStream, const SwRect &rRect ); @@ -278,10 +278,10 @@ inline SwRect &SwRect::operator-=( const Point &rPt ) } // other -inline Rectangle SwRect::SVRect() const +inline tools::Rectangle SwRect::SVRect() const { SAL_WARN_IF( IsEmpty(), "sw", "SVRect() without Width or Height" ); - return Rectangle( m_Point.getX(), m_Point.getY(), + return tools::Rectangle( m_Point.getX(), m_Point.getY(), m_Point.getX() + m_Size.getWidth() - 1, //Right() m_Point.getY() + m_Size.getHeight() - 1 ); //Bottom() } |