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>
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 /vcl/inc
parent: 17d821af6bb9df93569836a92f6bed975587fc6c (diff)
47 files changed, 219 insertions, 219 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 0911d1c8a412..43341841a399 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -124,7 +124,7 @@ public:
     virtual void            MouseMove( const MouseEvent& rMEvt ) override;
     virtual void            MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void            Tracking( const TrackingEvent& rTEvt ) override;
-    virtual void            Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void            Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
     virtual void            Activate() override;
     virtual void            Deactivate() override;
     virtual void            Resize() override;
@@ -138,7 +138,7 @@ public:
     void                    InvalidateBorder();
 
     using Window::Draw;
-    void                    Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos );
+    void                    Draw( const tools::Rectangle& rRect, OutputDevice* pDev, const Point& rPos );
 
     void                    SetDisplayActive( bool bActive );
     void                    SetTitleType( BorderWindowTitleType nTitleType, const Size& rSize );
@@ -167,7 +167,7 @@ public:
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
     long                    CalcTitleWidth() const;
 
-    Rectangle               GetMenuRect() const;
+    tools::Rectangle               GetMenuRect() const;
 
     virtual Size            GetOptimalSize() const override;
 };
@@ -176,13 +176,13 @@ struct ImplBorderFrameData
 {
     VclPtr<ImplBorderWindow> mpBorderWindow;
     VclPtr<OutputDevice>     mpOutDev;
-    Rectangle                maTitleRect;
-    Rectangle                maCloseRect;
-    Rectangle                maRollRect;
-    Rectangle                maDockRect;
-    Rectangle                maMenuRect;
-    Rectangle                maHideRect;
-    Rectangle                maHelpRect;
+    tools::Rectangle                maTitleRect;
+    tools::Rectangle                maCloseRect;
+    tools::Rectangle                maRollRect;
+    tools::Rectangle                maDockRect;
+    tools::Rectangle                maMenuRect;
+    tools::Rectangle                maHideRect;
+    tools::Rectangle                maHelpRect;
     Point                    maMouseOff;
     long                     mnWidth;
     long                     mnHeight;
@@ -218,19 +218,19 @@ public:
     virtual bool            MouseMove( const MouseEvent& rMEvt );
     virtual bool            MouseButtonDown( const MouseEvent& rMEvt );
     virtual bool            Tracking( const TrackingEvent& rTEvt );
-    virtual OUString        RequestHelp( const Point& rPos, Rectangle& rHelpRect );
+    virtual OUString        RequestHelp( const Point& rPos, tools::Rectangle& rHelpRect );
 
     virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0;
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                        sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const = 0;
     virtual long            CalcTitleWidth() const = 0;
     virtual void            DrawWindow(vcl::RenderContext& rRenderContext, const Point* pOffset = nullptr) = 0;
-    virtual Rectangle       GetMenuRect() const;
+    virtual tools::Rectangle       GetMenuRect() const;
 
     static void             ImplInitTitle( ImplBorderFrameData* pData );
     static BorderWindowHitTest ImplHitTest( ImplBorderFrameData* pData, const Point& rPos );
     static bool             ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt );
-    static OUString         ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect );
+    static OUString         ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, tools::Rectangle& rHelpRect );
     static long             ImplCalcTitleWidth( const ImplBorderFrameData* pData );
 };
 
@@ -281,8 +281,8 @@ public:
     virtual bool        MouseMove( const MouseEvent& rMEvt ) override;
     virtual bool        MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual bool        Tracking( const TrackingEvent& rTEvt ) override;
-    virtual OUString        RequestHelp( const Point& rPos, Rectangle& rHelpRect ) override;
-    virtual Rectangle       GetMenuRect() const override;
+    virtual OUString        RequestHelp( const Point& rPos, tools::Rectangle& rHelpRect ) override;
+    virtual tools::Rectangle       GetMenuRect() const override;
 
     virtual void            Init( OutputDevice* pDev, long nWidth, long nHeight ) override;
     virtual void            GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 58cdb1e1db71..3ec9826b8f80 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -65,7 +65,7 @@ public: // TODO: make subsetter results private and provide accessor methods ins
     int                     m_nAscent;          ///< all metrics in PS font units
     int                     m_nDescent;
     int                     m_nCapHeight;
-    Rectangle               m_aFontBBox;
+    tools::Rectangle               m_aFontBBox;
     FontType                m_nFontType;        ///< font-type of subset result
 
 private:
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index c053720de79a..a14aabe2b447 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -55,7 +55,7 @@ public:
     virtual ~SvpSalSystem() override;
     // get info about the display
     virtual unsigned int GetDisplayScreenCount() override;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
+    virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
 
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index ec0a2b2d55fd..c5245899c748 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -83,7 +83,7 @@ public:
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
     virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
-    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
     virtual bool                GetWindowState( SalFrameState* pState ) override;
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 64101e338182..56ed365339f2 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -162,7 +162,7 @@ public:
                                             bool bVertical,
                                             std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
-    virtual bool            GetGlyphBoundRect(const GlyphItem&, Rectangle&) override;
+    virtual bool            GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
     virtual bool            GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
     virtual void            DrawTextLayout( const CommonSalLayout& ) override;
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index beb72460024d..4d9ea576f0b2 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -28,9 +28,9 @@ enum class QuickHelpFlags;
 class HelpTextWindow : public FloatingWindow
 {
 private:
-    Rectangle           maHelpArea; // If next Help for the same rectangle w/ same text, then keep window
+    tools::Rectangle           maHelpArea; // If next Help for the same rectangle w/ same text, then keep window
 
-    Rectangle           maTextRect; // For wrapped text in QuickHelp
+    tools::Rectangle           maTextRect; // For wrapped text in QuickHelp
 
     OUString            maHelpText;
     OUString            maStatusText;
@@ -44,7 +44,7 @@ private:
 private:
     DECL_LINK( TimerHdl, Timer*, void );
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
     virtual void RequestHelp( const HelpEvent& rHEvt ) override;
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
     virtual void StateChanged(StateChangedType nType) override;
@@ -64,20 +64,20 @@ public:
 
     // Nur merken:
     void                SetStatusText( const OUString& rStatusText ) { maStatusText = rStatusText; }
-    void                SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; }
+    void                SetHelpArea( const tools::Rectangle& rRect ) { maHelpArea = rRect; }
 
     void                ShowHelp( sal_uInt16 nDelayMode );
 
     Size                CalcOutSize() const;
-    const Rectangle&    GetHelpArea() const { return maHelpArea; }
+    const tools::Rectangle&    GetHelpArea() const { return maHelpArea; }
 };
 
 void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle,
         const OUString& rHelpText, const OUString& rStatusText,
-        const Point& rScreenPos, const Rectangle& rHelpArea );
+        const Point& rScreenPos, const tools::Rectangle& rHelpArea );
 void ImplDestroyHelpWindow( bool bUpdateHideTime );
 void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, QuickHelpFlags nStyle,
-                            const Point& rPos, const Rectangle& rHelpArea );
+                            const Point& rPos, const tools::Rectangle& rHelpArea );
 
 #endif // INCLUDED_VCL_INC_HELPWIN_HXX
 
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 84a9a6cfd054..43fe803bfaf6 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -165,7 +165,7 @@ class ImplListBoxWindow : public Control, public vcl::ISearchableStringList
 {
 private:
     ImplEntryList*  mpEntryList;     ///< EntryList
-    Rectangle       maFocusRect;
+    tools::Rectangle       maFocusRect;
 
     Size            maUserItemSize;
 
@@ -230,14 +230,14 @@ protected:
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void    MouseMove( const MouseEvent& rMEvt ) override;
     virtual void    Tracking( const TrackingEvent& rTEvt ) override;
-    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
     virtual void    Resize() override;
     virtual void    GetFocus() override;
     virtual void    LoseFocus() override;
 
     bool            SelectEntries( sal_Int32  nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false );
     void            ImplPaint(vcl::RenderContext& rRenderContext, sal_Int32 nPos);
-    void            ImplDoPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+    void            ImplDoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
     void            ImplCalcMetrics();
     void            ImplUpdateEntryMetrics( ImplEntryType& rEntry );
     void            ImplCallSelect();
@@ -311,7 +311,7 @@ public:
     bool            IsMouseMoveSelect() const   { return mbMouseMoveSelect||mbStackMode; }
 
     Size            CalcSize(sal_Int32 nMaxLines) const;
-    Rectangle       GetBoundingRectangle( sal_Int32  nItem ) const;
+    tools::Rectangle       GetBoundingRectangle( sal_Int32  nItem ) const;
 
     long            GetEntryHeight() const              { return mnMaxHeight; }
     long            GetMaxEntryWidth() const            { return mnMaxWidth; }
@@ -512,7 +512,7 @@ private:
     OUString        maString;
     Image           maImage;
 
-    Rectangle       maFocusRect;
+    tools::Rectangle       maFocusRect;
 
     Link<void*,void> maMBDownHdl;
     Link<UserDrawEvent*, void> maUserDrawHdl;
@@ -529,7 +529,7 @@ public:
                     ImplWin( vcl::Window* pParent, WinBits nWinStyle );
 
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
     virtual void    Resize() override;
     virtual void    GetFocus() override;
     virtual void    LoseFocus() override;
@@ -554,7 +554,7 @@ public:
     bool GetEdgeBlending() const { return mbEdgeBlending; }
     void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
 
-    virtual void    ShowFocus(const Rectangle& rRect) override;
+    virtual void    ShowFocus(const tools::Rectangle& rRect) override;
 
     using Control::ImplInitSettings;
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
diff --git a/vcl/inc/opengl/RenderState.hxx b/vcl/inc/opengl/RenderState.hxx
index b7b2f18a692b..c0f1b725f1bc 100644
--- a/vcl/inc/opengl/RenderState.hxx
+++ b/vcl/inc/opengl/RenderState.hxx
@@ -153,13 +153,13 @@ class RenderState
     StencilState maStencil;
     BlendState   maBlend;
 
-    Rectangle maCurrentViewport;
+    tools::Rectangle maCurrentViewport;
 
 public:
     RenderState()
     {}
 
-    void viewport(Rectangle aViewPort)
+    void viewport(tools::Rectangle aViewPort)
     {
         if (aViewPort != maCurrentViewport)
         {
diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 3a06b2a48c77..3485c4f332a1 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -72,7 +72,7 @@ class VCL_DLLPUBLIC OpenGLTexture final
 private:
     // if the rect size doesn't match the mpImpl one, this instance
     // is a sub-area from the real OpenGL texture
-    Rectangle maRect;
+    tools::Rectangle maRect;
     std::shared_ptr<ImplOpenGLTexture> mpImpl;
     int mnSlotNumber;
 
@@ -85,7 +85,7 @@ private:
 
 public:
                     OpenGLTexture();
-                    OpenGLTexture(const std::shared_ptr<ImplOpenGLTexture>& pImpl, Rectangle aRectangle, int nSlotNumber);
+                    OpenGLTexture(const std::shared_ptr<ImplOpenGLTexture>& pImpl, tools::Rectangle aRectangle, int nSlotNumber);
 
                     OpenGLTexture( int nWidth, int nHeight, bool bAllocate = true );
                     OpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData );
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index f3d603c0f1be..1f546b0dd240 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -126,7 +126,7 @@ public:
     void DrawConvexPolygon( const tools::Polygon& rPolygon, bool blockAA );
     void DrawTrapezoid( const basegfx::B2DTrapezoid& trapezoid, bool blockAA );
     void DrawRect( long nX, long nY, long nWidth, long nHeight );
-    void DrawRect( const Rectangle& rRect );
+    void DrawRect( const tools::Rectangle& rRect );
     void DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
     void DrawLineSegment(float x1, float y1, float x2, float y2);
     void DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, bool blockAA = false );
@@ -139,9 +139,9 @@ public:
     void DrawTextureWithMask( OpenGLTexture& rTexture, OpenGLTexture& rMask, const SalTwoRect& rPosAry );
     void DrawBlendedTexture( OpenGLTexture& rTexture, OpenGLTexture& rMask, OpenGLTexture& rAlpha, const SalTwoRect& rPosAry );
     void DrawMask( OpenGLTexture& rTexture, SalColor nMaskColor, const SalTwoRect& rPosAry );
-    void DrawLinearGradient( const Gradient& rGradient, const Rectangle& rRect );
-    void DrawAxialGradient( const Gradient& rGradient, const Rectangle& rRect );
-    void DrawRadialGradient( const Gradient& rGradient, const Rectangle& rRect );
+    void DrawLinearGradient( const Gradient& rGradient, const tools::Rectangle& rRect );
+    void DrawAxialGradient( const Gradient& rGradient, const tools::Rectangle& rRect );
+    void DrawRadialGradient( const Gradient& rGradient, const tools::Rectangle& rRect );
     void DeferredTextDraw(OpenGLTexture& rTexture, const SalColor nMaskColor, const SalTwoRect& rPosAry);
 
     void FlushDeferredDrawing();
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 94afaf3e9f0e..4b6d486f6be6 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -87,7 +87,7 @@ public:
 
     std::list<AquaBlinker*>         maBlinkers;
 
-    Rectangle                       maInvalidRect;
+    tools::Rectangle                       maInvalidRect;
 
     InputContextFlags               mnICOptions;
 
@@ -118,7 +118,7 @@ public:
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
     virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
-    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
     virtual bool                GetWindowState( SalFrameState* pState ) override;
@@ -130,7 +130,7 @@ public:
     virtual void                CaptureMouse( bool bMouse ) override;
     virtual void                SetPointerPos( long nX, long nY ) override;
     virtual void                Flush( void ) override;
-    virtual void                Flush( const Rectangle& ) override;
+    virtual void                Flush( const tools::Rectangle& ) override;
     virtual void                SetInputContext( SalInputContext* pContext ) override;
     virtual void                EndExtTextInput( EndExtTextInputFlags nFlags ) override;
     virtual OUString            GetKeyName( sal_uInt16 nKeyCode ) override;
@@ -161,7 +161,7 @@ public:
     void UpdateFrameGeometry();
 
     // trigger painting of the window
-    void SendPaintEvent( const Rectangle* pRect = nullptr );
+    void SendPaintEvent( const tools::Rectangle* pRect = nullptr );
 
     static bool isAlive( const AquaSalFrame* pFrame )
     { return GetSalData()->maFrameCheck.find( pFrame ) != GetSalData()->maFrameCheck.end(); }
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index f21c750bcc01..4d3ffaaf752e 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -69,10 +69,10 @@ public:
     virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage) override;
     virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) override;
     virtual void GetSystemMenuData( SystemMenuData* pData ) override;
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override;
+    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override;
     virtual bool AddMenuBarButton( const SalMenuButtonItem& ) override;
     virtual void RemoveMenuBarButton( sal_uInt16 nId ) override;
-    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) override;
+    virtual tools::Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) override;
 
     int getItemIndexByPos( sal_uInt16 nPos ) const;
     const AquaSalFrame* getFrame() const;
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index e1b18f90d124..c619a99eef4e 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -33,7 +33,7 @@ public:
 
     // get info about the display
     virtual unsigned int GetDisplayScreenCount() override;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
+    virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
 
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage) override;
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 82750c23748a..33fa41255f66 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -132,7 +132,7 @@ struct ImplOutDevData
 {
     VclPtr<VirtualDevice>       mpRotateDev;
     vcl::ControlLayoutData*     mpRecordLayout;
-    Rectangle                   maRecordRect;
+    tools::Rectangle                   maRecordRect;
 
     // #i75163#
     basegfx::B2DHomMatrix*      mpViewTransform;
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 530275b0088c..b8129dcd8b93 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -59,7 +59,7 @@ namespace vcl
             virtual ~PrintPreviewWindow() 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 Command( const CommandEvent& ) override;
             virtual void Resize() override;
             virtual void DataChanged( const DataChangedEvent& ) override;
@@ -82,7 +82,7 @@ namespace vcl
 
             virtual Size GetOptimalSize() const override;
 
-            virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
+            virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override;
 
             void setValues( NupOrderType i_nOrderMode, int i_nColumns, int i_nRows )
             {
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 248d07eb37ba..6d29fccb1d6a 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -89,7 +89,7 @@ public:
     ~CoreTextStyle( void );
 
     void       GetFontMetric( ImplFontMetricDataRef& ) const;
-    bool       GetGlyphBoundRect(const GlyphItem&, Rectangle&) const;
+    bool       GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) const;
     bool       GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) const;
     hb_font_t* GetHbFont() const { return mpHbFont; }
     void       SetHbFont(hb_font_t* pHbFont) const { mpHbFont = pHbFont; }
@@ -292,14 +292,14 @@ public:
 
     // native widget rendering methods that require mirroring
 #ifdef MACOSX
-    virtual bool            hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual bool            hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
                                                   const Point& aPos, bool& rIsInside ) override;
-    virtual bool            drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual bool            drawNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const OUString& aCaption ) override;
-    virtual bool            getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+    virtual bool            getNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState,
                                                     const ImplControlValue& aValue, const OUString& aCaption,
-                                                    Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
+                                                    tools::Rectangle &rNativeBoundingRegion, tools::Rectangle &rNativeContentRegion ) override;
 #endif
 
     // get device resolution
@@ -375,7 +375,7 @@ public:
                                             std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool            GetGlyphBoundRect(const GlyphItem&, Rectangle&) override;
+    virtual bool            GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
     virtual bool            GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
 
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 91a13ebffcbf..1fb5db93a410 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -41,7 +41,7 @@ public:
     RegionBand();
     RegionBand(const RegionBand&);
     RegionBand& operator=(const RegionBand&);
-    RegionBand(const Rectangle&);
+    RegionBand(const tools::Rectangle&);
     ~RegionBand();
 
     bool operator==( const RegionBand& rRegionBand ) const;
@@ -70,7 +70,7 @@ public:
     void Intersect(const RegionBand& rSource);
     bool Exclude(const RegionBand& rSource);
     void XOr(const RegionBand& rSource);
-    Rectangle GetBoundRect() const;
+    tools::Rectangle GetBoundRect() const;
     bool IsInside(const Point& rPoint) const;
     sal_uInt32 getRectangleCount() const; // only users are Region::Intersect, Region::IsRectangle and PSWriter::ImplBmp
     void GetRegionRectangles(RectangleVector& rTarget) const;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index a0a65aa5c48a..4cea89eae3a3 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -147,7 +147,7 @@ public:
     virtual void            SetMaxClientSize( long nWidth, long nHeight ) = 0;
     virtual void            SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) = 0;
     virtual void            GetClientSize( long& rWidth, long& rHeight ) = 0;
-    virtual void            GetWorkArea( Rectangle& rRect ) = 0;
+    virtual void            GetWorkArea( tools::Rectangle& rRect ) = 0;
     virtual SalFrame*       GetParent() const = 0;
     // Note: x will be mirrored at parent if UI mirroring is active
     SalFrameGeometry        GetGeometry();
@@ -175,7 +175,7 @@ public:
 
     // flush output buffer
     virtual void            Flush() = 0;
-    virtual void            Flush( const Rectangle& );
+    virtual void            Flush( const tools::Rectangle& );
 
     virtual void            SetInputContext( SalInputContext* pContext ) = 0;
     virtual void            EndExtTextInput( EndExtTextInputFlags nFlags ) = 0;
@@ -239,19 +239,19 @@ public:
     }
 
     // return true to indicate tooltips are shown natively, false otherwise
-    virtual bool            ShowTooltip(const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/)
+    virtual bool            ShowTooltip(const OUString& /*rHelpText*/, const tools::Rectangle& /*rHelpArea*/)
     {
         return false;
     }
 
     // return !0 to indicate popovers are shown natively, 0 otherwise
-    virtual sal_uIntPtr     ShowPopover(const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/, QuickHelpFlags /*nFlags*/)
+    virtual sal_uIntPtr     ShowPopover(const OUString& /*rHelpText*/, const tools::Rectangle& /*rHelpArea*/, QuickHelpFlags /*nFlags*/)
     {
         return 0;
     }
 
     // return true to indicate popovers are shown natively, false otherwise
-    virtual bool            UpdatePopover(sal_uIntPtr /*nId*/, const OUString& /*rHelpText*/, const Rectangle& /*rHelpArea*/)
+    virtual bool            UpdatePopover(sal_uIntPtr /*nId*/, const OUString& /*rHelpText*/, const tools::Rectangle& /*rHelpArea*/)
     {
         return false;
     }
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index a2b67c07ede3..e914b6493dff 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -39,7 +39,7 @@ class FontAttributes;
 class PhysicalFontFace;
 class SalLayout;
 class ImplLayoutArgs;
-class Rectangle;
+namespace tools { class Rectangle; }
 class FontSubsetInfo;
 class OpenGLContext;
 class OutputDevice;
@@ -189,7 +189,7 @@ public:
                                     std::vector< sal_Int32 >& rWidths,
                                     Ucs2UIntMap& rUnicodeEnc ) = 0;
 
-    virtual bool                GetGlyphBoundRect(const GlyphItem&, Rectangle&) = 0;
+    virtual bool                GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) = 0;
     virtual bool                GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) = 0;
 
     virtual SalLayout*          GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0;
@@ -204,7 +204,7 @@ public:
     void                        mirror( long& nX, const OutputDevice *pOutDev ) const;
     void                        mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const;
     bool                        mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev ) const;
-    void                        mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const;
+    void                        mirror( tools::Rectangle& rRect, const OutputDevice*, bool bBack = false ) const;
     void                        mirror( vcl::Region& rRgn, const OutputDevice *pOutDev ) const;
     void                        mirror( ImplControlValue&, const OutputDevice* ) const;
     basegfx::B2DPoint           mirror( const basegfx::B2DPoint& i_rPoint, const OutputDevice *pOutDev ) const;
@@ -353,7 +353,7 @@ public:
      */
     bool                        HitTestNativeScrollbar(
                                     ControlPart nPart,
-                                    const Rectangle& rControlRegion,
+                                    const tools::Rectangle& rControlRegion,
                                     const Point& aPos,
                                     bool& rIsInside,
                                     const OutputDevice *pOutDev );
@@ -366,7 +366,7 @@ public:
     bool                        DrawNativeControl(
                                     ControlType nType,
                                     ControlPart nPart,
-                                    const Rectangle& rControlRegion,
+                                    const tools::Rectangle& rControlRegion,
                                     ControlState nState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption,
@@ -380,12 +380,12 @@ public:
     bool                        GetNativeControlRegion(
                                     ControlType nType,
                                     ControlPart nPart,
-                                    const Rectangle& rControlRegion,
+                                    const tools::Rectangle& rControlRegion,
                                     ControlState nState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption,
-                                    Rectangle &rNativeBoundingRegion,
-                                    Rectangle &rNativeContentRegion,
+                                    tools::Rectangle &rNativeBoundingRegion,
+                                    tools::Rectangle &rNativeContentRegion,
                                     const OutputDevice *pOutDev );
 
     bool                        BlendBitmap(
@@ -540,7 +540,7 @@ protected:
      */
     virtual bool                hitTestNativeControl(
                                     ControlType eType, ControlPart ePart,
-                                    const Rectangle& rBoundingControlRegion,
+                                    const tools::Rectangle& rBoundingControlRegion,
                                     const Point& aPos, bool& rIsInside );
 
     /**
@@ -557,7 +557,7 @@ protected:
      */
     virtual bool                drawNativeControl(
                                     ControlType eType, ControlPart ePart,
-                                    const Rectangle& rBoundingControlRegion,
+                                    const tools::Rectangle& rBoundingControlRegion,
                                     ControlState eState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption );
@@ -583,12 +583,12 @@ protected:
      */
     virtual bool                getNativeControlRegion(
                                     ControlType eType, ControlPart ePart,
-                                    const Rectangle& rBoundingControlRegion,
+                                    const tools::Rectangle& rBoundingControlRegion,
                                     ControlState eState,
                                     const ImplControlValue& aValue,
                                     const OUString& aCaption,
-                                    Rectangle &rNativeBoundingRegion,
-                                    Rectangle &rNativeContentRegion );
+                                    tools::Rectangle &rNativeBoundingRegion,
+                                    tools::Rectangle &rNativeContentRegion );
 
     /** Blend the bitmap with the current buffer */
     virtual bool                blendBitmap(
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index b1ded19700a4..9dbe269a82b1 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -178,7 +178,7 @@ public:
     virtual int     GetNextGlyphs(int nLen, const GlyphItem** pGlyphs, Point& rPos, int&,
                                   const PhysicalFontFace** pFallbackFonts = nullptr) const = 0;
     virtual bool    GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const;
-    virtual bool    GetBoundRect( SalGraphics&, Rectangle& ) const;
+    virtual bool    GetBoundRect( SalGraphics&, tools::Rectangle& ) const;
 
     // reference counting
     void            Release() const;
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 8b2b5e20335f..169d887068da 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -74,7 +74,7 @@ public:
     virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0;
     virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) = 0;
     virtual void GetSystemMenuData( SystemMenuData* pData ) = 0;
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags);
+    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags);
     virtual void ShowCloseButton(bool bShow);
     virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure
     virtual void RemoveMenuBarButton( sal_uInt16 nId );
@@ -89,7 +89,7 @@ public:
     // return an empty rectangle if not implemented
     // return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) if menu bar buttons implemented
     // but rectangle cannot be determined
-    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame );
+    virtual tools::Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame );
 };
 
 #endif // INCLUDED_VCL_INC_SALMENU_HXX
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index bc273f07ddee..5e3478e45b2b 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -63,7 +63,7 @@ public:
                            else position relative to whole display
                  size: size of the screen
     */
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) = 0;
+    virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) = 0;
 
     /*  Shows a native message box with the specified title, message and button
         combination.
diff --git a/vcl/inc/scrwnd.hxx b/vcl/inc/scrwnd.hxx
index be8445e681a8..db002d2290e6 100644
--- a/vcl/inc/scrwnd.hxx
+++ b/vcl/inc/scrwnd.hxx
@@ -66,7 +66,7 @@ private:
 
 protected:
 
-    virtual void        Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void        Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
     virtual void        MouseMove( const MouseEvent& rMEvt ) override;
     virtual void        MouseButtonUp( const MouseEvent& rMEvt ) override;
 
diff --git a/vcl/inc/spin.hxx b/vcl/inc/spin.hxx
index 4961ebd7efa9..7b7fbe11bd40 100644
--- a/vcl/inc/spin.hxx
+++ b/vcl/inc/spin.hxx
@@ -22,18 +22,18 @@
 
 #include <vcl/window.hxx>
 
-class Rectangle;
+namespace tools { class Rectangle; }
 
 // Draw Spinners as found in a SpinButton. Some themes like gtk3 will draw +- elements here,
 // so these are only suitable in the context of SpinButtons
 void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow,
-                        const Rectangle& rUpperRect, const Rectangle& rLowerRect,
+                        const tools::Rectangle& rUpperRect, const tools::Rectangle& rLowerRect,
                         bool bUpperIn, bool bLowerIn, bool bUpperEnabled = true, bool bLowerEnabled = true,
                         bool bHorz = false, bool bMirrorHorz = false);
 
 // Draw Up/Down buttons suitable for use in any context
 void ImplDrawUpDownButtons(vcl::RenderContext& rRenderContext,
-                           const Rectangle& rUpperRect, const Rectangle& rLowerRect,
+                           const tools::Rectangle& rUpperRect, const tools::Rectangle& rLowerRect,
                            bool bUpperIn, bool bLowerIn, bool bUpperEnabled, bool bLowerEnabled,
                            bool bHorz, bool bMirrorHorz = false);
 
diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx
index 0192bf9a4d5a..c75720f53d69 100644
--- a/vcl/inc/test/outputdevice.hxx
+++ b/vcl/inc/test/outputdevice.hxx
@@ -36,7 +36,7 @@ class VCL_DLLPUBLIC OutputDeviceTestCommon
 protected:
 
     ScopedVclPtr<VirtualDevice> mpVirtualDevice;
-    Rectangle maVDRectangle;
+    tools::Rectangle maVDRectangle;
 
     static const Color constBackgroundColor;
     static const Color constLineColor;
@@ -55,16 +55,16 @@ public:
 
     static TestResult checkRectangles(Bitmap& rBitmap, std::vector<Color>& aExpectedColors);
 
-    static void createDiamondPoints(Rectangle rRect, int nOffset,
+    static void createDiamondPoints(tools::Rectangle rRect, int nOffset,
                                     Point& rPoint1, Point& rPoint2,
                                     Point& rPoint3, Point& rPoint4);
 
-    static void createHorizontalVerticalDiagonalLinePoints(Rectangle rRect,
+    static void createHorizontalVerticalDiagonalLinePoints(tools::Rectangle rRect,
                                 Point& rHorizontalLinePoint1, Point& rHorizontalLinePoint2,
                                 Point& rVerticalLinePoint1, Point& rVerticalLinePoint2,
                                 Point& rDiagonalLinePoint1, Point& rDiagonalLinePoint2);
     // tools
-    static Rectangle alignToCenter(Rectangle aRect1, Rectangle aRect2);
+    static tools::Rectangle alignToCenter(tools::Rectangle aRect1, tools::Rectangle aRect2);
 
 };
 
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index a8a4124daafb..ae478847c2dc 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -90,11 +90,11 @@ namespace vcl
         ControlTextRenderer( const Control& _rControl, OutputDevice& _rTargetDevice, OutputDevice& _rReferenceDevice );
         ~ControlTextRenderer();
 
-        Rectangle   DrawText( const Rectangle& _rRect,
+        tools::Rectangle   DrawText( const tools::Rectangle& _rRect,
                               const OUString& _rText, DrawTextFlags _nStyle,
                               MetricVector* _pVector, OUString* _pDisplayText, const Size* i_pDeviceSize );
 
-        Rectangle   GetTextRect( const Rectangle& _rRect,
+        tools::Rectangle   GetTextRect( const tools::Rectangle& _rRect,
                                  const OUString& _rText, DrawTextFlags _nStyle, Size* o_pDeviceSize );
 
     private:
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index 1b04725398ce..ebcb7a081f7c 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -59,7 +59,7 @@ public:
                                         std::vector< sal_Int32 >& rWidths,
                                         Ucs2UIntMap& rUnicodeEnc ) = 0;
 
-    virtual bool                    GetGlyphBoundRect(const GlyphItem&, Rectangle&) = 0;
+    virtual bool                    GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) = 0;
     virtual bool                    GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) = 0;
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0;
     virtual void                    DrawTextLayout(const CommonSalLayout&) = 0;
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index f8f798d5a079..18f94aeb5f5e 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -44,8 +44,8 @@ struct ImplToolItem
     OUString            maHelpText;
     OUString            maCommandStr;
     OString             maHelpId;
-    Rectangle           maRect;
-    Rectangle           maCalcRect;
+    tools::Rectangle           maRect;
+    tools::Rectangle           maCalcRect;
     /// Widget layout may request size; set it as the minimal size (like, the item will always have at least this size).
     Size                maMinimalItemSize;
     /// The overall horizontal item size, including one or more of [image size + textlength + dropdown arrow]
@@ -87,7 +87,7 @@ struct ImplToolItem
     // returns the rectangle which contains the drop down arrow
     // or an empty rect if there is none
     // bHorz denotes the toolbox alignment
-    Rectangle   GetDropDownRect( bool bHorz ) const;
+    tools::Rectangle   GetDropDownRect( bool bHorz ) const;
 
     // returns sal_True if the toolbar item is currently clipped, which can happen for docked toolbars
     bool IsClipped() const;
@@ -128,7 +128,7 @@ struct ImplToolBoxPrivateData
 
     // the optional custom menu
     VclPtr<PopupMenu>   mpMenu;
-    Rectangle       maMenuRect;
+    tools::Rectangle       maMenuRect;
     ToolBoxMenuType maMenuType;
     ImplSVEvent *   mnEventId;
 
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 1cdf405f1dc9..2e6d1a57d63e 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -75,7 +75,7 @@ public:
                                     std::vector< sal_Int32 >& rWidths,
                                     Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool                GetGlyphBoundRect(const GlyphItem&, Rectangle&) override;
+    virtual bool                GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
     virtual bool                GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
     virtual SalLayout*          GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
     virtual void                DrawTextLayout(const CommonSalLayout&) override;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 721efd56245c..b37bb909d1f2 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -115,7 +115,7 @@ public:
                                             bool bVertical,
                                             std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
-    virtual bool            GetGlyphBoundRect(const GlyphItem&, Rectangle&) override;
+    virtual bool            GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
     virtual bool            GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
     virtual void            DrawTextLayout( const CommonSalLayout& ) override;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 8d66fbb23eac..ba889d7d876a 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -100,14 +100,14 @@ class GlyphData
 public:
                             GlyphData() : mnLruValue(0) {}
 
-    const Rectangle&        GetBoundRect() const        { return maBoundRect; }
-    void                    SetBoundRect(Rectangle r)   { maBoundRect = r; }
+    const tools::Rectangle&        GetBoundRect() const        { return maBoundRect; }
+    void                    SetBoundRect(tools::Rectangle r)   { maBoundRect = r; }
 
     void                    SetLruValue( int n ) const  { mnLruValue = n; }
     long                    GetLruValue() const         { return mnLruValue;}
 
 private:
-    Rectangle               maBoundRect;
+    tools::Rectangle               maBoundRect;
 
     // used by GlyphCache for cache LRU algorithm
     mutable long            mnLruValue;
@@ -136,7 +136,7 @@ public:
     const FontCharMapRef    GetFontCharMap() const;
     bool                    GetFontCapabilities(vcl::FontCapabilities &) const;
 
-    const Rectangle&        GetGlyphBoundRect(const GlyphItem& rGlyph);
+    const tools::Rectangle&        GetGlyphBoundRect(const GlyphItem& rGlyph);
     bool                    GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPolygon&) const;
     bool                    GetAntialiasAdvice() const;
     hb_font_t*              GetHbFont() { return mpHbFont; }
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ad615048ec86..5ab7296081b0 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -204,11 +204,11 @@ class GtkSalFrame : public SalFrame
 
     Size                            m_aMaxSize;
     Size                            m_aMinSize;
-    Rectangle                       m_aRestorePosSize;
+    tools::Rectangle                       m_aRestorePosSize;
 
 #if GTK_CHECK_VERSION(3,0,0)
     OUString                        m_aTooltip;
-    Rectangle                       m_aHelpArea;
+    tools::Rectangle                       m_aHelpArea;
     long                            m_nWidthRequest;
     long                            m_nHeightRequest;
     cairo_region_t*                 m_pRegion;
@@ -341,7 +341,7 @@ class GtkSalFrame : public SalFrame
 
     enum class SetType { RetainSize, Fullscreen, UnFullscreen };
 
-    void SetScreen( unsigned int nNewScreen, SetType eType, Rectangle *pSize = nullptr );
+    void SetScreen( unsigned int nNewScreen, SetType eType, tools::Rectangle *pSize = nullptr );
 
 public:
 #if GTK_CHECK_VERSION(3,0,0)
@@ -457,7 +457,7 @@ public:
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
     virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
-    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
     virtual bool                GetWindowState( SalFrameState* pState ) override;
@@ -527,9 +527,9 @@ public:
 
 #if GTK_CHECK_VERSION(3,0,0)
     virtual void                SetModal(bool bModal) override;
-    virtual bool                ShowTooltip(const OUString& rHelpText, const Rectangle& rHelpArea) override;
-    virtual sal_uIntPtr         ShowPopover(const OUString& rHelpText, const Rectangle& rHelpArea, QuickHelpFlags nFlags) override;
-    virtual bool                UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, const Rectangle& rHelpArea) override;
+    virtual bool                ShowTooltip(const OUString& rHelpText, const tools::Rectangle& rHelpArea) override;
+    virtual sal_uIntPtr         ShowPopover(const OUString& rHelpText, const tools::Rectangle& rHelpArea, QuickHelpFlags nFlags) override;
+    virtual bool                UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, const tools::Rectangle& rHelpArea) override;
     virtual bool                HidePopover(sal_uIntPtr nId) override;
 #endif
 
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index bf70ba1694dc..e8b425436b64 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -103,17 +103,17 @@ class GtkSalGraphics : public SvpSalGraphics
 public:
     GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow );
     virtual bool        drawNativeControl( ControlType nType, ControlPart nPart,
-                                               const Rectangle& rControlRegion,
+                                               const tools::Rectangle& rControlRegion,
                                                ControlState nState, const ImplControlValue& aValue,
                                                const OUString& rCaption ) override;
     virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
     virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart,
-                                                    const Rectangle& rControlRegion,
+                                                    const tools::Rectangle& rControlRegion,
                                                     ControlState nState,
                                                     const ImplControlValue& aValue,
                                                     const OUString& rCaption,
-                                                    Rectangle &rNativeBoundingRegion,
-                                                    Rectangle &rNativeContentRegion ) override;
+                                                    tools::Rectangle &rNativeBoundingRegion,
+                                                    tools::Rectangle &rNativeContentRegion ) override;
 #if ENABLE_CAIRO_CANVAS
 
     virtual bool        SupportsCairo() const override;
@@ -203,13 +203,13 @@ private:
     static GtkStyleContext *mpSeparatorMenuItemStyle;
     static GtkStyleContext *mpSeparatorMenuItemSeparatorStyle;
 
-    static Rectangle NWGetScrollButtonRect( ControlPart nPart, Rectangle aAreaRect );
-    static Rectangle NWGetSpinButtonRect( ControlPart nPart, Rectangle aAreaRect);
-    static Rectangle NWGetComboBoxButtonRect( ControlType nType, ControlPart nPart, Rectangle aAreaRect );
+    static tools::Rectangle NWGetScrollButtonRect( ControlPart nPart, tools::Rectangle aAreaRect );
+    static tools::Rectangle NWGetSpinButtonRect( ControlPart nPart, tools::Rectangle aAreaRect);
+    static tools::Rectangle NWGetComboBoxButtonRect( ControlType nType, ControlPart nPart, tools::Rectangle aAreaRect );
 
     static void PaintScrollbar(GtkStyleContext *context,
                         cairo_t *cr,
-                        const Rectangle& rControlRectangle,
+                        const tools::Rectangle& rControlRectangle,
                         ControlType nType,
                         ControlPart nPart,
                         const ImplControlValue& aValue );
@@ -217,29 +217,29 @@ private:
                              cairo_t *cr,
                              ControlType nType,
                              ControlPart nPart,
-                             Rectangle aAreaRect,
+                             tools::Rectangle aAreaRect,
                              ControlState nState );
            void PaintSpinButton(GtkStateFlags flags,
                          cairo_t *cr,
-                         const Rectangle& rControlRectangle,
+                         const tools::Rectangle& rControlRectangle,
                          ControlType nType,
                          ControlPart nPart,
                          const ImplControlValue& aValue);
     static void PaintCombobox(GtkStateFlags flags,
                         cairo_t *cr,
-                        const Rectangle& rControlRectangle,
+                        const tools::Rectangle& rControlRectangle,
                         ControlType nType,
                         ControlPart nPart,
                         const ImplControlValue& aValue);
     static void PaintCheckOrRadio(cairo_t *cr, GtkStyleContext *context,
-                                  const Rectangle& rControlRectangle,
+                                  const tools::Rectangle& rControlRectangle,
                                   bool bIsCheck, bool bInMenu);
 
     static void PaintCheck(cairo_t *cr, GtkStyleContext *context,
-                           const Rectangle& rControlRectangle, bool bInMenu);
+                           const tools::Rectangle& rControlRectangle, bool bInMenu);
 
     static void PaintRadio(cairo_t *cr, GtkStyleContext *context,
-                           const Rectangle& rControlRectangle, bool bInMenu);
+                           const tools::Rectangle& rControlRectangle, bool bInMenu);
 
 
     static bool style_loaded;
@@ -270,14 +270,14 @@ public:
 
     // native widget methods
     virtual bool        IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
-    virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
                                               const Point& aPos, bool& rIsInside ) override;
-    virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const OUString& rCaption ) override;
-    virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+    virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& rCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
+                                                tools::Rectangle &rNativeBoundingRegion, tools::Rectangle &rNativeContentRegion ) override;
 
     //helper methods for frame's UpdateSettings
     void updateSettings( AllSettings& rSettings );
@@ -296,129 +296,129 @@ public:
 
 protected:
 
-    GdkX11Pixmap* NWGetPixmapFromScreen( Rectangle srcRect, int nBgColor = 0 );
-    bool NWRenderPixmapToScreen( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask, Rectangle dstRect );
+    GdkX11Pixmap* NWGetPixmapFromScreen( tools::Rectangle srcRect, int nBgColor = 0 );
+    bool NWRenderPixmapToScreen( GdkX11Pixmap* pPixmap, GdkX11Pixmap* pMask, tools::Rectangle dstRect );
 
     bool DoDrawNativeControl( GdkDrawable* pDrawable,
                            ControlType nType,
                            ControlPart nPart,
-                           const Rectangle& aCtrlRect,
-                           const std::list< Rectangle >& aClip,
+                           const tools::Rectangle& aCtrlRect,
+                           const std::list< tools::Rectangle >& aClip,
                            ControlState nState,
                            const ImplControlValue& aValue,
                            const OUString& rCaption,
                            ControlCacheKey& rControlCacheKey);
 
     bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                          const Rectangle& rControlRectangle,
-                          const std::list< Rectangle >& rClipList,
+                          const tools::Rectangle& rControlRectangle,
+                          const std::list< tools::Rectangle >& rClipList,
                           ControlState nState, const ImplControlValue& aValue,
                           const OUString& rCaption );
     bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                          const Rectangle& rControlRectangle,
-                          const std::list< Rectangle >& rClipList,
+                          const tools::Rectangle& rControlRectangle,
+                          const std::list< tools::Rectangle >& rClipList,
                           ControlState nState, const ImplControlValue& aValue,
                           const OUString& rCaption );
     bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
-                              const Rectangle& rControlRectangle,
-                              const std::list< Rectangle >& rClipList,
+                              const tools::Rectangle& rControlRectangle,
+                              const std::list< tools::Rectangle >& rClipList,
                               ControlState nState, const ImplControlValue& aValue,
                               const OUString& rCaption );
     bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKSpinBox(ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption,
                            ControlCacheKey& rControlCacheKey);
     bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                             const Rectangle& rControlRectangle,
-                             const std::list< Rectangle >& rClipList,
+                             const tools::Rectangle& rControlRectangle,
+                             const std::list< tools::Rectangle >& rClipList,
                              ControlState nState, const ImplControlValue& aValue,
                              const OUString& rCaption );
     bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 
     bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                              const Rectangle& rControlRectangle,
-                              const std::list< Rectangle >& rClipList,
+                              const tools::Rectangle& rControlRectangle,
+                              const std::list< tools::Rectangle >& rClipList,
                               ControlState nState, const ImplControlValue& aValue,
                               const OUString& rCaption );
     bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
     bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                           const Rectangle& rControlRectangle,
-                           const std::list< Rectangle >& rClipList,
+                           const tools::Rectangle& rControlRectangle,
+                           const std::list< tools::Rectangle >& rClipList,
                            ControlState nState, const ImplControlValue& aValue,
                            const OUString& rCaption );
     bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
-                            const Rectangle& rControlRectangle,
-                            const std::list< Rectangle >& rClipList,
+                            const tools::Rectangle& rControlRectangle,
+                            const std::list< tools::Rectangle >& rClipList,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
 };
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index cf076675dea8..9a5ef3ed67ab 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -126,7 +126,7 @@ public:
     gboolean SignalKey(GdkEventKey* pEvent);
     void ReturnFocus();
 
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, FloatWinPopupFlags nFlags) override;
+    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) override;
     virtual void ShowCloseButton(bool bShow) override;
     virtual bool CanGetFocus() const override;
     virtual bool TakeFocus() override;
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index b8ebbdf0574d..d888bce5bca3 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -29,7 +29,7 @@ public:
     virtual bool          IsUnifiedDisplay() override;
     virtual unsigned int  GetDisplayScreenCount() override;
     virtual unsigned int  GetDisplayBuiltInScreen() override;
-    virtual Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen) override;
+    virtual tools::Rectangle     GetDisplayScreenPosSizePixel   (unsigned int nScreen) override;
     virtual int           ShowNativeDialog (const OUString&              rTitle,
                                             const OUString&              rMessage,
                                             const std::list< OUString >& rButtons,
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 152573e10b9d..59c2f338d2bd 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -187,18 +187,18 @@ private:
 
     /* bitmap drawing implementation */
 
-    void    DrawPS1GrayImage      (const PrinterBmp& rBitmap, const Rectangle& rArea);
-    void    writePS2ImageHeader   (const Rectangle& rArea, psp::ImageType nType);
+    void    DrawPS1GrayImage      (const PrinterBmp& rBitmap, const tools::Rectangle& rArea);
+    void    writePS2ImageHeader   (const tools::Rectangle& rArea, psp::ImageType nType);
     void    writePS2Colorspace    (const PrinterBmp& rBitmap, psp::ImageType nType);
-    void    DrawPS2GrayImage      (const PrinterBmp& rBitmap, const Rectangle& rArea);
-    void    DrawPS2PaletteImage   (const PrinterBmp& rBitmap, const Rectangle& rArea);
-    void    DrawPS2TrueColorImage (const PrinterBmp& rBitmap, const Rectangle& rArea);
-    void    DrawPS2MonoImage      (const PrinterBmp& rBitmap, const Rectangle& rArea);
+    void    DrawPS2GrayImage      (const PrinterBmp& rBitmap, const tools::Rectangle& rArea);
+    void    DrawPS2PaletteImage   (const PrinterBmp& rBitmap, const tools::Rectangle& rArea);
+    void    DrawPS2TrueColorImage (const PrinterBmp& rBitmap, const tools::Rectangle& rArea);
+    void    DrawPS2MonoImage      (const PrinterBmp& rBitmap, const tools::Rectangle& rArea);
 
     /* clip region */
 
-    std::list< Rectangle > maClipRegion;
-    bool JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it,
+    std::list< tools::Rectangle > maClipRegion;
+    bool JoinVerticalClipRectangles( std::list< tools::Rectangle >::iterator& it,
                                          Point& aOldPoint, sal_Int32& nColumn );
 
     /* color settings */
@@ -285,7 +285,7 @@ public:
     void            DrawPixel (const Point& rPoint)
     { DrawPixel (rPoint, maLineColor); }
     void            DrawLine  (const Point& rFrom, const Point& rTo);
-    void            DrawRect  (const Rectangle& rRectangle);
+    void            DrawRect  (const tools::Rectangle& rRectangle);
     void            DrawPolyLine (sal_uInt32 nPoints, const Point* pPath );
     void            DrawPolygon  (sal_uInt32 nPoints, const Point* pPath);
     void            DrawPolyPolygon (sal_uInt32 nPoly,
@@ -303,10 +303,10 @@ public:
                                      const PolyFlags* const* pFlgAry);
 
     // eps
-    bool        DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize);
+    bool        DrawEPS ( const tools::Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize);
 
     // image drawing
-    void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc,
+    void            DrawBitmap (const tools::Rectangle& rDest, const tools::Rectangle& rSrc,
                                 const PrinterBmp& rBitmap);
 
     // font and text handling
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 44e851a8b981..d28326e389bb 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -287,7 +287,7 @@ protected:
     vcl_sal::WMAdaptor* m_pWMAdaptor;
 
     bool            m_bXinerama;
-    std::vector< Rectangle > m_aXineramaScreens;
+    std::vector< tools::Rectangle > m_aXineramaScreens;
     std::vector< int > m_aXineramaScreenIndexMap;
     std::list<SalObject*> m_aSalObjects;
 
@@ -370,7 +370,7 @@ public:
     { mpKbdExtension = pKbdExtension; }
     ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
     bool            IsXinerama() const { return m_bXinerama; }
-    const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; }
+    const std::vector< tools::Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; }
     ::Window        GetRootWindow( SalX11Screen nXScreen ) const
             { return getDataForScreen( nXScreen ).m_aRoot; }
     unsigned int GetXScreenCount() const { return m_aScreens.size(); }
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 69702fc8710d..4263581a979f 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -94,7 +94,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl
     int             nShowState_;        // show state
     int             nWidth_;            // client width
     int             nHeight_;           // client height
-    Rectangle       maRestorePosSize;
+    tools::Rectangle       maRestorePosSize;
     SalFrameStyleFlags nStyle_;
     SalExtStyle     mnExtStyle;
     bool            bAlwaysOnTop_;
@@ -108,7 +108,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl
     bool            m_bSetFocusOnMap;
 
     ScreenSaverInhibitor maScreenSaverInhibitor;
-    Rectangle       maPaintRegion;
+    tools::Rectangle       maPaintRegion;
 
     Timer           maAlwaysOnTopRaiseTimer;
 
@@ -138,10 +138,10 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl
 
     bool mPendingSizeEvent;
 
-    void            GetPosSize( Rectangle &rPosSize );
+    void            GetPosSize( tools::Rectangle &rPosSize );
     void            SetSize   ( const Size      &rSize );
     void            Center();
-    void            SetPosSize( const Rectangle &rPosSize );
+    void            SetPosSize( const tools::Rectangle &rPosSize );
     void            Minimize();
     void            Maximize();
     void            Restore();
@@ -228,7 +228,7 @@ public:
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
     virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
-    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
     virtual bool                GetWindowState( SalFrameState* pState ) override;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 90d3fd6b3f70..87f9d6e83176 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -141,7 +141,7 @@ public:
                                         std::vector< sal_Int32 >& rWidths,
                                         Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool                    GetGlyphBoundRect(const GlyphItem&, Rectangle&) override;
+    virtual bool                    GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
     virtual bool                    GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
     virtual void                    DrawTextLayout( const CommonSalLayout& ) override;
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index fbd87f96a8ef..4e9c2769ee7e 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -132,7 +132,7 @@ protected:
     Atom                    m_aWMAtoms[ NetAtomMax];
     int                     m_nDesktops;
     bool                    m_bEqualWorkAreas;
-    ::std::vector< Rectangle >
+    ::std::vector< tools::Rectangle >
                             m_aWMWorkAreas;
     bool                    m_bEnableAlwaysOnTopWorks;
     bool                    m_bLegacyPartialFullscreen;
@@ -179,7 +179,7 @@ public:
     /*
      *  gets the specified workarea
      */
-    const Rectangle& getWorkArea( int n ) const
+    const tools::Rectangle& getWorkArea( int n ) const
     { return m_aWMWorkAreas[n]; }
 
     /*
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index a5937fe074f9..8e209014e262 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -35,7 +35,7 @@ public:
     virtual unsigned int GetDisplayScreenCount() override;
     virtual bool         IsUnifiedDisplay() override;
     virtual unsigned int GetDisplayBuiltInScreen() override;
-    virtual Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
+    virtual tools::Rectangle    GetDisplayScreenPosSizePixel( unsigned int nScreen ) override;
     virtual int ShowNativeDialog( const OUString& rTitle,
                                   const OUString& rMessage,
                                   const std::list< OUString >& rButtons,
diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx
index 52393dd937a4..cce5d03919ec 100644
--- a/vcl/inc/wall2.hxx
+++ b/vcl/inc/wall2.hxx
@@ -28,7 +28,7 @@ private:
     Color                       maColor;
     std::unique_ptr<BitmapEx>   mpBitmap;
     std::unique_ptr<Gradient>   mpGradient;
-    std::unique_ptr<Rectangle>  mpRect;
+    std::unique_ptr<tools::Rectangle>  mpRect;
     WallpaperStyle  meStyle;
     std::unique_ptr<BitmapEx>   mpCache;
 
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 3c3fa0eb0c77..177a28cbf9cf 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -99,7 +99,7 @@ public:
     virtual void                SetMaxClientSize( long nWidth, long nHeight ) override;
     virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) override;
     virtual void                GetClientSize( long& rWidth, long& rHeight ) override;
-    virtual void                GetWorkArea( Rectangle& rRect ) override;
+    virtual void                GetWorkArea( tools::Rectangle& rRect ) override;
     virtual SalFrame*           GetParent() const override;
     virtual void                SetWindowState( const SalFrameState* pState ) override;
     virtual bool                GetWindowState( SalFrameState* pState ) override;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 3af90cbefae3..a1076e0c7d1e 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -268,14 +268,14 @@ protected:
     virtual bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ) override;
 
     // native widget rendering methods that require mirroring
-    virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
                                               const Point& aPos, bool& rIsInside ) override;
-    virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+    virtual bool        drawNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
                                            ControlState nState, const ImplControlValue& aValue,
                                            const OUString& aCaption ) override;
-    virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+    virtual bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, ControlState nState,
                                                 const ImplControlValue& aValue, const OUString& aCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override;
+                                                tools::Rectangle &rNativeBoundingRegion, tools::Rectangle &rNativeContentRegion ) override;
 
     virtual bool        blendBitmap( const SalTwoRect&,
                                      const SalBitmap& rBitmap ) override;
@@ -377,7 +377,7 @@ public:
                                             std::vector< sal_Int32 >& rWidths,
                                             Ucs2UIntMap& rUnicodeEnc ) override;
 
-    virtual bool            GetGlyphBoundRect(const GlyphItem&, Rectangle&) override;
+    virtual bool            GetGlyphBoundRect(const GlyphItem&, tools::Rectangle&) override;
     virtual bool            GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override;
 
     virtual SalLayout*      GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override;
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index ec9424b318e6..03f627b5abb2 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -31,11 +31,11 @@ public:
     struct DisplayMonitor
     {
         OUString        m_aName;
-        Rectangle       m_aArea;
+        tools::Rectangle       m_aArea;
 
         DisplayMonitor() {}
         DisplayMonitor( const OUString& rName,
-                        const Rectangle& rArea )
+                        const tools::Rectangle& rArea )
                         : m_aName( rName ),
                           m_aArea( rArea )
         {
@@ -51,7 +51,7 @@ public:
 
     virtual unsigned int GetDisplayScreenCount() override;
     virtual unsigned int GetDisplayBuiltInScreen() override;
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen )  override;
+    virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen )  override;
     virtual int ShowNativeMessageBox( const OUString& rTitle,
                                       const OUString& rMessage)  override;
     bool initMonitors();
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 35c17cc6fea0..eb1004ca142c 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -44,7 +44,7 @@ const int GLYPH_OFFSET_RATIO = GLYPH_SPACE_RATIO * 2;
 
 struct OpenGLGlyphDrawElement
 {
-    Rectangle maLocation;
+    tools::Rectangle maLocation;
     int maLeftOverhangs;
     OpenGLTexture maTexture;
     int mnBaselineOffset;
@@ -217,7 +217,7 @@ public:
         SalGraphics &rGraphics,
         HDC hDC) override;
 
-    inline bool BindDC(HDC hDC, Rectangle const & rRect = Rectangle(0, 0, 0, 0)) {
+    inline bool BindDC(HDC hDC, tools::Rectangle const & rRect = tools::Rectangle(0, 0, 0, 0)) {
         RECT const rc = { rRect.Left(), rRect.Top(), rRect.Right(), rRect.Bottom() };
         return SUCCEEDED(mpRT->BindDC(hDC, &rc));
     }
@@ -225,7 +225,7 @@ public:
     bool BindFont(HDC hDC) /*override*/;
     bool ReleaseFont() /*override*/;
 
-    std::vector<Rectangle>  GetGlyphInkBoxes(uint16_t * pGid, uint16_t * pGidEnd) const /*override*/;
+    std::vector<tools::Rectangle>  GetGlyphInkBoxes(uint16_t * pGid, uint16_t * pGidEnd) const /*override*/;
     ID2D1RenderTarget * GetRenderTarget() const { return mpRT; }
     IDWriteFontFace   * GetFontFace() const { return mpFontFace; }
     float               GetEmHeight() const { return mlfEmHeight; }
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 6553b18eb40c..0825ccfed464 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -85,13 +85,13 @@ struct ImplWinData
 {
     OUString*           mpExtOldText;
     ExtTextInputAttr*   mpExtOldAttrAry;
-    Rectangle*          mpCursorRect;
+    tools::Rectangle*          mpCursorRect;
     long                mnCursorExtWidth;
     bool                mbVertical;
-    Rectangle*          mpCompositionCharRects;
+    tools::Rectangle*          mpCompositionCharRects;
     long                mnCompositionCharRects;
-    Rectangle*          mpFocusRect;
-    Rectangle*          mpTrackRect;
+    tools::Rectangle*          mpFocusRect;
+    tools::Rectangle*          mpTrackRect;
     ShowTrackFlags      mnTrackFlags;
     sal_uInt16          mnIsTopWindow;
     bool                mbMouseOver;            //< tracks mouse over for native widget paint effect
@@ -154,7 +154,7 @@ struct ImplFrameData
     bool                mbInternalDragGestureRecognizer;
     VclPtr<VirtualDevice> mpBuffer; ///< Buffer for the double-buffering
     bool mbInBufferedPaint; ///< PaintHelper is in the process of painting into this buffer.
-    Rectangle maBufferedRect; ///< Rectangle in the buffer that has to be painted to the screen.
+    tools::Rectangle maBufferedRect; ///< Rectangle in the buffer that has to be painted to the screen.
 
     ImplFrameData( vcl::Window *pWindow );
 };
@@ -378,12 +378,12 @@ class PaintBufferGuard
     AllSettings maSettings;
     long mnOutOffX;
     long mnOutOffY;
-    Rectangle m_aPaintRect;
+    tools::Rectangle m_aPaintRect;
 public:
     PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWindow);
     ~PaintBufferGuard();
     /// If this is called, then the dtor will also copy rRectangle to the window from the buffer, before restoring the state.
-    void SetPaintRect(const Rectangle& rRectangle);
+    void SetPaintRect(const tools::Rectangle& rRectangle);
     /// Returns either the frame's buffer or the window, in case of no buffering.
     vcl::RenderContext* GetRenderContext();
 };
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 /vcl/inc
parent	17d821af6bb9df93569836a92f6bed975587fc6c (diff)