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/source/uibase/inc | |
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/source/uibase/inc')
-rw-r--r-- | sw/source/uibase/inc/DashedLine.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/HeaderFooterWin.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/PageBreakWin.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/bmpwin.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/chartins.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/colex.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/conttree.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/edtwin.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/envlop.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/mailmergehelper.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/navipi.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/numprevw.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/olmenu.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/optload.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/optpage.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/inc/pview.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/inc/scroll.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/shdwcrsr.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/srcedtw.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/swruler.hxx | 4 |
20 files changed, 31 insertions, 31 deletions
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index a070754aa850..6b01a342b9c9 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -22,7 +22,7 @@ public: SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; }; #endif diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 6e9fec7be6a1..ab4d4d343a6e 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -35,7 +35,7 @@ public: void SetOffset( Point aOffset, long nXLineStart, long nXLineEnd ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Select( ) override; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 0f2e7dc8a04f..21e0bbc60757 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -37,7 +37,7 @@ public: virtual ~SwPageBreakWin() override; virtual void dispose() override; - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rRect ) override; virtual void Select( ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void Activate( ) override; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index 56bf247e5912..909f6c7be291 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -35,7 +35,7 @@ private: bool bVert : 1; bool bGraphic : 1; - virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rRect) override; virtual Size GetOptimalSize() const override; diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx index b610bbece966..bb1c6d860e23 100644 --- a/sw/source/uibase/inc/chartins.hxx +++ b/sw/source/uibase/inc/chartins.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX -Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const tools::Rectangle& rLogicChart ); void SwInsertChart( vcl::Window *pParent, SfxBindings *pBindings ); #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 869b943a10e3..c1c9ce014004 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -99,7 +99,7 @@ private: SwFormatCol m_aCols; protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; public: SwColumnOnlyExample(vcl::Window*); diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index f641f9b5cb14..b21e84508c03 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -114,7 +114,7 @@ class SwContentTree static bool bIsInDrag; bool m_bIsKeySpace; - Rectangle m_aOldRectangle; + tools::Rectangle m_aOldRectangle; /** * Before any data will be deleted, the last active entry has to be found. @@ -158,7 +158,7 @@ protected: SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ) override; - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; void EditEntry( SvTreeListEntry* pEntry, EditEntryMode nMode ); diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 550842735687..8124664f46c2 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -188,7 +188,7 @@ protected: virtual void DataChanged( const DataChangedEvent& ) override; virtual void PrePaint(vcl::RenderContext& rRenderContext) override; - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void GetFocus() override; virtual void LoseFocus() override; @@ -295,7 +295,7 @@ public: virtual void Command( const CommandEvent& rCEvt ) override; /// @see OutputDevice::LogicInvalidate(). - void LogicInvalidate(const Rectangle* pRectangle) override; + void LogicInvalidate(const tools::Rectangle* pRectangle) override; /// Same as MouseButtonDown(), but coordinates are in logic unit. void LogicMouseButtonDown(const MouseEvent& rMouseEvent); /// Same as MouseButtonUp(), but coordinates are in logic unit. diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index d454715ec010..2e0c43dec906 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -42,7 +42,7 @@ class Printer; class SwEnvPreview : public vcl::Window { - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; public: diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 263e77fac52f..0f5a36fb2e63 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwAddressPreview : public vcl::Window void DrawText_Impl(vcl::RenderContext& rRenderContext, const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected); - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; + virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; virtual void Resize() override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void KeyInput( const KeyEvent& rKEvt ) override; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 534c3ed78c4a..90a20d6ac7ec 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -156,7 +156,7 @@ public: bool IsGlobalMode() const {return m_bGlobalMode;} SwView* GetCreateView() const; - void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent); + void CreateNavigationTool(const tools::Rectangle& rRect, bool bSetFocus, vcl::Window *pParent); }; class SwNavigationChild : public SfxChildWindowContext diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 424b3abe4ffd..eb018c078bd9 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -35,7 +35,7 @@ class NumberingPreview : public vcl::Window sal_uInt16 nActLevel; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rRect ) override; public: NumberingPreview(vcl::Window* pParent) diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index a2077cd3baf8..45bfdf2d5eba 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -95,7 +95,7 @@ public: return *m_xPopupMenu.get(); } - void Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); + void Execute( const tools::Rectangle& rPopupPos, vcl::Window* pWin ); void Execute( sal_uInt16 nId ); }; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 728c0f0ce4d4..484c7f6318f0 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -113,7 +113,7 @@ public: SwCaptionPreview(vcl::Window* pParent, WinBits nStyle); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; void SetPreviewText( const OUString& rText ); - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; virtual Size GetOptimalSize() const override; }; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index aaf35150498e..b963128adcde 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -286,14 +286,14 @@ class SwMarkPreview : public vcl::Window Color m_aTextCol; // text Color m_aPrintAreaCol; // frame for print area - Rectangle aPage; - Rectangle aLeftPagePrtArea; - Rectangle aRightPagePrtArea; + tools::Rectangle aPage; + tools::Rectangle aLeftPagePrtArea; + tools::Rectangle aRightPagePrtArea; sal_uInt16 nMarkPos; - void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; - void PaintPage(vcl::RenderContext& rRenderContext, const Rectangle &rRect); + void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; + void PaintPage(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect); void InitColors(); protected: diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 0c3445ff4631..08427f6c778a 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -53,7 +53,7 @@ class SwPagePreviewWin : public vcl::Window Fraction maScale; SwPagePreview& mrView; bool mbCalcScaleForPreviewLayout; - Rectangle maPaintedPreviewDocRect; + tools::Rectangle maPaintedPreviewDocRect; SwPagePreviewLayout* mpPgPreviewLayout; void SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ); @@ -65,7 +65,7 @@ public: virtual ~SwPagePreviewWin() override; // calls SwViewShell::Paint - 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 & ) override; virtual void Command( const CommandEvent& rCEvt ) override; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; @@ -136,7 +136,7 @@ public: void AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, const SvxZoomType _eZoomType ); - const Rectangle& GetPaintedPreviewDocRect() const + const tools::Rectangle& GetPaintedPreviewDocRect() const { return maPaintedPreviewDocRect; } @@ -172,7 +172,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell // visible range OUString m_sPageStr; Size m_aDocSize; - Rectangle m_aVisArea; + tools::Rectangle m_aVisArea; // MDI control elements VclPtr<SwScrollbar> m_pHScrollbar; @@ -239,7 +239,7 @@ public: void DocSzChgd(const Size& rNewSize); - void SetVisArea( const Rectangle& ); + void SetVisArea( const tools::Rectangle& ); void ScrollViewSzChg(); void ScrollDocSzChg(); diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index a2dc6e31b9ef..d279f73fa54f 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -41,7 +41,7 @@ public: // changing of document size void DocSzChgd(const Size &rNewSize); // changing of visible region - void ViewPortChgd(const Rectangle &rRectangle); + void ViewPortChgd(const tools::Rectangle &rRectangle); // what is it?? bool IsHoriScroll() const { return bHori; } diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index 46dae2953a6f..bade87e6d821 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -45,7 +45,7 @@ public: void Paint(); - Rectangle GetRect() const; + tools::Rectangle GetRect() const; }; #endif diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index a94e10af1f33..ef9f90a096f8 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -43,7 +43,7 @@ class TextViewOutWin : public vcl::Window TextView* pTextView; protected: - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 824eaca10642..c8f1deb12842 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -40,7 +40,7 @@ public: * Paint the ruler. * \param rRect ignored */ - virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; + virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; protected: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility @@ -82,7 +82,7 @@ protected: * It is horizontally aligned to the SideBar panel. * \return The area where the comment control is. */ - Rectangle GetCommentControlRegion(); + tools::Rectangle GetCommentControlRegion(); /** * Paint the comment control on VirtualDevice. |