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/slidesorter/shell | |
| 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/slidesorter/shell')
| -rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorter.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index d7c576b51b42..9a0a758b2370 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -53,7 +53,7 @@ public: ContentWindow(vcl::Window& rParent, SlideSorter& rSlideSorter); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect) override; virtual void KeyInput (const KeyEvent& rEvent) override; virtual void MouseMove (const MouseEvent& rEvent) override; virtual void MouseButtonUp (const MouseEvent& rEvent) override; @@ -235,7 +235,7 @@ Reference<frame::XController> SlideSorter::GetXController() const return xController; } -void SlideSorter::Paint (const Rectangle& rRepaintArea) +void SlideSorter::Paint (const ::tools::Rectangle& rRepaintArea) { GetController().Paint( rRepaintArea, @@ -356,7 +356,7 @@ void SlideSorter::ArrangeGUIElements ( view::SlideSorterView::DrawLock aLock (*this); GetContentWindow()->EnablePaint (false); - mpSlideSorterController->Resize (Rectangle(aOrigin, rSize)); + mpSlideSorterController->Resize (::tools::Rectangle(aOrigin, rSize)); GetContentWindow()->EnablePaint (true); @@ -444,7 +444,7 @@ void ContentWindow::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction mpCurrentFunction = rpFunction; } -void ContentWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) +void ContentWindow::Paint (vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect) { mrSlideSorter.Paint(rRect); } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 6190a6007168..d56fb3f52389 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -436,7 +436,7 @@ void SlideSorterViewShell::ExecStatusBar (SfxRequest& ) } void SlideSorterViewShell::Paint ( - const Rectangle& rBBox, + const ::tools::Rectangle& rBBox, ::sd::Window* pWindow) { SetActiveWindow (pWindow); @@ -582,12 +582,12 @@ void SlideSorterViewShell::SetZoom (long int ) // the window. } -void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) +void SlideSorterViewShell::SetZoomRect (const ::tools::Rectangle& rZoomRect) { OSL_ASSERT(mpSlideSorter.get()!=nullptr); Size aPageSize (mpSlideSorter->GetView().GetLayouter().GetPageObjectSize()); - Rectangle aRect(rZoomRect); + ::tools::Rectangle aRect(rZoomRect); if (aRect.GetWidth() < aPageSize.Width()) { |