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/relationdesign | |
| 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/relationdesign')
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RTableConnection.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/relationdesign/RTableConnection.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 6b0468508fda..6b4b1ef74649 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -48,7 +48,7 @@ ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTa return *this; } -void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect ) +void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) { OTableConnection::Draw(rRenderContext, rRect); ORelationTableConnectionData* pData = static_cast< ORelationTableConnectionData* >(GetData().get()); @@ -56,7 +56,7 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re return; // search lines for top line - Rectangle aBoundingRect; + tools::Rectangle aBoundingRect; long nTop = GetBoundingRect().Bottom(); long nTemp; @@ -83,8 +83,8 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re if (!pTopLine) return; - Rectangle aSourcePos = pTopLine->GetSourceTextPos(); - Rectangle aDestPos = pTopLine->GetDestTextPos(); + tools::Rectangle aSourcePos = pTopLine->GetSourceTextPos(); + tools::Rectangle aDestPos = pTopLine->GetDestTextPos(); OUString aSourceText; OUString aDestText; diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index 02eccc775d15..4684b7c26417 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -34,7 +34,7 @@ namespace dbaui ORelationTableConnection& operator=( const ORelationTableConnection& rConn ); - virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; using OTableConnection::Draw; }; } |