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 /sw/inc/view.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 'sw/inc/view.hxx')
| -rw-r--r-- | sw/inc/view.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index bf9f54160477..ae74f418a769 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -176,7 +176,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SwTextNode * m_pNumRuleNodeFromDoc; // Moving indent of numrule #i23726# Size m_aDocSz; // current document size - Rectangle m_aVisArea; // visible region + tools::Rectangle m_aVisArea; // visible region VclPtr<SwEditWin> m_pEditWin; SwWrtShell *m_pWrtShell; @@ -272,7 +272,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell inline long GetXScroll() const; inline long GetYScroll() const; SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const; - SAL_DLLPRIVATE void CalcPt( Point* pPt,const Rectangle& rRect, + SAL_DLLPRIVATE void CalcPt( Point* pPt,const tools::Rectangle& rRect, sal_uInt16 nRangeX, sal_uInt16 nRangeY); @@ -413,10 +413,10 @@ public: // hand the handler for text blocks to the shell; create if applicable SwGlossaryHdl* GetGlosHdl(); - const Rectangle& GetVisArea() const { return m_aVisArea; } + const tools::Rectangle& GetVisArea() const { return m_aVisArea; } - bool IsScroll(const Rectangle& rRect) const; - void Scroll( const Rectangle& rRect, + bool IsScroll(const tools::Rectangle& rRect) const; + void Scroll( const tools::Rectangle& rRect, sal_uInt16 nRangeX = USHRT_MAX, sal_uInt16 nRangeY = USHRT_MAX); @@ -442,7 +442,7 @@ public: void DocSzChgd( const Size& rNewSize ); const Size& GetDocSz() const { return m_aDocSz; } - void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true); + void SetVisArea( const tools::Rectangle&, bool bUpdateScrollbar = true); void SetVisArea( const Point&, bool bUpdateScrollbar = true); void CheckVisArea(); |