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 /dbaccess/source/ui/querydesign/ConnectionLine.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 'dbaccess/source/ui/querydesign/ConnectionLine.cxx')
-rw-r--r-- | dbaccess/source/ui/querydesign/ConnectionLine.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index a14d86e50c7d..8745e1c67714 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -38,21 +38,21 @@ namespace @param _rBase the base point @param _aVector the vector which will be added */ - inline Rectangle calcRect(const Point& _rBase,const Point& _aVector) + inline tools::Rectangle calcRect(const Point& _rBase,const Point& _aVector) { - return Rectangle( _rBase - _aVector, _rBase + _aVector ); + return tools::Rectangle( _rBase - _aVector, _rBase + _aVector ); } /** GetTextPos calculate the rectangle for the connection to be drawn @param _pWin the table window where to draw it @param _aConnPos the connection point @param _aDescrLinePos the description line pos */ - Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) + tools::Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos) { VclPtr<OTableWindowListBox> pListBox = _pWin ? _pWin->GetListBox() : nullptr; OSL_ENSURE(_pWin && pListBox, "OConnectionLine::GetSourceTextPos : invalid call !"); - Rectangle aReturn; + tools::Rectangle aReturn; if ( pListBox ) { const long nRowHeight = pListBox->GetEntryHeight(); @@ -145,10 +145,10 @@ OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine ) return *this; } -Rectangle OConnectionLine::GetBoundingRect() +tools::Rectangle OConnectionLine::GetBoundingRect() { // determine surrounding rectangle - Rectangle aBoundingRect( Point(0,0), Point(0,0) ); + tools::Rectangle aBoundingRect( Point(0,0), Point(0,0) ); if( !IsValid() ) return aBoundingRect; @@ -186,7 +186,7 @@ Rectangle OConnectionLine::GetBoundingRect() aBottomRight.X() += DESCRIPT_LINE_WIDTH; } - aBoundingRect = Rectangle( aTopLeft-Point(2,17), aBottomRight+Point(2,2) ); + aBoundingRect = tools::Rectangle( aTopLeft-Point(2,17), aBottomRight+Point(2,2) ); return aBoundingRect; } @@ -323,12 +323,12 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const return false; } -Rectangle OConnectionLine::GetSourceTextPos() const +tools::Rectangle OConnectionLine::GetSourceTextPos() const { return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); } -Rectangle OConnectionLine::GetDestTextPos() const +tools::Rectangle OConnectionLine::GetDestTextPos() const { return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); } |