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 /sd/source/ui/view/ViewShellBase.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 'sd/source/ui/view/ViewShellBase.cxx')
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index c1f7efcdad24..a2263c38c9e6 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -138,7 +138,7 @@ public: ::rtl::Reference<ViewTabBar> mpViewTabBar; // contains the complete area of the current view relative to the frame window - Rectangle maClientArea; + ::tools::Rectangle maClientArea; // This is set to true when PrepareClose() is called. bool mbIsClosing; @@ -931,7 +931,7 @@ std::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer() return mpImpl->mpEventMultiplexer; } -const Rectangle& ViewShellBase::getClientRectangle() const +const ::tools::Rectangle& ViewShellBase::getClientRectangle() const { return mpImpl->maClientArea; } @@ -1020,7 +1020,7 @@ void ViewShellBase::NotifyCursor(SfxViewShell* pOtherShell) const // Shape text lock. if (OutlinerView* pOutlinerView = pDrawView->GetTextEditOutlinerView()) { - Rectangle aRectangle = pOutlinerView->GetOutputArea(); + ::tools::Rectangle aRectangle = pOutlinerView->GetOutputArea(); vcl::Window* pWin = pThisShell->GetActiveWindow(); if (pWin && pWin->GetMapMode().GetMapUnit() == MapUnit::Map100thMM) aRectangle = OutputDevice::LogicToLogic(aRectangle, MapUnit::Map100thMM, MapUnit::MapTwip); @@ -1157,7 +1157,7 @@ void ViewShellBase::Implementation::ResizePixel ( rSize.Height() - aBaseBorder.Top() - aBaseBorder.Bottom()); mpViewWindow->SetPosSizePixel(aViewWindowPosition, aViewWindowSize); - maClientArea = Rectangle(Point(0,0), aViewWindowSize); + maClientArea = ::tools::Rectangle(Point(0,0), aViewWindowSize); } void ViewShellBase::Implementation::SetPaneVisibility ( |