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 /include/svx/svdpagv.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 'include/svx/svdpagv.hxx')
-rw-r--r-- | include/svx/svdpagv.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 039dcd4dc025..44a0000beb86 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -64,8 +64,8 @@ private: SdrPage* mpPage; Point aPgOrg; // The Page's point of origin - Rectangle aMarkBound; - Rectangle aMarkSnap; + tools::Rectangle aMarkBound; + tools::Rectangle aMarkSnap; bool mbHasMarked; bool mbVisible; @@ -162,11 +162,11 @@ public: void setPreparedPageWindow(SdrPageWindow* pKnownTarget); void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr, - const Rectangle& rRect = Rectangle(), + const tools::Rectangle& rRect = tools::Rectangle(), basegfx::B2IRange const* pPageFrame = nullptr); - void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); + void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = Color( COL_BLACK ) ); - Rectangle GetPageRect() const; + tools::Rectangle GetPageRect() const; SdrPage* GetPage() const { return mpPage; } /// Return current List @@ -181,10 +181,10 @@ public: bool HasMarkedObjPageView() const { return mbHasMarked; } void SetHasMarkedObj(bool bOn) { mbHasMarked = bOn; } - const Rectangle& MarkBound() const { return aMarkBound; } - const Rectangle& MarkSnap() const { return aMarkSnap; } - Rectangle& MarkBound() { return aMarkBound; } - Rectangle& MarkSnap() { return aMarkSnap; } + const tools::Rectangle& MarkBound() const { return aMarkBound; } + const tools::Rectangle& MarkSnap() const { return aMarkSnap; } + tools::Rectangle& MarkBound() { return aMarkBound; } + tools::Rectangle& MarkSnap() { return aMarkSnap; } void SetLayerVisible(const OUString& rName, bool bShow) { SetLayer(rName, aLayerVisi, bShow); @@ -207,7 +207,7 @@ public: void SetPageOrigin(const Point& rOrg); void LogicToPagePos(Point& rPnt) const { rPnt-=aPgOrg; } - void LogicToPagePos(Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); } + void LogicToPagePos(tools::Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); } void PagePosToLogic(Point& rPnt) const { rPnt+=aPgOrg; } void SetVisibleLayers(const SetOfByte& rSet) { aLayerVisi=rSet; } |