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>

1558 files changed, 9232 insertions, 9217 deletions

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index 781a9afeb0d8..ea96ca44be00 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -141,10 +141,10 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() override;
+    virtual tools::Rectangle implGetBoundingBox() override;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() override;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
     // internal helper methods
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 0448ddfa930b..64c9636e9be5 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -247,11 +247,11 @@ protected:
     /** Derived classes return the bounding box relative to the parent window.
         @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() = 0;
+    virtual tools::Rectangle implGetBoundingBox() = 0;
     /** Derived classes return the bounding box in screen coordinates.
         @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() = 0;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0;
 
     /** Creates a new AccessibleStateSetHelper and fills it with states of the
         current object. This method calls FillStateSet at the BrowseBox which
@@ -272,13 +272,13 @@ protected:
         @return  The bounding box (VCL rect.) relative to the parent object.
         @throws css::lang::DisposedException
     */
-    Rectangle getBoundingBox();
+    tools::Rectangle getBoundingBox();
     /** Locks all mutex's and calculates the bounding box in screen
         coordinates.
         @return  The bounding box (VCL rect.) in screen coordinates.
         @throws css::lang::DisposedException
     */
-    Rectangle getBoundingBoxOnScreen();
+    tools::Rectangle getBoundingBoxOnScreen();
 
     ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
     void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index c81c836a4de8..7ad695f235f0 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -162,10 +162,10 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() override;
+    virtual tools::Rectangle implGetBoundingBox() override;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() override;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The count of used rows. */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index c9659708f9aa..fe7e5e88c399 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -63,9 +63,9 @@ namespace accessibility
         ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override;
 
     protected:
-        virtual Rectangle implGetBoundingBox() override;
+        virtual tools::Rectangle implGetBoundingBox() override;
 
-        virtual Rectangle implGetBoundingBoxOnScreen() override;
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
     };
 }
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
index a6735dcdffcc..25ff5b478f97 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -107,10 +107,10 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() override;
+    virtual tools::Rectangle implGetBoundingBox() override;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() override;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
     // internal helper methods
 
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index 362dee2ea120..3bcaaac1d288 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -111,10 +111,10 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() override;
+    virtual tools::Rectangle implGetBoundingBox() override;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() override;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
     // internal helper methods ------------------------------------------------
 
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 3c8dd7cbb11e..2c9cbd42fae1 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -214,11 +214,11 @@ protected:
     /** Derived classes return the bounding box relative to the parent window.
         @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() = 0;
+    virtual tools::Rectangle implGetBoundingBox() = 0;
     ///** Derived classes return the bounding box in screen coordinates.
     //    @attention  This method requires locked mutex's and a living object.
     //    @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() = 0;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() = 0;
 
     /** Creates a new AccessibleStateSetHelper and fills it with states of the
         current object. This method calls FillStateSet at the GridControl which
@@ -242,12 +242,12 @@ protected:
         @return  The bounding box (VCL rect.) relative to the parent object.
         @throws css::lang::DisposedException
     */
-    Rectangle getBoundingBox();
+    tools::Rectangle getBoundingBox();
     ///** Locks all mutex's and calculates the bounding box in screen
     //    coordinates.
     //    @return  The bounding box (VCL rect.) in screen coordinates. */
     /// @throws css::lang::DisposedException
-    Rectangle getBoundingBoxOnScreen();
+    tools::Rectangle getBoundingBoxOnScreen();
 
     ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; }
     void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; }
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index 439941a67a55..8024b504dfe4 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -124,10 +124,10 @@ protected:
     implGetChild( sal_Int32 nRow, sal_uInt32 nColumnPos );
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() override;
+    virtual tools::Rectangle implGetBoundingBox() override;
    /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() override;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
     // internal helper methods
 
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index bece5123ad85..b36089a05332 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -73,9 +73,9 @@ namespace accessibility
         ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override;
 
     protected:
-        virtual Rectangle implGetBoundingBox() override;
+        virtual tools::Rectangle implGetBoundingBox() override;
 
-        virtual Rectangle implGetBoundingBoxOnScreen() override;
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
     };
 }
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index df91b96c664e..b00fdaf062c3 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -152,10 +152,10 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The bounding box (VCL rect.) relative to the parent window. */
-    virtual Rectangle implGetBoundingBox() override;
+    virtual tools::Rectangle implGetBoundingBox() override;
     ///** @attention  This method requires locked mutex's and a living object.
     //    @return  The bounding box (VCL rect.) in screen coordinates. */
-    virtual Rectangle implGetBoundingBoxOnScreen() override;
+    virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
 
     //// internal helper methods
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index eeef6d32a82e..d66b399504c4 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -69,8 +69,8 @@ namespace accessibility
         virtual OUString                        implGetText() override;
         virtual css::lang::Locale               implGetLocale() override;
         virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override;
-        virtual Rectangle implGetBoundingBox() override;
-        virtual Rectangle implGetBoundingBoxOnScreen() override;
+        virtual tools::Rectangle implGetBoundingBox() override;
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
     public:
         AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index eb82e4862726..e24c8e999f08 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -45,8 +45,8 @@ namespace accessibility
 
     protected:
         // AccessibleBrowseBoxBase overridables
-        virtual Rectangle implGetBoundingBox() override;
-        virtual Rectangle implGetBoundingBoxOnScreen() override;
+        virtual tools::Rectangle implGetBoundingBox() override;
+        virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
 
         // XAccessibleComponent
         virtual void SAL_CALL grabFocus() override;
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index fb020db028b5..1b1f6a832414 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -73,17 +73,17 @@ namespace accessibility
         css::uno::Reference< css::accessibility::XAccessible > m_xParent;
 
     private:
-        Rectangle               GetBoundingBox_Impl() const;
-        Rectangle               GetBoundingBoxOnScreen_Impl() const;
+        tools::Rectangle               GetBoundingBox_Impl() const;
+        tools::Rectangle               GetBoundingBoxOnScreen_Impl() const;
         bool                IsAlive_Impl() const;
         bool                IsShowing_Impl() const;
 
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBox();
+        tools::Rectangle               GetBoundingBox();
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBoxOnScreen();
+        tools::Rectangle               GetBoundingBoxOnScreen();
         /// @throws css::lang::DisposedException
         void                    EnsureIsAlive() const;
 
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx
index 90d4b0a3811e..7690d440806c 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -89,17 +89,17 @@ namespace accessibility
                                             m_aParent;
 
     private:
-        Rectangle               GetBoundingBox_Impl() const;
-        Rectangle               GetBoundingBoxOnScreen_Impl() const;
+        tools::Rectangle               GetBoundingBox_Impl() const;
+        tools::Rectangle               GetBoundingBoxOnScreen_Impl() const;
         bool                IsAlive_Impl() const;
         bool                IsShowing_Impl() const;
 
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBox();
+        tools::Rectangle               GetBoundingBox();
         /// @throws css::lang::DisposedException
         /// @throws css::uno::RuntimeException
-        Rectangle               GetBoundingBoxOnScreen();
+        tools::Rectangle               GetBoundingBoxOnScreen();
         /// @throws css::lang::DisposedException
         void                    EnsureIsAlive() const;
 
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx
index bcb195b4c8a5..8c60bc5b8070 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp
 } } } } }
 
 class Point;
-class Rectangle;
+namespace tools { class Rectangle; }
 namespace vcl { class Window; }
 namespace accessibility
 {
@@ -39,9 +39,9 @@ namespace accessibility
         virtual ~IComboListBoxHelper() = 0;
 
         virtual OUString        GetEntry( sal_Int32  nPos ) const = 0;
-        virtual Rectangle       GetDropDownPosSizePixel( ) const = 0;
-        virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
-        virtual Rectangle       GetWindowExtentsRelative() = 0;
+        virtual tools::Rectangle       GetDropDownPosSizePixel( ) const = 0;
+        virtual tools::Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
+        virtual tools::Rectangle       GetWindowExtentsRelative() = 0;
         virtual bool            IsEnabled() const = 0;
         virtual bool            IsEntryVisible( sal_Int32  nPos ) const = 0;
         virtual sal_uInt16      GetDisplayLineCount() const = 0;
@@ -57,7 +57,7 @@ namespace accessibility
         virtual void            SetNoSelection() = 0;
         virtual sal_Int32       GetSelectEntryPos( sal_Int32  nSelIndex ) const = 0;
         virtual bool            IsInDropDown() const = 0;
-        virtual Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
+        virtual tools::Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
         virtual long            GetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0;
         virtual css::uno::Reference< css::datatransfer::clipboard::XClipboard >
                                 GetClipboard() = 0;
diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx
index 570e46ffce03..8bc7e2dae2ef 100644
--- a/accessibility/inc/helper/listboxhelper.hxx
+++ b/accessibility/inc/helper/listboxhelper.hxx
@@ -50,32 +50,32 @@ public:
         return m_aComboListBox.GetEntry( nPos );
     }
 
-    virtual Rectangle       GetDropDownPosSizePixel() const override
+    virtual tools::Rectangle       GetDropDownPosSizePixel() const override
     {
-        Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr);
-        Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
+        tools::Rectangle aTemp = m_aComboListBox.GetWindowExtentsRelative(nullptr);
+        tools::Rectangle aRet = m_aComboListBox.GetDropDownPosSizePixel();
         aRet.Move(aTemp.TopLeft().X(),aTemp.TopLeft().Y());
         return aRet;
     }
 
-    virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const override
+    virtual tools::Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const override
     {
-        Rectangle aRect;
+        tools::Rectangle aRect;
         if ( m_aComboListBox.IsInDropDown() && IsEntryVisible( nItem ) )
         {
-            Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel();
+            tools::Rectangle aTemp = m_aComboListBox.GetDropDownPosSizePixel();
             Size aSize = aTemp.GetSize();
             aSize.Height() /= m_aComboListBox.GetDisplayLineCount();
             Point aTopLeft = aTemp.TopLeft();
             aTopLeft.Y() += aSize.Height() * ( nItem - m_aComboListBox.GetTopEntry() );
-            aRect = Rectangle( aTopLeft, aSize );
+            aRect = tools::Rectangle( aTopLeft, aSize );
         }
         else
             aRect = m_aComboListBox.GetBoundingRectangle( nItem );
         return aRect;
     }
 
-    virtual Rectangle       GetWindowExtentsRelative() override
+    virtual tools::Rectangle       GetWindowExtentsRelative() override
     {
         return m_aComboListBox.GetWindowExtentsRelative( nullptr );
     }
@@ -157,9 +157,9 @@ public:
         return m_aComboListBox.IsInDropDown();
     }
 
-    virtual Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const override
+    virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const override
     {
-        Rectangle aRect;
+        tools::Rectangle aRect;
 
         Pair aEntryCharacterRange = m_aComboListBox.GetLineStartEnd( _nEntryPos );
         if ( aEntryCharacterRange.A() + _nCharacterIndex <= aEntryCharacterRange.B() )
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index dc534214e7b1..cba3534711a1 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -191,7 +191,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName()
 
 // internal virtual methods
 
-Rectangle AccessibleBrowseBox::implGetBoundingBox()
+tools::Rectangle AccessibleBrowseBox::implGetBoundingBox()
 {
     vcl::Window* pParent = mpBrowseBox->GetAccessibleParentWindow();
     OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
@@ -199,7 +199,7 @@ Rectangle AccessibleBrowseBox::implGetBoundingBox()
 }
 
 
-Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
 {
     return mpBrowseBox->GetWindowExtentsRelative( nullptr );
 }
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index d94a14b473d4..f4b18d9e1208 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -205,7 +205,7 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
 
 sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint )
 {
-    return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+    return tools::Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
 awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds()
@@ -383,12 +383,12 @@ void AccessibleBrowseBoxBase::ensureIsAlive() const
         throw lang::DisposedException();
 }
 
-Rectangle AccessibleBrowseBoxBase::getBoundingBox()
+tools::Rectangle AccessibleBrowseBoxBase::getBoundingBox()
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
 
-    Rectangle aRect = implGetBoundingBox();
+    tools::Rectangle aRect = implGetBoundingBox();
     if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
     {
         SAL_WARN( "accessibility", "rectangle doesn't exist" );
@@ -396,12 +396,12 @@ Rectangle AccessibleBrowseBoxBase::getBoundingBox()
     return aRect;
 }
 
-Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
+tools::Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
 
-    Rectangle aRect = implGetBoundingBoxOnScreen();
+    tools::Rectangle aRect = implGetBoundingBoxOnScreen();
     if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
     {
         SAL_WARN( "accessibility", "rectangle doesn't exist" );
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 00d04c7756e1..04e03818e828 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -295,12 +295,12 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId(
 
 // internal virtual methods ---------------------------------------------------
 
-Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBox()
+tools::Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBox()
 {
     return mpBrowseBox->calcHeaderRect(isColumnBar(), false);
 }
 
-Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBoxOnScreen()
 {
     return mpBrowseBox->calcHeaderRect(isColumnBar());
 }
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index ce5c3ef7f3f4..1572de65e2d3 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -117,7 +117,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName()
 
 namespace
 {
-    Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar)
+    tools::Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar)
     {
         sal_Int32 nRow  = 0;
         sal_uInt16 nCol =  (sal_uInt16)_nRowColIndex;
@@ -127,18 +127,18 @@ namespace
             nCol = 0;
         }
 
-        Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, true, _bOnScreen));
-        return Rectangle(aRet.TopLeft() - Point(0,aRet.GetHeight()),aRet.GetSize());
+        tools::Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, true, _bOnScreen));
+        return tools::Rectangle(aRet.TopLeft() - Point(0,aRet.GetHeight()),aRet.GetSize());
     }
 }
 
-Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox()
+tools::Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox()
 {
     return getRectangle(mpBrowseBox,m_nColumnRowId,false,isRowBarCell());
 }
 
 
-Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
 {
     return getRectangle(mpBrowseBox,m_nColumnRowId,true,isRowBarCell());
 }
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 61d7c2b21773..5b9ba4927e96 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -188,12 +188,12 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName()
 
 // internal virtual methods ---------------------------------------------------
 
-Rectangle AccessibleBrowseBoxTable::implGetBoundingBox()
+tools::Rectangle AccessibleBrowseBoxTable::implGetBoundingBox()
 {
     return mpBrowseBox->calcTableRect(false);
 }
 
-Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen()
 {
     return mpBrowseBox->calcTableRect();
 }
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index 07d108592ff6..999354efaedf 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -213,7 +213,7 @@ OUString SAL_CALL AccessibleGridControl::getImplementationName()
 
 // internal virtual methods ---------------------------------------------------
 
-Rectangle AccessibleGridControl::implGetBoundingBox()
+tools::Rectangle AccessibleGridControl::implGetBoundingBox()
 {
     vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
     OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" );
@@ -221,7 +221,7 @@ Rectangle AccessibleGridControl::implGetBoundingBox()
 }
 
 
-Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen()
 {
     return m_aTable.GetWindowExtentsRelative( nullptr );
 }
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 0c25e45a9009..dd22d4c76af7 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -181,7 +181,7 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
 
 sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint )
 {
-   return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+   return tools::Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
 }
 
 awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds()
@@ -308,11 +308,11 @@ void AccessibleGridControlBase::ensureIsAlive() const
         throw lang::DisposedException();
 }
 
-Rectangle AccessibleGridControlBase::getBoundingBox()
+tools::Rectangle AccessibleGridControlBase::getBoundingBox()
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
-    Rectangle aRect = implGetBoundingBox();
+    tools::Rectangle aRect = implGetBoundingBox();
     if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
     {
         SAL_WARN( "accessibility", "rectangle doesn't exist" );
@@ -320,11 +320,11 @@ Rectangle AccessibleGridControlBase::getBoundingBox()
     return aRect;
 }
 
-Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen()
+tools::Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen()
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
-    Rectangle aRect = implGetBoundingBoxOnScreen();
+    tools::Rectangle aRect = implGetBoundingBoxOnScreen();
     if ( 0 == aRect.Left() && 0 == aRect.Top() && 0 == aRect.Right() && 0 == aRect.Bottom() )
     {
         SAL_WARN( "accessibility", "rectangle doesn't exist" );
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index f3786228c4f5..f6a4cb177043 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -191,26 +191,26 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId()
 
 // internal virtual methods ---------------------------------------------------
 
-Rectangle AccessibleGridControlHeader::implGetBoundingBox()
+tools::Rectangle AccessibleGridControlHeader::implGetBoundingBox()
 {
     vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
-    Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
+    tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
+    tools::Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
     if(isColumnBar())
-        return Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight()));
+        return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight()));
     else
-        return Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight()));
+        return tools::Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight()));
 
 }
 
-Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleGridControlHeader::implGetBoundingBoxOnScreen()
 {
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
-    Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
+    tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
+    tools::Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar()));
     if(isColumnBar())
-        return Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight()));
+        return tools::Rectangle(aGridRect.TopLeft(), Size(aGridRect.getWidth(),aHeaderRect.getHeight()));
     else
-        return Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight()));
+        return tools::Rectangle(aGridRect.TopLeft(), Size(aHeaderRect.getWidth(),aGridRect.getHeight()));
 }
 
 // internal helper methods ----------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 49a84aa0d356..a48f24c8f133 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -125,30 +125,30 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName()
     return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" );
 }
 
-Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
+tools::Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox()
 {
     vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
+    tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) );
     sal_Int32 nIndex = getAccessibleIndexInParent();
-    Rectangle aCellRect;
+    tools::Rectangle aCellRect;
     if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
         aCellRect = m_aTable.calcHeaderCellRect(true, nIndex);
     else
         aCellRect = m_aTable.calcHeaderCellRect(false, nIndex);
-    return Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize());
+    return tools::Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize());
 }
 
 
-Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen()
 {
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
+    tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ) );
     sal_Int32 nIndex = getAccessibleIndexInParent();
-    Rectangle aCellRect;
+    tools::Rectangle aCellRect;
     if(m_eObjType == TCTYPE_COLUMNHEADERCELL)
         aCellRect = m_aTable.calcHeaderCellRect(true, nIndex);
     else
         aCellRect = m_aTable.calcHeaderCellRect(false, nIndex);
-    return Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize());
+    return tools::Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize());
 }
 
 sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent()
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 68262003f0f9..f22a8db0ff0a 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -316,29 +316,29 @@ OUString SAL_CALL AccessibleGridControlTable::getImplementationName()
 
 // internal virtual methods ---------------------------------------------------
 
-Rectangle AccessibleGridControlTable::implGetBoundingBox()
+tools::Rectangle AccessibleGridControlTable::implGetBoundingBox()
 {
     vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
     DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ));
-    Rectangle aTableRect( m_aTable.calcTableRect() );
+    tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ));
+    tools::Rectangle aTableRect( m_aTable.calcTableRect() );
     long nX = aGridRect.Left() + aTableRect.Left();
     long nY = aGridRect.Top() + aTableRect.Top();
     long nWidth = aGridRect.GetSize().Width()-aTableRect.Left();
     long nHeight = aGridRect.GetSize().Height()-aTableRect.Top();
-    Rectangle aTable( Point( nX, nY ), Size( nWidth, nHeight ));
+    tools::Rectangle aTable( Point( nX, nY ), Size( nWidth, nHeight ));
     return aTable;
 }
 
-Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
+tools::Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen()
 {
-    Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ));
-    Rectangle aTableRect( m_aTable.calcTableRect() );
+    tools::Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( nullptr ));
+    tools::Rectangle aTableRect( m_aTable.calcTableRect() );
     long nX = aGridRect.Left() + aTableRect.Left();
     long nY = aGridRect.Top() + aTableRect.Top();
     long nWidth = aGridRect.GetSize().Width()-aTableRect.Left();
     long nHeight = aGridRect.GetSize().Height()-aTableRect.Top();
-    Rectangle aTable( Point( nX, nY ), Size( nWidth, nHeight ));
+    tools::Rectangle aTable( Point( nX, nY ), Size( nWidth, nHeight ));
     return aTable;
 }
 // internal helper methods ----------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 55378092f535..753c9bd643f6 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -325,27 +325,27 @@ namespace accessibility
         return false;
     }
 
-    Rectangle AccessibleGridControlTableCell::implGetBoundingBox()
+    tools::Rectangle AccessibleGridControlTableCell::implGetBoundingBox()
     {
         vcl::Window* pParent = m_aTable.GetAccessibleParentWindow();
         DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" );
-        Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent );
+        tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent );
         sal_Int32 nIndex = getAccessibleIndexInParent();
-        Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
+        tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
         long nX = aGridRect.Left() + aCellRect.Left();
         long nY = aGridRect.Top() + aCellRect.Top();
-        Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
+        tools::Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
         return aCell;
     }
 
-    Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen()
+    tools::Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen()
     {
-        Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( nullptr );
+        tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( nullptr );
         sal_Int32 nIndex = getAccessibleIndexInParent();
-        Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
+        tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount());
         long nX = aGridRect.Left() + aCellRect.Left();
         long nY = aGridRect.Top() + aCellRect.Top();
-        Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
+        tools::Rectangle aCell( Point( nX, nY ), aCellRect.GetSize());
         return aCell;
     }
 }
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 099dde455ee7..abf3a4cf382a 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -56,12 +56,12 @@ namespace accessibility
         mpBrowseBox->GoToCell( m_nRowPos, m_nColPos );
     }
 
-    ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
+    ::tools::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
     {
         return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false, false );
     }
 
-    ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
+    ::tools::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
     {
         return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, false );
     }
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 86750fa019eb..6be99bec6c93 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -106,9 +106,9 @@ namespace accessibility
         }
     }
 
-    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const
+    tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const
     {
-        Rectangle aRect;
+        tools::Rectangle aRect;
         SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
         if ( pEntry )
             aRect = m_pIconCtrl->GetBoundingBox( pEntry );
@@ -116,16 +116,16 @@ namespace accessibility
         return aRect;
     }
 
-    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const
+    tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const
     {
-        Rectangle aRect;
+        tools::Rectangle aRect;
         SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( m_nIndex );
         if ( pEntry )
         {
             aRect = m_pIconCtrl->GetBoundingBox( pEntry );
             Point aTopLeft = aRect.TopLeft();
             aTopLeft += m_pIconCtrl->GetWindowExtentsRelative( nullptr ).TopLeft();
-            aRect = Rectangle( aTopLeft, aRect.GetSize() );
+            aRect = tools::Rectangle( aTopLeft, aRect.GetSize() );
         }
 
         return aRect;
@@ -151,7 +151,7 @@ namespace accessibility
         return bShowing;
     }
 
-    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox()
+    tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox()
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -160,7 +160,7 @@ namespace accessibility
         return GetBoundingBox_Impl();
     }
 
-    Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen()
+    tools::Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen()
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -347,7 +347,7 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint )
     {
-        return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+        return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
     }
 
     Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& )
@@ -428,8 +428,8 @@ namespace accessibility
         awt::Rectangle aBounds( 0, 0, 0, 0 );
         if ( m_pIconCtrl )
         {
-            Rectangle aItemRect = GetBoundingBox_Impl();
-            Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds( m_nIndex, _nIndex );
+            tools::Rectangle aItemRect = GetBoundingBox_Impl();
+            tools::Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds( m_nIndex, _nIndex );
             aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
             aBounds = AWTRectangle( aCharRect );
         }
@@ -446,7 +446,7 @@ namespace accessibility
         if ( m_pIconCtrl )
         {
             vcl::ControlLayoutData aLayoutData;
-            Rectangle aItemRect = GetBoundingBox_Impl();
+            tools::Rectangle aItemRect = GetBoundingBox_Impl();
             m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect );
             Point aPnt( VCLPoint( aPoint ) );
             aPnt += aItemRect.TopLeft();
@@ -455,7 +455,7 @@ namespace accessibility
             long nLen = aLayoutData.m_aUnicodeBoundRects.size();
             for ( long i = 0; i < nLen; ++i )
             {
-                Rectangle aRect = aLayoutData.GetCharacterBounds(i);
+                tools::Rectangle aRect = aLayoutData.GetCharacterBounds(i);
                 bool bInside = aRect.IsInside( aPnt );
 
                 if ( bInside )
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 8f0b1ecf32cc..dc1c80299e51 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -108,9 +108,9 @@ namespace accessibility
     }
 
 
-    Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const
+    tools::Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const
     {
-        Rectangle aRect;
+        tools::Rectangle aRect;
         SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
@@ -121,23 +121,23 @@ namespace accessibility
                 // position relative to parent entry
                 Point aTopLeft = aRect.TopLeft();
                 aTopLeft -= getListBox()->GetBoundingRect( pParent ).TopLeft();
-                aRect = Rectangle( aTopLeft, aRect.GetSize() );
+                aRect = tools::Rectangle( aTopLeft, aRect.GetSize() );
             }
         }
 
         return aRect;
     }
 
-    Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const
+    tools::Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const
     {
-        Rectangle aRect;
+        tools::Rectangle aRect;
         SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
         if ( pEntry )
         {
             aRect = getListBox()->GetBoundingRect( pEntry );
             Point aTopLeft = aRect.TopLeft();
             aTopLeft += getListBox()->GetWindowExtentsRelative( nullptr ).TopLeft();
-            aRect = Rectangle( aTopLeft, aRect.GetSize() );
+            aRect = tools::Rectangle( aTopLeft, aRect.GetSize() );
         }
 
         return aRect;
@@ -165,7 +165,7 @@ namespace accessibility
         return bShowing;
     }
 
-    Rectangle AccessibleListBoxEntry::GetBoundingBox()
+    tools::Rectangle AccessibleListBoxEntry::GetBoundingBox()
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -174,7 +174,7 @@ namespace accessibility
         return GetBoundingBox_Impl();
     }
 
-    Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen()
+    tools::Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen()
     {
         SolarMutexGuard aSolarGuard;
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -550,7 +550,7 @@ namespace accessibility
 
     sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint )
     {
-        return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+        return tools::Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
     }
 
     Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint )
@@ -565,7 +565,7 @@ namespace accessibility
 
         Reference< XAccessible > xAcc;
         AccessibleListBoxEntry* pAccEntry = new AccessibleListBoxEntry( *getListBox(), pEntry, this );
-        Rectangle aRect = pAccEntry->GetBoundingBox_Impl();
+        tools::Rectangle aRect = pAccEntry->GetBoundingBox_Impl();
         if ( aRect.IsInside( VCLPoint( _aPoint ) ) )
             xAcc = pAccEntry;
         return xAcc;
@@ -648,9 +648,9 @@ namespace accessibility
         if ( pEntry )
         {
             vcl::ControlLayoutData aLayoutData;
-            Rectangle aItemRect = GetBoundingBox();
+            tools::Rectangle aItemRect = GetBoundingBox();
             getListBox()->RecordLayoutData( &aLayoutData, aItemRect );
-            Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
+            tools::Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
             aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
             aBounds = AWTRectangle( aCharRect );
         }
@@ -670,7 +670,7 @@ namespace accessibility
         if ( pEntry )
         {
             vcl::ControlLayoutData aLayoutData;
-            Rectangle aItemRect = GetBoundingBox();
+            tools::Rectangle aItemRect = GetBoundingBox();
             getListBox()->RecordLayoutData( &aLayoutData, aItemRect );
             Point aPnt( VCLPoint( aPoint ) );
             aPnt += aItemRect.TopLeft();
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index 246fd3c57769..66ffc402a915 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -150,7 +150,7 @@ namespace accessibility
     {
         awt::Rectangle aBounds;
         if ( m_pTabBar )
-            aBounds = AWTRectangle( Rectangle( m_pTabBar->GetPosPixel(), m_pTabBar->GetSizePixel() ) );
+            aBounds = AWTRectangle( tools::Rectangle( m_pTabBar->GetPosPixel(), m_pTabBar->GetSizePixel() ) );
 
         return aBounds;
     }
@@ -391,7 +391,7 @@ namespace accessibility
                 Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
                 if ( xComp.is() )
                 {
-                    Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                    tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
                     Point aPos = VCLPoint( rPoint );
                     if ( aRect.IsInside( aPos ) )
                     {
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index a683cb23aea6..8853ac58a8b7 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -528,7 +528,7 @@ namespace accessibility
                 Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
                 if ( xComp.is() )
                 {
-                    Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                    tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
                     Point aPos = VCLPoint( rPoint );
                     if ( aRect.IsInside( aPos ) )
                     {
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 0a61a1a84991..754526db7b75 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -869,10 +869,10 @@ Document::retrieveCharacterBounds(Paragraph const * pParagraph,
     }
     else
     {
-        ::Rectangle aLeft(
+        ::tools::Rectangle aLeft(
             m_rEngine.PaMtoEditCursor(::TextPaM(nNumber, nIndex)));
             // XXX  numeric overflow
-        ::Rectangle aRight(
+        ::tools::Rectangle aRight(
             m_rEngine.PaMtoEditCursor(::TextPaM(nNumber, nIndex + 1)));
             // XXX  numeric overflow (2x)
         // FIXME  If the vertical extends of the two cursors do not match, assume
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index baa097e2bb2d..3ee3a95a4a07 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -365,7 +365,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po
             Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
             if ( xComp.is() )
             {
-                Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
                 Point aPos = VCLPoint( rPoint );
                 if ( aRect.IsInside( aPos ) )
                 {
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 67ddc2c48341..3d8204faaf3d 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -110,7 +110,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds()
         if ( pWindow )
         {
             // get bounding rectangle of the window in screen coordinates
-            Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
+            tools::Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
             aBounds = AWTRectangle( aRect );
 
             // get position of the accessible parent in screen coordinates
@@ -261,7 +261,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen(  )
         vcl::Window* pWindow = m_pMenu->GetWindow();
         if ( pWindow )
         {
-            Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
+            tools::Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
             aPos = AWTPoint( aRect.TopLeft() );
         }
     }
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 2fafbb0e6e1d..98dca6573593 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -258,7 +258,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds()
         vcl::Window* pWindow = m_pParent->GetWindow();
         if ( pWindow )
         {
-            Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
+            tools::Rectangle aRect = pWindow->GetWindowExtentsRelative( nullptr );
             awt::Point aWindowScreenLoc = AWTPoint( aRect.TopLeft() );
 
             // get position of accessible parent in screen coordinates
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index dce74975018e..e0ee6fe3f0a6 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -371,7 +371,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex )
             // #108914# calculate virtual bounding rectangle
             for ( sal_Int32 i = 0; i < nLength; ++i )
             {
-                Rectangle aRect = pControl->GetCharacterBounds( i );
+                tools::Rectangle aRect = pControl->GetCharacterBounds( i );
                 sal_Int32 nHeight = aRect.GetHeight();
                 if ( aBounds.Height < nHeight )
                 {
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 463dc45c5043..d53245dca36d 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -304,7 +304,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
     ::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent.is() ? m_xParent->getListBoxHelper() : nullptr;
     if (pListBoxHelper)
     {
-        Rectangle aRect(pListBoxHelper->GetBoundingRectangle((sal_uInt16)m_nIndexInParent));
+        tools::Rectangle aRect(pListBoxHelper->GetBoundingRectangle((sal_uInt16)m_nIndexInParent));
         aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y());
         bInside = aRect.IsInside( VCLPoint( _aPoint ) );
     }
@@ -338,7 +338,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  )
     ::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent.is() ? m_xParent->getListBoxHelper() : nullptr;
     if (pListBoxHelper)
     {
-        Rectangle aRect = pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        tools::Rectangle aRect = pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         aPoint = aRect.TopLeft();
     }
     return AWTPoint( aPoint );
@@ -353,7 +353,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  )
     ::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent.is() ? m_xParent->getListBoxHelper() : nullptr;
     if (pListBoxHelper)
     {
-        Rectangle aRect = pListBoxHelper->GetBoundingRectangle((sal_uInt16)m_nIndexInParent);
+        tools::Rectangle aRect = pListBoxHelper->GetBoundingRectangle((sal_uInt16)m_nIndexInParent);
         aPoint = aRect.TopLeft();
         aPoint += pListBoxHelper->GetWindowExtentsRelative().TopLeft();
     }
@@ -429,8 +429,8 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
     ::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent.is() ? m_xParent->getListBoxHelper() : nullptr;
     if (pListBoxHelper)
     {
-        Rectangle aCharRect = pListBoxHelper->GetEntryCharacterBounds( m_nIndexInParent, nIndex );
-        Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        tools::Rectangle aCharRect = pListBoxHelper->GetEntryCharacterBounds( m_nIndexInParent, nIndex );
+        tools::Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
         aBounds = AWTRectangle( aCharRect );
     }
@@ -456,7 +456,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
     if (pListBoxHelper)
     {
         sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
-        Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
+        tools::Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         Point aPnt( VCLPoint( aPoint ) );
         aPnt += aItemRect.TopLeft();
         sal_Int32 nI = pListBoxHelper->GetIndexForPoint( aPnt, nPos );
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 3aca273605e7..7436716dedf8 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -247,8 +247,8 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex )
     if ( m_pParent )
     {
         sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos );
-        Rectangle aItemRect = m_pParent->GetBoundingRectangle( m_nItemPos );
-        Rectangle aCharRect = m_pParent->GetCharacterBounds( nItemId, nIndex );
+        tools::Rectangle aItemRect = m_pParent->GetBoundingRectangle( m_nItemPos );
+        tools::Rectangle aCharRect = m_pParent->GetCharacterBounds( nItemId, nIndex );
         aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
         aBounds = AWTRectangle( aCharRect );
     }
@@ -273,7 +273,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint )
     if ( m_pParent )
     {
         sal_uInt16 nItemId = 0;
-        Rectangle aItemRect = m_pParent->GetBoundingRectangle( m_nItemPos );
+        tools::Rectangle aItemRect = m_pParent->GetBoundingRectangle( m_nItemPos );
         Point aPnt( VCLPoint( aPoint ) );
         aPnt += aItemRect.TopLeft();
         sal_Int32 nI = m_pParent->GetIndexForPoint( aPnt, nItemId );
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index e937415f18ed..7ebf8dbc2e29 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -134,7 +134,7 @@ OUString VCLXAccessibleStatusBarItem::GetItemText()
     vcl::ControlLayoutData aLayoutData;
     if ( m_pStatusBar )
     {
-        Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
+        tools::Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
         m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
         sText = aLayoutData.m_aDisplayText;
     }
@@ -503,9 +503,9 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
     if ( m_pStatusBar )
     {
         vcl::ControlLayoutData aLayoutData;
-        Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
+        tools::Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
         m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
-        Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
+        tools::Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
         aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
         aBounds = AWTRectangle( aCharRect );
     }
@@ -522,7 +522,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint
     if ( m_pStatusBar )
     {
         vcl::ControlLayoutData aLayoutData;
-        Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
+        tools::Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
         m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
         Point aPnt( VCLPoint( aPoint ) );
         aPnt += aItemRect.TopLeft();
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 4ccebc7eb3f9..7e33f49785cc 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -423,7 +423,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
             Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
             if ( xComp.is() )
             {
-                Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
                 Point aPos = VCLPoint( rPoint );
                 if ( aRect.IsInside( aPos ) )
                 {
@@ -575,8 +575,8 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex )
     awt::Rectangle aBounds( 0, 0, 0, 0 );
     if ( m_pTabControl )
     {
-        Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
-        Rectangle aCharRect = m_pTabControl->GetCharacterBounds( m_nPageId, nIndex );
+        tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+        tools::Rectangle aCharRect = m_pTabControl->GetCharacterBounds( m_nPageId, nIndex );
         aCharRect.Move( -aPageRect.Left(), -aPageRect.Top() );
         aBounds = AWTRectangle( aCharRect );
     }
@@ -593,7 +593,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint )
     if ( m_pTabControl )
     {
         sal_uInt16 nPageId = 0;
-        Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+        tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
         Point aPnt( VCLPoint( aPoint ) );
         aPnt += aPageRect.TopLeft();
         sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index c160ecd7aef0..c8edcab404f8 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -72,10 +72,10 @@ awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds()
 
     if ( m_pTabControl )
     {
-        Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
+        tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
         if ( m_pTabPage )
         {
-            Rectangle aRect = Rectangle( m_pTabPage->GetPosPixel(), m_pTabPage->GetSizePixel() );
+            tools::Rectangle aRect = tools::Rectangle( m_pTabPage->GetPosPixel(), m_pTabPage->GetSizePixel() );
             aRect.Move( -aPageRect.Left(), -aPageRect.Top() );
             aBounds = AWTRectangle( aRect );
         }
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index bebc04fddfef..4d836e03e69e 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -467,8 +467,8 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32
     awt::Rectangle aBounds( 0, 0, 0, 0 );
     if ( m_pToolBox && m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) // symbol buttons have no character bounds
     {
-        Rectangle aCharRect = m_pToolBox->GetCharacterBounds( m_nItemId, nIndex );
-        Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
+        tools::Rectangle aCharRect = m_pToolBox->GetCharacterBounds( m_nItemId, nIndex );
+        tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
         aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
         aBounds = AWTRectangle( aCharRect );
     }
@@ -484,7 +484,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point&
     if ( m_pToolBox && m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) // symbol buttons have no character bounds
     {
         sal_uInt16 nItemId = 0;
-        Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
+        tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
         Point aPnt( VCLPoint( aPoint ) );
         aPnt += aItemRect.TopLeft();
         sal_Int32 nIdx = m_pToolBox->GetIndexForPoint( aPnt, nItemId );
diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx
index 4b3a9e016c7b..881ce0760244 100644
--- a/avmedia/source/framework/mediaplayer.cxx
+++ b/avmedia/source/framework/mediaplayer.cxx
@@ -84,7 +84,7 @@ void MediaFloater::Resize()
     SfxDockingWindow::Resize();
 
     if( mpMediaWindow )
-        mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+        mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
 }
 
 void MediaFloater::ToggleFloatingMode()
@@ -103,7 +103,7 @@ void MediaFloater::ToggleFloatingMode()
 
     mpMediaWindow = new MediaWindow( this, true );
 
-    mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) );
+    mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
     mpMediaWindow->executeMediaItem( aRestoreItem );
 
     vcl::Window* pWindow = mpMediaWindow->getWindow();
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index fe0adab71a20..ae550ff37f84 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -188,7 +188,7 @@ IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void)
         if(pMouseEvt)
         {
             const Point& rMousePos = pMouseEvt->GetPosPixel();
-            const Rectangle aWinRect(m_rEventHandler.GetPosPixel(),m_rEventHandler.GetSizePixel());
+            const tools::Rectangle aWinRect(m_rEventHandler.GetPosPixel(),m_rEventHandler.GetSizePixel());
             // Grab focus to the OpenGL window when mouse pointer is over it
             if( aWinRect.IsInside(rMousePos) )
             {
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index b204542b8833..74bb879a5233 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -122,7 +122,7 @@ Size MediaWindow::getPreferredSize() const
 }
 
 
-void MediaWindow::setPosSize( const Rectangle& rNewRect )
+void MediaWindow::setPosSize( const tools::Rectangle& rNewRect )
 {
     mpImpl->setPosSize( rNewRect );
 }
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 9802d90706ab..518b83eaf119 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -506,7 +506,7 @@ void MediaWindowImpl::onURLChanged()
     }
 }
 
-void MediaWindowImpl::setPosSize(const Rectangle& rRect)
+void MediaWindowImpl::setPosSize(const tools::Rectangle& rRect)
 {
     SetPosSizePixel(rRect.TopLeft(), rRect.GetSize());
 }
@@ -595,7 +595,7 @@ void MediaWindowImpl::StateChanged(StateChangedType eType)
     }
 }
 
-void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     if (mxPlayerWindow.is())
         mxPlayerWindow->update();
@@ -621,7 +621,7 @@ void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&
         return;
 
     const Point aBasePos(mpChildWindow->GetPosPixel());
-    const Rectangle aVideoRect(aBasePos, mpChildWindow->GetSizePixel());
+    const tools::Rectangle aVideoRect(aBasePos, mpChildWindow->GetSizePixel());
 
     if (pLogo && !pLogo->IsEmpty() && (aVideoRect.GetWidth() > 0) && (aVideoRect.GetHeight() > 0))
     {
diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx
index c179a9e55110..68fbaeb8a0d1 100644
--- a/avmedia/source/viewer/mediawindow_impl.hxx
+++ b/avmedia/source/viewer/mediawindow_impl.hxx
@@ -98,7 +98,7 @@ public:
     void updateMediaItem( MediaItem& rItem ) const;
     void executeMediaItem( const MediaItem& rItem );
 
-    void setPosSize( const Rectangle& rRect );
+    void setPosSize( const tools::Rectangle& rRect );
 
     void setPointer( const Pointer& rPointer );
 
@@ -113,7 +113,7 @@ private:
     virtual void Command( const CommandEvent& rCEvt ) override;
     virtual void Resize() override;
     virtual void StateChanged( StateChangedType ) override;
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; // const
+    virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; // const
     virtual void GetFocus() override;
 
     // DropTargetHelper
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index cf41060c40bb..afa2a469c3c6 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -137,7 +137,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds()
     if ( m_pDlgEdObj )
     {
         // get the bounding box of the shape in logic units
-        Rectangle aRect = m_pDlgEdObj->GetSnapRect();
+        tools::Rectangle aRect = m_pDlgEdObj->GetSnapRect();
 
         if ( m_pDialogWindow )
         {
@@ -150,7 +150,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds()
             aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) );
 
             // clip the shape's bounding box with the bounding box of its parent
-            Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
+            tools::Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
             aRect = aRect.GetIntersection( aParentRect );
             aBounds = AWTRectangle( aRect );
         }
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 3941ffabbd0a..1bde5e6ef245 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -215,7 +215,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
                 if (rView.IsLayerVisible(aLayerName))
                 {
                     // get the bounding box of the shape in logic units
-                    Rectangle aRect = pDlgEdObj->GetSnapRect();
+                    tools::Rectangle aRect = pDlgEdObj->GetSnapRect();
 
                     // transform coordinates relative to the parent
                     MapMode aMap = m_pDialogWindow->GetMapMode();
@@ -226,7 +226,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
                     aRect = m_pDialogWindow->LogicToPixel( aRect, MapMode(MapUnit::Map100thMM) );
 
                     // check, if the shape's bounding box intersects with the bounding box of its parent
-                    Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
+                    tools::Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
                     if ( aParentRect.IsOver( aRect ) )
                         bVisible = true;
                 }
@@ -463,7 +463,7 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds()
 {
     awt::Rectangle aBounds;
     if ( m_pDialogWindow )
-        aBounds = AWTRectangle( Rectangle( m_pDialogWindow->GetPosPixel(), m_pDialogWindow->GetSizePixel() ) );
+        aBounds = AWTRectangle( tools::Rectangle( m_pDialogWindow->GetPosPixel(), m_pDialogWindow->GetSizePixel() ) );
 
     return aBounds;
 }
@@ -761,7 +761,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
             Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
             if ( xComp.is() )
             {
-                Rectangle aRect = VCLRectangle( xComp->getBounds() );
+                tools::Rectangle aRect = VCLRectangle( xComp->getBounds() );
                 Point aPos = VCLPoint( rPoint );
                 if ( aRect.IsInside( aPos ) )
                 {
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index bce9ce80480d..9692a5e9660d 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -115,7 +115,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage,
     long nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder;
 
     if( bOutput )
-        pPrinter->DrawRect(Rectangle(
+        pPrinter->DrawRect(tools::Rectangle(
             Point(nXLeft, nYTop),
             Size(nXRight - nXLeft, aSz.Height() - nYTop - Print::nBottomMargin + Print::nBorder)
         ));
@@ -246,7 +246,7 @@ void ModulWindow::DoInit()
     GetEditorWindow().InitScrollBars();
 }
 
-void ModulWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle&)
+void ModulWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle&)
 {
 }
 
@@ -1434,7 +1434,7 @@ void ModulWindowLayout::UpdateDebug (bool bBasicStopped)
     aStackWindow->UpdateCalls();
 }
 
-void ModulWindowLayout::Paint (vcl::RenderContext& rRenderContext, Rectangle const&)
+void ModulWindowLayout::Paint (vcl::RenderContext& rRenderContext, tools::Rectangle const&)
 {
     rRenderContext.DrawText(Point(), IDEResId(RID_STR_NOMODULE).toString());
 }
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 4deb7db00221..854f698e591c 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -116,7 +116,7 @@ private:
     TextSelection GetLastHighlightPortionTextSelection();
 
 protected:
-    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    KeyInput( const KeyEvent& rKeyEvt ) override;
     virtual void    MouseMove( const MouseEvent& rMEvt ) override;
@@ -175,7 +175,7 @@ private:
     void setBackgroundColor(Color aColor);
 
 protected:
-    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
     BreakPoint*     FindBreakPoint( const Point& rMousePos );
     void ShowMarker(vcl::RenderContext& rRenderContext);
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
@@ -231,7 +231,7 @@ private:
 
 protected:
     virtual void    Resize() override;
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
 
     DECL_LINK( ButtonHdl, Button *, void );
     DECL_LINK(TreeListHdl, SvTreeListBox*, void);
@@ -258,7 +258,7 @@ private:
 
 protected:
     virtual void    Resize() override;
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
 
 public:
     explicit StackWindow (Layout* pParent);
@@ -316,7 +316,7 @@ private:
 protected:
     virtual void    Resize() override;
     virtual void    GetFocus() override;
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override;
     virtual void    DoInit() override;
     virtual void    DoScroll( ScrollBar* pCurScrollBar ) override;
 
@@ -432,7 +432,7 @@ public:
 
 protected:
     // Window:
-    virtual void Paint (vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void Paint (vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
     // Layout:
     virtual void OnFirstSize (long nWidth, long nHeight) override;
 
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 86d6afc49361..c51f5e8e4dee 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -376,7 +376,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
                     }
                 }
             }
-            Help::ShowQuickHelp( this, Rectangle( aTopLeft, Size( 1, 1 ) ), aHelpText, QuickHelpFlags::Top|QuickHelpFlags::Left);
+            Help::ShowQuickHelp( this, tools::Rectangle( aTopLeft, Size( 1, 1 ) ), aHelpText, QuickHelpFlags::Top|QuickHelpFlags::Left);
             bDone = true;
         }
     }
@@ -902,7 +902,7 @@ void EditorWindow::SetupAndShowCodeCompleteWnd( const std::vector< OUString >& a
     pEditView->GetWindow()->GrabFocus();
 }
 
-void EditorWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void EditorWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     if (!pEditEngine)     // We need it now at latest
         CreateEditEngine();
@@ -1295,7 +1295,7 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted )
 
         long nLineHeight = GetTextHeight();
         Size aSz = rModulWindow.GetBreakPointWindow().GetOutputSize();
-        Rectangle aInvRect( Point( 0, 0 ), aSz );
+        tools::Rectangle aInvRect( Point( 0, 0 ), aSz );
         long nY = nPara*nLineHeight - rModulWindow.GetBreakPointWindow().GetCurYOffset();
         aInvRect.Top() = nY;
         rModulWindow.GetBreakPointWindow().Invalidate( aInvRect );
@@ -1341,7 +1341,7 @@ BreakPointWindow::BreakPointWindow (vcl::Window* pParent, ModulWindow* pModulWin
     SetHelpId(HID_BASICIDE_BREAKPOINTWINDOW);
 }
 
-void BreakPointWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void BreakPointWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     if (SyncYOffset())
         return;
@@ -1640,7 +1640,7 @@ void WatchWindow::dispose()
     DockingWindow::dispose();
 }
 
-void WatchWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void WatchWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     rRenderContext.DrawText(Point(DWBORDER, 7), aWatchStr);
     lcl_DrawIDEWindowFrame(this, rRenderContext);
@@ -1861,7 +1861,7 @@ void StackWindow::dispose()
     DockingWindow::dispose();
 }
 
-void StackWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void StackWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     rRenderContext.DrawText(Point(DWBORDER, 7), aStackStr);
     lcl_DrawIDEWindowFrame(this, rRenderContext);
@@ -2814,7 +2814,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox()
     if( pListBox->GetEntryCount() >= 1 )
     {// if there is at least one element inside
         // calculate basic position: under the current line
-        Rectangle aRect = static_cast<TextEngine*>(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() );
+        tools::Rectangle aRect = static_cast<TextEngine*>(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() );
         long nViewYOffset = pParent->GetEditView()->GetStartDocPos().Y();
         Point aPos = aRect.BottomRight();// this variable will be used later (if needed)
         aPos.Y() = (aPos.Y() - nViewYOffset) + nBasePad;
@@ -2838,7 +2838,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox()
         pListBox->SetSizePixel( aSize );
 
         //calculate position
-        const Rectangle aVisArea( pParent->GetEditView()->GetStartDocPos(), pParent->GetOutputSizePixel() ); //the visible area
+        const tools::Rectangle aVisArea( pParent->GetEditView()->GetStartDocPos(), pParent->GetOutputSizePixel() ); //the visible area
         const Point& aBottomPoint = aVisArea.BottomRight();
 
         if( aVisArea.TopRight().getY() + aPos.getY() + aSize.getHeight() > aBottomPoint.getY() )
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index ffccb5e2f1cb..608ded2c1c68 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -111,7 +111,7 @@ void DialogWindow::LoseFocus()
     Window::LoseFocus();
 }
 
-void DialogWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void DialogWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     m_pEditor->Paint(rRenderContext, rRect);
 }
@@ -200,7 +200,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
             SdrView& rView = GetView();
             if( !rCEvt.IsMouseEvent() && rView.AreObjectsMarked() )
             {
-                Rectangle aMarkedRect( rView.GetMarkedRect() );
+                tools::Rectangle aMarkedRect( rView.GetMarkedRect() );
                 Point MarkedCenter( aMarkedRect.Center() );
                 Point PosPixel( LogicToPixel( MarkedCenter ) );
                 SfxDispatcher::ExecutePopup( this, &PosPixel );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 8a2940b39288..0f4210836884 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -284,7 +284,7 @@ void DockingWindow::dispose()
 // when the window is floating. Called by Layout.
 void DockingWindow::ResizeIfDocking (Point const& rPos, Size const& rSize)
 {
-    Rectangle const rRect(rPos, rSize);
+    tools::Rectangle const rRect(rPos, rSize);
     if (rRect != aDockingRect)
     {
         // saving the position and the size
@@ -332,7 +332,7 @@ void DockingWindow::Hide ()
     Show(false);
 }
 
-bool DockingWindow::Docking( const Point& rPos, Rectangle& rRect )
+bool DockingWindow::Docking( const Point& rPos, tools::Rectangle& rRect )
 {
     if (aDockingRect.IsInside(rPos))
     {
@@ -347,7 +347,7 @@ bool DockingWindow::Docking( const Point& rPos, Rectangle& rRect )
     }
 }
 
-void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
+void DockingWindow::EndDocking( const tools::Rectangle& rRect, bool bFloatMode )
 {
     if ( bFloatMode )
         ::DockingWindow::EndDocking( rRect, bFloatMode );
@@ -376,7 +376,7 @@ bool DockingWindow::PrepareToggleFloatingMode()
     if (IsFloatingMode())
     {
         // memorize position and size on the desktop...
-        aFloatingRect = Rectangle(
+        aFloatingRect = tools::Rectangle(
             GetParent()->OutputToScreenPixel(GetPosPixel()),
             GetSizePixel()
         );
@@ -388,7 +388,7 @@ void DockingWindow::StartDocking()
 {
     if (IsFloatingMode())
     {
-        aFloatingRect = Rectangle(
+        aFloatingRect = tools::Rectangle(
             GetParent()->OutputToScreenPixel(GetPosPixel()),
             GetSizePixel()
         );
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 6d87bf687ccb..5337adf61b3b 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -101,8 +101,8 @@ void Layout::ArrangeWindows ()
         }
 
         // sides
-        aBottomSide.ArrangeIn(Rectangle(Point(0, 0), aSize));
-        aLeftSide.ArrangeIn(Rectangle(Point(0, 0), Size(nWidth, nHeight - aBottomSide.GetSize())));
+        aBottomSide.ArrangeIn(tools::Rectangle(Point(0, 0), aSize));
+        aLeftSide.ArrangeIn(tools::Rectangle(Point(0, 0), Size(nWidth, nHeight - aBottomSide.GetSize())));
         // child in the middle
         pChild->SetPosSizePixel(
             Point(aLeftSide.GetSize(), 0),
@@ -265,7 +265,7 @@ long Layout::SplittedSide::GetSize () const
 
 // Arrange() -- arranges the docking windows
 // rRect: the available space
-void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect)
+void Layout::SplittedSide::ArrangeIn (tools::Rectangle const& rRect)
 {
     // saving the rectangle
     aRect = rRect;
@@ -333,7 +333,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect)
                     MakeSize(nSplitThickness, nSize - nSplitThickness)
                 );
                 // the dragging rectangle
-                rSplit.SetDragRectPixel(Rectangle(
+                rSplit.SetDragRectPixel(tools::Rectangle(
                     MakePoint(nPos2, nPos1),
                     MakeSize(nLength, nSize - nSplitThickness)
                 ));
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 2030c8734d02..0fe9517cbf98 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -36,7 +36,7 @@ void LineNumberWindow::dispose()
     Window::dispose();
 }
 
-void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle&)
+void LineNumberWindow::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     if(SyncYOffset())
         return;
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index df90c20af65c..81aaa8d93a00 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -26,7 +26,7 @@ private:
     virtual void DataChanged (DataChangedEvent const& rDCEvt) override;
 
 protected:
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
 
 public:
     LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin);
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index ecdbdf540ad1..01fe64219c1f 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -226,7 +226,7 @@ DlgEditor::DlgEditor (
     pDlgEdView->ShowSdrPage(pDlgEdView->GetModel()->GetPage(0));
     pDlgEdView->SetLayerVisible( "HiddenLayer", false );
     pDlgEdView->SetMoveSnapOnlyTopLeft(true);
-    pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
+    pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
 
     pDlgEdView->SetGridCoarse( aGridSize );
     pDlgEdView->SetSnapGridWidth(Fraction(aGridSize.Width(), 1), Fraction(aGridSize.Height(), 1));
@@ -469,7 +469,7 @@ bool DlgEditor::KeyInput( const KeyEvent& rKEvt )
 }
 
 
-void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     aPaintRect = rRect;
     mnPaintGuard++;
@@ -517,7 +517,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
                 }
 
                 // set dialog position and size
-                pDlgEdForm->SetSnapRect( Rectangle( aPos, aSize ) );
+                pDlgEdForm->SetSnapRect( tools::Rectangle( aPos, aSize ) );
                 pDlgEdForm->EndListening(false);
                 pDlgEdForm->SetPropsFromRect();
                 pDlgEdForm->GetDlgEditor().SetDialogModelChanged();
@@ -621,7 +621,7 @@ void DlgEditor::CreateDefaultObject()
         Point aPoint = (pDlgEdForm->GetSnapRect()).Center();
         aPoint.X() -= aSize.Width() / 2;
         aPoint.Y() -= aSize.Height() / 2;
-        pDlgEdObj->SetSnapRect( Rectangle( aPoint, aSize ) );
+        pDlgEdObj->SetSnapRect( tools::Rectangle( aPoint, aSize ) );
 
         // set default property values
         pDlgEdObj->SetDefaults();
@@ -1120,7 +1120,7 @@ void lcl_PrintHeader( Printer* pPrinter, const OUString& rTitle ) // not working
     long const nXLeft = Print::nLeftMargin - Print::nBorder;
     long const nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder;
 
-    pPrinter->DrawRect(Rectangle(
+    pPrinter->DrawRect(tools::Rectangle(
         Point(nXLeft, nYTop),
         Size(nXRight - nXLeft, aSz.Height() - nYTop - Print::nBottomMargin + Print::nBorder)
     ));
@@ -1237,7 +1237,7 @@ bool DlgEditor::AdjustPageSize()
                 {
                     Size aNewPageSize( nNewPageWidth, nNewPageHeight );
                     pDlgEdPage->SetSize( aNewPageSize );
-                    pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), aNewPageSize ) );
+                    pDlgEdView->SetWorkArea( tools::Rectangle( Point( 0, 0 ), aNewPageSize ) );
                     bAdjustedPageSize = true;
                 }
             }
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 52b5434bb020..0545b7c05faf 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -43,7 +43,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
     vcl::Window& rWindow  = rParent.GetWindow();
 
     static Point aDefPoint;
-    Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() );
+    tools::Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() );
     aOutRect = rWindow.PixelToLogic( aOutRect );
 
     ScrollBar* pHScroll = rParent.GetHScroll();
@@ -161,7 +161,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
                 if (SdrHdl* pHdl = rHdlList.GetFocusHdl())
                 {
                     Point aHdlPosition( pHdl->GetPos() );
-                    Rectangle aVisRect( aHdlPosition - Point( 100, 100 ), Size( 200, 200 ) );
+                    tools::Rectangle aVisRect( aHdlPosition - Point( 100, 100 ), Size( 200, 200 ) );
                     rView.MakeVisible( aVisRect, rWindow );
                 }
 
@@ -227,11 +227,11 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
                     if ( rView.IsMoveAllowed() )
                     {
                         // restrict movement to work area
-                        const Rectangle& rWorkArea = rView.GetWorkArea();
+                        const tools::Rectangle& rWorkArea = rView.GetWorkArea();
 
                         if ( !rWorkArea.IsEmpty() )
                         {
-                            Rectangle aMarkRect( rView.GetMarkedObjRect() );
+                            tools::Rectangle aMarkRect( rView.GetMarkedObjRect() );
                             aMarkRect.Move( nX, nY );
 
                             if ( !rWorkArea.IsInside( aMarkRect ) )
@@ -291,7 +291,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
                         }
 
                         // make moved handle visible
-                        Rectangle aVisRect( aEndPoint - Point( 100, 100 ), Size( 200, 200 ) );
+                        tools::Rectangle aVisRect( aEndPoint - Point( 100, 100 ), Size( 200, 200 ) );
                         rView.MakeVisible( aVisRect, rWindow );
                     }
                 }
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index a2e19d0decaa..b02f73d7043b 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -127,7 +127,7 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
     DlgEdForm* pForm = nullptr;
     if ( !lcl_getDlgEdForm( this, pForm ) )
         return false;
-    Rectangle aFormRect = pForm->GetSnapRect();
+    tools::Rectangle aFormRect = pForm->GetSnapRect();
     Size aFormPos( aFormRect.Left(), aFormRect.Top() );
 
     // convert 100th_mm to pixel
@@ -345,7 +345,7 @@ void DlgEdObj::SetRectFromProps()
             // set rectangle position and size
             Point aPoint( nXOut, nYOut );
             Size aSize( nWidthOut, nHeightOut );
-            SetSnapRect( Rectangle( aPoint, aSize ) );
+            SetSnapRect( tools::Rectangle( aPoint, aSize ) );
         }
     }
 }
@@ -353,7 +353,7 @@ void DlgEdObj::SetRectFromProps()
 void DlgEdObj::SetPropsFromRect()
 {
     // get control position and size from rectangle
-    Rectangle aRect_ = GetSnapRect();
+    tools::Rectangle aRect_ = GetSnapRect();
     sal_Int32 nXIn = aRect_.Left();
     sal_Int32 nYIn = aRect_.Top();
     sal_Int32 nWidthIn = aRect_.GetWidth();
@@ -1229,7 +1229,7 @@ void DlgEdForm::SetRectFromProps()
             // set rectangle position and size
             Point aPoint( nXOut, nYOut );
             Size aSize( nWidthOut, nHeightOut );
-            SetSnapRect( Rectangle( aPoint, aSize ) );
+            SetSnapRect( tools::Rectangle( aPoint, aSize ) );
         }
     }
 }
@@ -1237,7 +1237,7 @@ void DlgEdForm::SetRectFromProps()
 void DlgEdForm::SetPropsFromRect()
 {
     // get form position and size from rectangle
-    Rectangle aRect_ = GetSnapRect();
+    tools::Rectangle aRect_ = GetSnapRect();
     sal_Int32 nXIn = aRect_.Left();
     sal_Int32 nYIn = aRect_.Top();
     sal_Int32 nWidthIn = aRect_.GetWidth();
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index f5f1f733d255..d05ceb1d9a70 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -53,14 +53,14 @@ void DlgEdView::MarkListHasChanged()
     rDlgEditor.UpdatePropertyBrowserDelayed();
 }
 
-void DlgEdView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin )
+void DlgEdView::MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin )
 {
     // visible area
     MapMode aMap( rWin.GetMapMode() );
     Point aOrg( aMap.GetOrigin() );
     Size aVisSize( rWin.GetOutputSize() );
-    Rectangle RectTmp( Point(-aOrg.X(),-aOrg.Y()), aVisSize );
-    Rectangle aVisRect( RectTmp );
+    tools::Rectangle RectTmp( Point(-aOrg.X(),-aOrg.Y()), aVisSize );
+    tools::Rectangle aVisRect( RectTmp );
 
     // check, if rectangle is inside visible area
     if ( !aVisRect.IsInside( rRect ) )
@@ -144,7 +144,7 @@ SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt
         {
             // use direct model data; it's a DlgEdObj, so GetLastBoundRect()
             // will access aOutRect directly
-            const Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect());
+            const tools::Rectangle aOuterRectangle(pDlgEdObj->GetLastBoundRect());
 
             if(!aOuterRectangle.IsEmpty())
             {
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index c6510010b555..3f799fcdf106 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -63,7 +63,7 @@ private:
     sal_uInt16          m_nControlSlotId;
 
 protected:
-    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        dispose() override;
 
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index c6e0d51e9d16..4f934d7ce7d0 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -93,17 +93,17 @@ public:
     void Hide ();
 
 protected:
-    virtual bool Docking( const Point& rPos, Rectangle& rRect ) override;
-    virtual void     EndDocking( const Rectangle& rRect, bool bFloatMode ) override;
+    virtual bool Docking( const Point& rPos, tools::Rectangle& rRect ) override;
+    virtual void     EndDocking( const tools::Rectangle& rRect, bool bFloatMode ) override;
     virtual void     ToggleFloatingMode() override;
     virtual bool PrepareToggleFloatingMode() override;
     virtual void     StartDocking() override;
 
 private:
     // the position and the size of the floating window
-    Rectangle aFloatingRect;
+    tools::Rectangle aFloatingRect;
     // the position and the size of the docking window
-    Rectangle aDockingRect;
+    tools::Rectangle aDockingRect;
     // the parent layout window (only when docking)
     VclPtr<Layout> pLayout;
     // > 0: shown, <= 0: hidden, ++ by Show() and -- by Hide()
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index d8e282ed93da..2fa9bb9de66e 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -127,7 +127,7 @@ private:
     bool                bFirstDraw;
     Size                aGridSize;
     bool                bCreateOK;
-    Rectangle           aPaintRect;
+    tools::Rectangle           aPaintRect;
     bool                bDialogModelChanged;
     Idle                aMarkIdle;
     long                mnPaintGuard;
@@ -181,7 +181,7 @@ public:
     void            MouseButtonDown( const MouseEvent& rMEvt );
     void            MouseButtonUp( const MouseEvent& rMEvt );
     void            MouseMove( const MouseEvent& rMEvt );
-    void            Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+    void            Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
     bool            KeyInput( const KeyEvent& rKEvt );
 
     void            SetMode (Mode eMode);
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 1440e0903a33..a370d48e16b4 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -43,7 +43,7 @@ public:
     virtual ~DlgEdView() override;
 
     virtual void MarkListHasChanged() override;
-    virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) override;
+    virtual void MakeVisible( const tools::Rectangle& rRect, vcl::Window& rWin ) override;
 
 protected:
     /// override to handle HitTest for some objects specially
diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx
index 5b66e4163032..0c476f0f0701 100644
--- a/basctl/source/inc/layout.hxx
+++ b/basctl/source/inc/layout.hxx
@@ -85,7 +85,7 @@ private:
         void Remove (DockingWindow*);
         bool IsEmpty () const;
         long GetSize () const;
-        void ArrangeIn (Rectangle const&);
+        void ArrangeIn (tools::Rectangle const&);
         void dispose();
 
     private:
@@ -96,7 +96,7 @@ private:
         // lower (top or left) or higher (bottom or right) strip?
         bool bLower;
         // rectangle to move in
-        Rectangle aRect;
+        tools::Rectangle aRect;
         // size (width or height)
         long nSize;
         // the main splitting line
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 7aebfbc1ac2f..8bdda85d1ba8 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -168,7 +168,7 @@ namespace vclcanvas
             rOutDev.SetLineColor( COL_WHITE );
             rOutDev.SetFillColor( COL_WHITE );
             rOutDev.SetClipRegion();
-            rOutDev.DrawRect( Rectangle( Point(),
+            rOutDev.DrawRect( ::tools::Rectangle( Point(),
                                          rOutDev.GetOutputSizePixel()) );
 
             if( mp2ndOutDev )
@@ -181,7 +181,7 @@ namespace vclcanvas
                 rOutDev2.SetLineColor( COL_WHITE );
                 rOutDev2.SetFillColor( COL_WHITE );
                 rOutDev2.SetClipRegion();
-                rOutDev2.DrawRect( Rectangle( Point(),
+                rOutDev2.DrawRect( ::tools::Rectangle( Point(),
                                               rOutDev2.GetOutputSizePixel()) );
                 rOutDev2.SetDrawMode( DrawModeFlags::BlackLine | DrawModeFlags::BlackFill | DrawModeFlags::BlackText |
                                       DrawModeFlags::BlackGradient | DrawModeFlags::BlackBitmap );
@@ -946,7 +946,7 @@ namespace vclcanvas
         rLayout = getMemoryLayout();
 
         // TODO(F2): Support alpha canvas here
-        const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
+        const ::tools::Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
 
         OutputDevice& rOutDev( mpOutDev->getOutDev() );
 
@@ -1007,7 +1007,7 @@ namespace vclcanvas
         rOutDev.EnableMapMode( false );
         rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
 
-        const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
+        const ::tools::Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
         const sal_uInt16 nBitCount( std::min( (sal_uInt16)24, rOutDev.GetBitCount() ) );
         const BitmapPalette* pPalette = nullptr;
 
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index dd5236673edb..3250fc879746 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -106,7 +106,7 @@ namespace vclcanvas
          */
         void fillLinearGradient( OutputDevice&                                  rOutDev,
                                  const ::basegfx::B2DHomMatrix&                 rTextureTransform,
-                                 const ::Rectangle&                             rBounds,
+                                 const ::tools::Rectangle&                             rBounds,
                                  unsigned int                                   nStepCount,
                                  const ::canvas::ParametricPolyPolygon::Values& rValues,
                                  const std::vector< ::Color >&                  rColors )
@@ -264,7 +264,7 @@ namespace vclcanvas
 
         void fillPolygonalGradient( OutputDevice&                                  rOutDev,
                                     const ::basegfx::B2DHomMatrix&                 rTextureTransform,
-                                    const ::Rectangle&                             rBounds,
+                                    const ::tools::Rectangle&                             rBounds,
                                     unsigned int                                   nStepCount,
                                     bool                                           bFillNonOverlapping,
                                     const ::canvas::ParametricPolyPolygon::Values& rValues,
@@ -488,7 +488,7 @@ namespace vclcanvas
                              const ::canvas::ParametricPolyPolygon::Values& rValues,
                              const std::vector< ::Color >&                  rColors,
                              const ::basegfx::B2DHomMatrix&                 rTextureTransform,
-                             const ::Rectangle&                             rBounds,
+                             const ::tools::Rectangle&                             rBounds,
                              unsigned int                                   nStepCount,
                              bool                                           bFillNonOverlapping )
         {
@@ -563,7 +563,7 @@ namespace vclcanvas
 
             // determine maximal bound rect of texture-filled
             // polygon
-            const ::Rectangle aPolygonDeviceRectOrig(
+            const ::tools::Rectangle aPolygonDeviceRectOrig(
                 rPoly.GetBoundRect() );
 
             if( tools::isRectangle( rPoly ) )
@@ -734,7 +734,7 @@ namespace vclcanvas
 
                 // determine maximal bound rect of texture-filled
                 // polygon
-                const ::Rectangle aPolygonDeviceRect(
+                const ::tools::Rectangle aPolygonDeviceRect(
                     aPolyPoly.GetBoundRect() );
 
 
@@ -760,7 +760,7 @@ namespace vclcanvas
                                                             aRect,
                                                             aTotalTransform );
 
-                const ::Rectangle aIntegerTextureDeviceRect(
+                const ::tools::Rectangle aIntegerTextureDeviceRect(
                     vcl::unotools::rectangleFromB2DRectangle( aTextureDeviceRect ) );
 
                 if( bRectangularPolygon &&
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index b8ea28bad033..59efaa6deff8 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -36,7 +36,7 @@
 
 using namespace ::com::sun::star;
 
-#define FPS_BOUNDS Rectangle(0,0,130,90)
+#define FPS_BOUNDS ::tools::Rectangle(0,0,130,90)
 #define INFO_COLOR COL_RED
 
 namespace vclcanvas
@@ -79,7 +79,7 @@ namespace vclcanvas
                                      OutputDevice&                      rOutDev,
                                      const ::basegfx::B2IRange&         rArea )
         {
-            const Rectangle& rRequestedArea(
+            const ::tools::Rectangle& rRequestedArea(
                 vcl::unotools::rectangleFromB2IRectangle( rArea ) );
 
             // clip output to actual update region (otherwise a)
@@ -222,7 +222,7 @@ namespace vclcanvas
             // clips. besides that, will interfere with animations (as for
             // Window-invalidate repaints, only parts of the window will
             // be redrawn otherwise)
-            const vcl::Region aFullWindowRegion( Rectangle(aEmptyPoint,
+            const vcl::Region aFullWindowRegion( ::tools::Rectangle(aEmptyPoint,
                                                       aOutDevSize) );
             pTargetWindow->ExpandPaintClipRegion(aFullWindowRegion);
         }
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 3a283d2e48bf..832f48bac59d 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -650,7 +650,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
         awt::Rectangle aLogicRect( pExplicitValueProvider->getRectangleOfObject( m_aAccInfo.m_aOID.getObjectCID() ));
         if( pWindow )
         {
-            Rectangle aRect( aLogicRect.X, aLogicRect.Y,
+            tools::Rectangle aRect( aLogicRect.X, aLogicRect.Y,
                              aLogicRect.X + aLogicRect.Width,
                              aLogicRect.Y + aLogicRect.Height );
             SolarMutexGuard aSolarGuard;
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 22dff81d646a..6e7a3abc10c3 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -40,9 +40,9 @@ AccessibleViewForwarder::~AccessibleViewForwarder()
 
 // ________ IAccessibleViewforwarder ________
 
-Rectangle AccessibleViewForwarder::GetVisibleArea() const
+tools::Rectangle AccessibleViewForwarder::GetVisibleArea() const
 {
-    Rectangle aVisibleArea;
+    tools::Rectangle aVisibleArea;
     if ( m_pWindow )
     {
         aVisibleArea.SetPos( Point( 0, 0 ) );
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
index b1fbeb6ce756..7aa21fe600d1 100644
--- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
+++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx
@@ -37,7 +37,7 @@ public:
     virtual ~AccessibleViewForwarder() override;
 
     // ________ IAccessibleViewforwarder ________
-    virtual Rectangle GetVisibleArea() const override;
+    virtual tools::Rectangle GetVisibleArea() const override;
     virtual Point LogicToPixel( const Point& rPoint ) const override;
     virtual Size LogicToPixel( const Size& rSize ) const override;
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0d9b6d983afb..1661e0aa1365 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1021,7 +1021,7 @@ void DataBrowser::SetCursorMovedHdl( const Link<DataBrowser*,void>& rLink )
 
 // implementations for ::svt::EditBrowseBox (pure virtual methods)
 void DataBrowser::PaintCell(
-    OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
+    OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const
 {
     Point aPos( rRect.TopLeft());
     aPos.X() += 1;
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 8eb8fbac53af..0be7b531cafe 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -50,7 +50,7 @@ class DataBrowser : public ::svt::EditBrowseBox
 {
 protected:
     // EditBrowseBox overridables
-    virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const override;
+    virtual void PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
     virtual bool SeekRow( long nRow ) override;
     virtual bool IsTabAllowed( bool bForward ) const override;
     virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override;
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index a41830d2063f..5ca2b85758b3 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -281,7 +281,7 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN
         if( m_pDialog )
         {
             m_pDialog->SetPosPixel( Point(0,0) );
-            Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
+            tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
 
             Point aNewOuterPos = Point( aPos.X - aRect.Left(), aPos.Y - aRect.Top() );
             m_pDialog->SetPosPixel( aNewOuterPos );
@@ -311,7 +311,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
         createDialogOnDemand();
         if( m_pDialog )
         {
-            Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
+            tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
             awt::Point aPoint(aRect.Left(),aRect.Top());
             aRet <<= aPoint;
         }
@@ -324,7 +324,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
         createDialogOnDemand();
         if( m_pDialog )
         {
-            Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
+            tools::Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
             awt::Size aSize(aRect.GetWidth(),aRect.GetHeight());
             aRet <<= aSize;
         }
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 11939212e5cd..47932bb49d82 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -147,7 +147,7 @@ void DrawViewWrapper::ReInit()
     this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
 
     //a correct work area is at least necessary for correct values in the position and  size dialog
-    Rectangle aRect(Point(0,0), aOutputSize);
+    tools::Rectangle aRect(Point(0,0), aOutputSize);
     this->SetWorkArea(aRect);
 
     this->ShowSdrPage(this->GetModel()->GetPage(0));
@@ -306,7 +306,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt )
 {
     if(pObj)
     {
-        Rectangle aRect(pObj->GetCurrentBoundRect());
+        tools::Rectangle aRect(pObj->GetCurrentBoundRect());
         return aRect.IsInside(rPnt);
     }
     return false;
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index 02a3468365b2..ae579cf14b3d 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -281,7 +281,7 @@ public:
 
     // WindowController stuff
     void PrePaint(vcl::RenderContext& rRenderContext);
-    void execute_Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+    void execute_Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
     void execute_MouseButtonDown( const MouseEvent& rMEvt );
     void execute_MouseMove( const MouseEvent& rMEvt );
     void execute_MouseButtonUp( const MouseEvent& rMEvt );
diff --git a/chart2/source/controller/inc/ChartWindow.hxx b/chart2/source/controller/inc/ChartWindow.hxx
index 5a407fdac85c..95a029698e9c 100644
--- a/chart2/source/controller/inc/ChartWindow.hxx
+++ b/chart2/source/controller/inc/ChartWindow.hxx
@@ -39,7 +39,7 @@ public:
 
     //from base class Window:
     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 MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void MouseMove( const MouseEvent& rMEvt ) override;
     virtual void Tracking( const TrackingEvent& rTEvt ) override;
@@ -56,7 +56,7 @@ public:
 
     void ForceInvalidate();
     virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
-    virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
+    virtual void Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
     virtual void Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags = InvalidateFlags::NONE ) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 502c649ab6bd..2b049ab616b1 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -255,7 +255,7 @@ void ChartController::executeDispatch_Paste()
         Graphic aGraphic;
         // paste location: center of window
         Point aPos;
-        aPos = pChartWindow->PixelToLogic( Rectangle( aPos, pChartWindow->GetSizePixel()).Center());
+        aPos = pChartWindow->PixelToLogic( tools::Rectangle( aPos, pChartWindow->GetSizePixel()).Center());
 
         // handle different formats
         TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pChartWindow ));
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index dd08a7ef99c1..11dd2d832ab4 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -262,7 +262,7 @@ void SAL_CALL ChartController::setPosSize(
         //a correct work area is at least necessary for correct values in the position and  size dialog and for dragging area
         if(m_pDrawViewWrapper)
         {
-            Rectangle aRect(Point(0,0), pChartWindow->GetOutputSize());
+            tools::Rectangle aRect(Point(0,0), pChartWindow->GetOutputSize());
             m_pDrawViewWrapper->SetWorkArea( aRect );
         }
         pChartWindow->Invalidate();
@@ -440,7 +440,7 @@ void ChartController::PrePaint(vcl::RenderContext& /*rRenderContext*/)
     }
 }
 
-void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     try
     {
@@ -792,9 +792,9 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
                     SdrObject* pObj = pDrawViewWrapper->getSelectedObject();
                     if( pObj )
                     {
-                        Rectangle aObjectRect = pObj->GetSnapRect();
+                        tools::Rectangle aObjectRect = pObj->GetSnapRect();
                         awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
-                        Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
+                        tools::Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
 
                         const E3dObject* pE3dObject = dynamic_cast< const E3dObject*>( pObj );
                         if( pE3dObject )
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index b8c602b308be..4ffb92fde111 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -32,9 +32,9 @@ using namespace ::com::sun::star;
 
 namespace
 {
-::Rectangle lcl_AWTRectToVCLRect( const css::awt::Rectangle & rAWTRect )
+::tools::Rectangle lcl_AWTRectToVCLRect( const css::awt::Rectangle & rAWTRect )
 {
-    ::Rectangle aResult;
+    ::tools::Rectangle aResult;
     aResult.setX( rAWTRect.X );
     aResult.setY( rAWTRect.Y );
     aResult.setWidth( rAWTRect.Width );
@@ -106,7 +106,7 @@ void ChartWindow::PrePaint(vcl::RenderContext& rRenderContext)
     }
 }
 
-void ChartWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ChartWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     m_bInPaint = true;
     if (m_pOpenGLWindow && m_pOpenGLWindow->IsVisible())
@@ -280,7 +280,7 @@ void ChartWindow::Invalidate( InvalidateFlags nFlags )
         m_pOpenGLWindow->Invalidate( nFlags );
     }
 }
-void ChartWindow::Invalidate( const Rectangle& rRect, InvalidateFlags nFlags )
+void ChartWindow::Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags )
 {
     if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts"
         return;
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index f89ab3682816..286078ebfcc7 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -55,7 +55,7 @@ public:
 private:
     E3dScene*   m_pScene;
 
-    Rectangle   m_aReferenceRect;
+    tools::Rectangle   m_aReferenceRect;
     Point       m_aStartPos;
     basegfx::B3DPolyPolygon m_aWireframePolyPolygon;
 
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 9519df44556c..22f3bb95ad29 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -444,11 +444,11 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
                 long nDefaultObjectSizeWidth = 4000;
                 long nDefaultObjectSizeHeight = 2500;
                 Size aObjectSize( nDefaultObjectSizeWidth, nDefaultObjectSizeHeight );
-                Rectangle aPageRect( Rectangle( Point( 0, 0 ), pPage->GetSize() ) );
+                tools::Rectangle aPageRect( tools::Rectangle( Point( 0, 0 ), pPage->GetSize() ) );
                 Point aObjectPos = aPageRect.Center();
                 aObjectPos.X() -= aObjectSize.Width() / 2;
                 aObjectPos.Y() -= aObjectSize.Height() / 2;
-                Rectangle aRect( aObjectPos, aObjectSize );
+                tools::Rectangle aRect( aObjectPos, aObjectSize );
 
                 switch ( nID )
                 {
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 6280ecb2be56..076789eaa0ca 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -43,8 +43,8 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
 {
     if(!xObjectProp.is())
         return false;
-    Rectangle aObjectRect( Point(rNewPositionAndSize.X,rNewPositionAndSize.Y), Size(rNewPositionAndSize.Width,rNewPositionAndSize.Height) );
-    Rectangle aPageRect( Point(rPageRectangle.X,rPageRectangle.Y), Size(rPageRectangle.Width,rPageRectangle.Height) );
+    tools::Rectangle aObjectRect( Point(rNewPositionAndSize.X,rNewPositionAndSize.Y), Size(rNewPositionAndSize.Width,rNewPositionAndSize.Height) );
+    tools::Rectangle aPageRect( Point(rPageRectangle.X,rPageRectangle.Y), Size(rPageRectangle.Width,rPageRectangle.Height) );
 
     if( OBJECTTYPE_TITLE==eObjectType )
     {
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 1e0f0d48d437..2053ab09eaea 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1963,7 +1963,7 @@ awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool
                 SdrObject* pSdrObject = pShape->GetSdrObject();
                 if( pSdrObject )
                 {
-                    Rectangle aSnapRect( pSdrObject->GetSnapRect() );
+                    tools::Rectangle aSnapRect( pSdrObject->GetSnapRect() );
                     aRet = awt::Rectangle(aSnapRect.Left(),aSnapRect.Top(),aSnapRect.GetWidth(),aSnapRect.GetHeight());
                 }
             }
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 4d7291c03646..b066f39a2d2d 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -786,7 +786,7 @@ DummyText::DummyText(const OUString& rText, const tNameSequence& rNames,
         ScopedVclPtrInstance< VirtualDevice > pDevice(*Application::GetDefaultDevice(),
                                                       DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
         pDevice->Erase();
-        Rectangle aRect;
+        tools::Rectangle aRect;
         pDevice->SetFont(aFont);
         pDevice->GetTextBoundRect(aRect, rText);
         int screenWidth = (aRect.BottomRight().X());
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index be9656466c69..0b584fad9a85 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -36,7 +36,7 @@
 class GDIMetaFile;
 class VirtualDevice;
 class Gradient;
-class Rectangle;
+namespace tools { class Rectangle; }
 namespace vcl { class Font; }
 namespace tools { class PolyPolygon; }
 class Point;
@@ -215,7 +215,7 @@ static float GetSwapFloat( SvStream& rSt )
                                  const ActionFactoryParameters&     rParms,
                                  bool                               bIntersect );
 
-            static void updateClipping( const ::Rectangle&                 rClipRect,
+            static void updateClipping( const ::tools::Rectangle&                 rClipRect,
                                  const ActionFactoryParameters&     rParms,
                                  bool                               bIntersect );
 
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 2d199cc860ce..1a087fdc63c4 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -80,7 +80,7 @@ namespace cppcanvas
             }
 
             ::basegfx::B2DPolyPolygon                                                clip;
-            ::Rectangle                                                              clipRect;
+            ::tools::Rectangle                                                              clipRect;
             css::uno::Reference< css::rendering::XPolyPolygon2D >                    xClipPoly;
 
             css::uno::Sequence< double >                                             lineColor;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 97f6e01920eb..20142396e4e9 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1060,7 +1060,7 @@ namespace cppcanvas
                                 sal_Int32 aCount;
 
                                 ReadRectangle (rMF, sx, sy, sw, sh);
-                                Rectangle aSource(Point(sx, sy), Size(sw, sh));
+                                ::tools::Rectangle aSource(Point(sx, sy), Size(sw, sh));
 
                                 SAL_INFO("cppcanvas.emf", "EMF+ " << (type == EmfPlusRecordTypeDrawImagePoints ? "DrawImagePoints" : "DrawImage") << " source rectangle: " << sx << "," << sy << " " << sw << "x" << sh);
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index f12efdb10b1b..38b3921eb215 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1121,7 +1121,7 @@ namespace cppcanvas
             }
         }
 
-        void ImplRenderer::updateClipping( const ::Rectangle&             rClipRect,
+        void ImplRenderer::updateClipping( const ::tools::Rectangle&             rClipRect,
                                            const ActionFactoryParameters& rParms,
                                            bool                           bIntersect )
         {
@@ -1297,7 +1297,7 @@ namespace cppcanvas
                                                "region encountered, falling back to bounding box!" );
 
                                 // #121806# explicitly kept integer
-                                Rectangle aClipRect(
+                                ::tools::Rectangle aClipRect(
                                     rVDev.LogicToPixel(
                                         pClipAction->GetRegion().GetBoundRect() ) );
 
@@ -1331,7 +1331,7 @@ namespace cppcanvas
                         MetaISectRectClipRegionAction* pClipAction = static_cast<MetaISectRectClipRegionAction*>(pCurrAct);
 
                         // #121806# explicitly kept integer
-                        Rectangle aClipRect(
+                        ::tools::Rectangle aClipRect(
                             rVDev.LogicToPixel( pClipAction->GetRect() ) );
 
                         // intersect current clip with given rect
@@ -1353,7 +1353,7 @@ namespace cppcanvas
                                            "region encountered, falling back to bounding box!" );
 
                             // #121806# explicitly kept integer
-                            Rectangle aClipRect(
+                            ::tools::Rectangle aClipRect(
                                 rVDev.LogicToPixel( pClipAction->GetRegion().GetBoundRect() ) );
 
                             // intersect current clip with given rect
@@ -1931,7 +1931,7 @@ namespace cppcanvas
 
                     case MetaActionType::RECT:
                     {
-                        const Rectangle& rRect(
+                        const ::tools::Rectangle& rRect(
                             static_cast<MetaRectAction*>(pCurrAct)->GetRect() );
 
                         if( rRect.IsEmpty() )
@@ -1956,7 +1956,7 @@ namespace cppcanvas
 
                     case MetaActionType::ROUNDRECT:
                     {
-                        const Rectangle& rRect(
+                        const ::tools::Rectangle& rRect(
                             static_cast<MetaRoundRectAction*>(pCurrAct)->GetRect());
 
                         if( rRect.IsEmpty() )
@@ -1979,7 +1979,7 @@ namespace cppcanvas
 
                     case MetaActionType::ELLIPSE:
                     {
-                        const Rectangle& rRect(
+                        const ::tools::Rectangle& rRect(
                             static_cast<MetaEllipseAction*>(pCurrAct)->GetRect() );
 
                         if( rRect.IsEmpty() )
@@ -2184,7 +2184,7 @@ namespace cppcanvas
                         // crop bitmap to given source rectangle (no
                         // need to copy and convert the whole bitmap)
                         ::Bitmap aBmp( pAct->GetBitmap() );
-                        const Rectangle aCropRect( pAct->GetSrcPoint(),
+                        const ::tools::Rectangle aCropRect( pAct->GetSrcPoint(),
                                                     pAct->GetSrcSize() );
                         aBmp.Crop( aCropRect );
 
@@ -2267,7 +2267,7 @@ namespace cppcanvas
                         // crop bitmap to given source rectangle (no
                         // need to copy and convert the whole bitmap)
                         BitmapEx aBmp( pAct->GetBitmapEx() );
-                        const Rectangle aCropRect( pAct->GetSrcPoint(),
+                        const ::tools::Rectangle aCropRect( pAct->GetSrcPoint(),
                                                    pAct->GetSrcSize() );
                         aBmp.Crop( aCropRect );
 
@@ -2367,7 +2367,7 @@ namespace cppcanvas
 
                         // crop bitmap to given source rectangle (no
                         // need to copy and convert the whole bitmap)
-                        const Rectangle aCropRect( pAct->GetSrcPoint(),
+                        const ::tools::Rectangle aCropRect( pAct->GetSrcPoint(),
                                                    pAct->GetSrcSize() );
                         aBmp.Crop( aCropRect );
 
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index b6f1fff2876d..a9ceb98c5594 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -161,7 +161,7 @@ namespace cppcanvas
             {
                 // simple rect case
 
-                const ::Rectangle aLocalClipRect( rOutdevState.clipRect );
+                const ::tools::Rectangle aLocalClipRect( rOutdevState.clipRect );
 
                 if( bRotation )
                 {
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 39172a819517..93d36283ed52 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1097,7 +1097,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl, Button*, void)
 IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void )
 {
     // disable help
-    Help::ShowBalloon( this, Point(), Rectangle(), OUString() );
+    Help::ShowBalloon( this, Point(), ::tools::Rectangle(), OUString() );
     if (pListBox == m_pEntriesBox)
     {
         sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0f47c1856b3a..c8410db79857 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1573,7 +1573,7 @@ public:
         long n = 0;
         while (n <= nHalfSize)
         {
-            rRenderContext.DrawRect(Rectangle(nX + n, nY + n, nX + n, nY + nSize - n));
+            rRenderContext.DrawRect(::tools::Rectangle(nX + n, nY + n, nX + n, nY + nSize - n));
             ++n;
         }
 
@@ -4849,7 +4849,7 @@ Image SvxToolbarEntriesListBox::GetSizedImage(
     Point   aPos( nPosX > 0 ? nPosX : 0, nPosY > 0 ? nPosY : 0 );
     rVDev.SetFillColor( aFillColor );
     rVDev.SetLineColor( aFillColor );
-    rVDev.DrawRect( Rectangle( Point(), aNewSize ));
+    rVDev.DrawRect( ::tools::Rectangle( Point(), aNewSize ));
     rVDev.DrawImage( aPos, aImage );
 
     // Draw separator line 2 pixels left from the right border
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 874384694521..0a22e09e8c84 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -122,7 +122,7 @@ void SvxConfigFunctionListBox::MouseMove( const MouseEvent& rMEvt )
         aTimer.Start();
     else
     {
-        Rectangle aRect(GetPosPixel(), GetSizePixel());
+        ::tools::Rectangle aRect(GetPosPixel(), GetSizePixel());
         Help::ShowBalloon( this, aMousePos, aRect, OUString() );
         aTimer.Stop();
     }
@@ -136,7 +136,7 @@ IMPL_LINK_NOARG(SvxConfigFunctionListBox, TimerHdl, Timer *, void)
     SvTreeListEntry *pEntry = GetCurEntry();
     if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry )
     {
-        Rectangle aRect(GetPosPixel(), GetSizePixel());
+        ::tools::Rectangle aRect(GetPosPixel(), GetSizePixel());
         Help::ShowBalloon( this, OutputToScreenPixel(aMousePos), aRect, GetHelpText( pEntry ) );
     }
 }
@@ -173,7 +173,7 @@ OUString SvxConfigFunctionListBox::GetHelpText( SvTreeListEntry *pEntry )
 
 void SvxConfigFunctionListBox::FunctionSelected()
 {
-    Help::ShowBalloon( this, Point(), Rectangle(), OUString() );
+    Help::ShowBalloon( this, Point(), ::tools::Rectangle(), OUString() );
 }
 
 // drag and drop support
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 35308f030af9..9384a76743dd 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -242,7 +242,7 @@ void AboutDialog::Resize()
     }
 }
 
-void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
 {
     rRenderContext.SetClipRegion(vcl::Region(rRect));
 
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 54b1e9d7ee4f..548594aa1f9b 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -153,7 +153,7 @@ class ColorPreviewControl : public Control
 public:
     ColorPreviewControl( vcl::Window* pParent, WinBits nStyle );
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
 
     void SetColor(const Color& rColor);
 
@@ -177,7 +177,7 @@ void ColorPreviewControl::SetColor( const Color& rCol )
     }
 }
 
-void ColorPreviewControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ColorPreviewControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
 {
     rRenderContext.SetFillColor(maColor);
     rRenderContext.SetLineColor(maColor);
@@ -199,7 +199,7 @@ public:
     virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
     virtual void KeyInput( const KeyEvent& rKEvt ) 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 Size GetOptimalSize() const override;
@@ -434,8 +434,8 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate )
     Point aPos = maPosition;
     maPosition.X() = nX - 5;
     maPosition.Y() = nY - 5;
-    Invalidate(Rectangle(aPos, Size(11, 11)));
-    Invalidate(Rectangle(maPosition, Size(11, 11)));
+    Invalidate(::tools::Rectangle(aPos, Size(11, 11)));
+    Invalidate(::tools::Rectangle(maPosition, Size(11, 11)));
 
     if (bUpdate)
     {
@@ -525,7 +525,7 @@ void ColorFieldControl::KeyInput( const KeyEvent& rKEvt )
     Control::KeyInput(rKEvt);
 }
 
-void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
 {
     if (!mpBitmap)
         UpdateBitmap();
@@ -548,7 +548,7 @@ void ColorFieldControl::Paint(vcl::RenderContext& rRenderContext, const Rectangl
 
     rRenderContext.SetFillColor();
 
-    rRenderContext.DrawEllipse(Rectangle(maPosition, Size(11, 11)));
+    rRenderContext.DrawEllipse(::tools::Rectangle(maPosition, Size(11, 11)));
 }
 
 void ColorFieldControl::Resize()
@@ -598,7 +598,7 @@ public:
     virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
     virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
     virtual void KeyInput( const KeyEvent& rKEvt ) 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;
 
     void UpdateBitmap();
@@ -794,7 +794,7 @@ void ColorSliderControl::KeyInput(const KeyEvent& rKEvt)
     Control::KeyInput( rKEvt );
 }
 
-void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
+void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& /*rRect*/)
 {
     if (!mpBitmap)
         UpdateBitmap();
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 5ac0bf270535..a92f99b6d00c 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -181,7 +181,7 @@ SvxShowText::SvxShowText(vcl::Window* pParent)
 
 VCL_BUILDER_FACTORY(SvxShowText)
 
-void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
 {
     rRenderContext.SetFont(maFont);
 
@@ -201,7 +201,7 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
     bool bShrankFont = false;
     vcl::Font aOrigFont(rRenderContext.GetFont());
     Size aFontSize(aOrigFont.GetFontSize());
-    Rectangle aBoundRect;
+    ::tools::Rectangle aBoundRect;
 
     for (long nFontHeight = aFontSize.Height(); nFontHeight > 0; nFontHeight -= 5)
     {
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 60ee026c8fd1..7f499c01a776 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -46,7 +46,7 @@ Size GraphicPreviewWindow::GetOptimalSize() const
 }
 
 
-void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
 {
     Control::Paint(rRenderContext, rRect);
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 9b4eb01f2b61..fb766aba1653 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -101,8 +101,8 @@ namespace svx
         const OUString& getSecondaryText() const { return m_sSecondaryText; }
 
     public:
-        void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
-            Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation );
+        void Paint( OutputDevice& _rDevice, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle,
+            ::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation );
     };
 
     PseudoRubyText::PseudoRubyText()
@@ -118,8 +118,8 @@ namespace svx
     }
 
 
-    void PseudoRubyText::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
-                               Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation )
+    void PseudoRubyText::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle,
+                               ::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation )
     {
         Size aPlaygroundSize(_rRect.GetSize());
 
@@ -129,8 +129,8 @@ namespace svx
         aSmallerFont.SetFontHeight( (long)( 0.8 * aSmallerFont.GetFontHeight() ) );
 
         // let's calculate the size of our two texts
-        Rectangle aPrimaryRect = rRenderContext.GetTextRect( _rRect, m_sPrimaryText, _nTextStyle );
-        Rectangle aSecondaryRect;
+        ::tools::Rectangle aPrimaryRect = rRenderContext.GetTextRect( _rRect, m_sPrimaryText, _nTextStyle );
+        ::tools::Rectangle aSecondaryRect;
         {
             FontSwitch aFontRestore(rRenderContext, aSmallerFont);
             aSecondaryRect = rRenderContext.GetTextRect(_rRect, m_sSecondaryText, _nTextStyle);
@@ -212,7 +212,7 @@ namespace svx
         virtual Size    GetOptimalSize() const override;
 
     protected:
-        virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& _rRect ) override;
+        virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& _rRect ) override;
 
     private:
         PseudoRubyText m_aRubyText;
@@ -229,7 +229,7 @@ namespace svx
     }
 
 
-    void RubyRadioButton::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+    void RubyRadioButton::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
     {
         HideFocus();
 
@@ -239,10 +239,10 @@ namespace svx
         aImageSize.Width() = CalcZoom( aImageSize.Width() ) + 2;   // + 2 because otherwise the radiobuttons
         aImageSize.Height() = CalcZoom( aImageSize.Height() ) + 2; // appear a bit cut from right and top.
 
-        Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() );
+        ::tools::Rectangle aOverallRect( Point( 0, 0 ), GetOutputSizePixel() );
         aOverallRect.Left() += aImageSize.Width() + 4;  // 4 is the separator between the image and the text
         // inflate the rect a little bit (because the VCL radio button does the same)
-        Rectangle aTextRect( aOverallRect );
+        ::tools::Rectangle aTextRect( aOverallRect );
         ++aTextRect.Left(); --aTextRect.Right();
         ++aTextRect.Top(); --aTextRect.Bottom();
 
@@ -269,19 +269,19 @@ namespace svx
             nTextStyle |= DrawTextFlags::Mnemonic;
 
         // paint the ruby text
-        Rectangle aPrimaryTextLocation;
-        Rectangle aSecondaryTextLocation;
+        ::tools::Rectangle aPrimaryTextLocation;
+        ::tools::Rectangle aSecondaryTextLocation;
 
         m_aRubyText.Paint(rRenderContext, aTextRect, nTextStyle, &aPrimaryTextLocation, &aSecondaryTextLocation);
 
         // the focus rectangle is to be painted around both texts
-        Rectangle aCombinedRect(aPrimaryTextLocation);
+        ::tools::Rectangle aCombinedRect(aPrimaryTextLocation);
         aCombinedRect.Union(aSecondaryTextLocation);
         SetFocusRect(aCombinedRect);
 
         // let the base class paint the radio button
         // for this, give it the proper location to paint the image (vertically centered, relative to our text)
-        Rectangle aImageLocation( Point( 0, 0 ), aImageSize );
+        ::tools::Rectangle aImageLocation( Point( 0, 0 ), aImageSize );
         sal_Int32 nTextHeight = aSecondaryTextLocation.Bottom() - aPrimaryTextLocation.Top();
         aImageLocation.Top() = aPrimaryTextLocation.Top() + ( nTextHeight - aImageSize.Height() ) / 2;
         aImageLocation.Bottom() = aImageLocation.Top() + aImageSize.Height();
@@ -306,7 +306,7 @@ namespace svx
     {
         vcl::Font aSmallerFont( GetFont() );
         aSmallerFont.SetFontHeight( static_cast<long>( 0.8 * aSmallerFont.GetFontHeight() ) );
-        Rectangle rect( Point(), Size( SAL_MAX_INT32, SAL_MAX_INT32 ) );
+        ::tools::Rectangle rect( Point(), Size( SAL_MAX_INT32, SAL_MAX_INT32 ) );
 
         Size aPrimarySize = GetTextRect( rect, m_aRubyText.getPrimaryText() ).GetSize();
         Size aSecondarySize;
@@ -343,7 +343,7 @@ namespace svx
     void SuggestionSet::UserDraw( const UserDrawEvent& rUDEvt )
     {
         vcl::RenderContext* pDev = rUDEvt.GetRenderContext();
-        Rectangle aRect = rUDEvt.GetRect();
+        ::tools::Rectangle aRect = rUDEvt.GetRect();
         sal_uInt16  nItemId = rUDEvt.GetItemId();
 
         OUString sText = *static_cast< OUString* >( GetItemData( nItemId ) );
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index ce7009ec76b2..ad50188d1db1 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -92,7 +92,7 @@ Size SvxHlmarkTreeLBox::GetOptimalSize() const
     return LogicToPixel(Size(103, 162), MapUnit::MapAppFont);
 }
 
-void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
 {
     if (!mpParentWnd || mpParentWnd->mnError == LERR_NOERROR)
     {
@@ -102,7 +102,7 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const Rectangl
     {
         Erase(rRenderContext);
 
-        Rectangle aDrawRect(Point( 0, 0 ), GetSizePixel());
+        ::tools::Rectangle aDrawRect(Point( 0, 0 ), GetSizePixel());
 
         OUString aStrMessage;
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 7fefb04ddcb3..6d60d1820df5 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -200,12 +200,12 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
     static_cast<vcl::Window*>(mpMarkWnd)->Show();
 
     // Size of dialog-window in screen pixels
-    Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( nullptr ) );
+    ::tools::Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( nullptr ) );
     Point aDlgPos ( aDlgRect.TopLeft() );
     Size aDlgSize ( mpDialog->GetSizePixel () );
 
     // Absolute size of the screen
-    Rectangle aScreen( mpDialog->GetDesktopRectPixel() );
+    ::tools::Rectangle aScreen( mpDialog->GetDesktopRectPixel() );
 
     // Size of Extrawindow
     Size aExtraWndSize( mpMarkWnd->GetSizePixel () );
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index b2cb31592be7..3d44a8593994 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -255,7 +255,7 @@ void ThesaurusAlternativesCtrl::KeyInput( const KeyEvent& rKEvt )
         SvxCheckListBox::KeyInput( rKEvt );
 }
 
-void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void ThesaurusAlternativesCtrl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect)
 {
     if (!m_pDialog->WordFound())
     {
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index e3b50e1b5377..9ea511c4488b 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -66,7 +66,7 @@ private:
 
 protected:
     virtual bool Close() 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;
 
 public:
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 41382bb45949..8d83798ecdbe 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -50,7 +50,7 @@ public:
     virtual Size    GetOptimalSize() const override;
 
 protected:
-    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) override;
 
 private:
     long            mnY;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 1fdeffc57afb..d4b7b085bb92 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -42,7 +42,7 @@ private:
     double    mfScaleX;
     double    mfScaleY;
 
-    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 Size GetOptimalSize() const override;
 
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index a750bdb26597..2a6fa79a5322 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -35,7 +35,7 @@ class SvxCropExample : public vcl::Window
 public:
     SvxCropExample( vcl::Window* pPar, WinBits nStyle );
 
-    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 Size GetOptimalSize() const override;
 
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index b652f8c24b1b..5a879197b3ed 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -51,7 +51,7 @@ public:
         mpParentWnd = pParent;
     }
 
-    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/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 09a1fc62e5fd..f49f0077e130 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -48,7 +48,7 @@ private:
     void            InitSettings( bool bForeground, bool bBackground );
 
 protected:
-    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect ) override;
     virtual void    StateChanged( StateChangedType nStateChange ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index bb30cbd3d751..b09fd9366c9a 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -51,7 +51,7 @@ class SvxNumberingPreview : 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:
         SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER);
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index aa5f90a7175d..4442250f19cf 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -76,8 +76,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     //'string provider'
     SvxSwFramePosString m_aFramePosString;
 
-    Rectangle           m_aRect; //size of all selected objects
-    Rectangle           m_aWorkArea;
+    ::tools::Rectangle           m_aRect; //size of all selected objects
+    ::tools::Rectangle           m_aWorkArea;
     Point               m_aAnchorPos;
 
     FrmMap* m_pVMap;
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 2a43f980fe52..5e32d0c5630f 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -95,7 +95,7 @@ public:
     AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry );
 
     virtual void    KeyInput( const KeyEvent& rKEvt ) override;
-    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect ) override;
 };
 
 class ReplaceEdit : public Edit
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 514581f9ce8e..642309118778 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -68,7 +68,7 @@ namespace offapp
         virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override;
         virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override;
 
-        virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override;
+        virtual void PaintCell( OutputDevice& rDev, const ::tools::Rectangle& rRect, sal_uInt16 nColId ) const override;
 
         virtual bool SeekRow( long nRow ) override;
         virtual bool SaveModified() override;
@@ -266,7 +266,7 @@ namespace offapp
     }
 
 
-    void DriverListControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const
+    void DriverListControl::PaintCell( OutputDevice& rDev, const ::tools::Rectangle& rRect, sal_uInt16 nColId ) const
     {
         OSL_ENSURE(m_aSeekRow != m_aSettings.end(), "DriverListControl::PaintCell: invalid row!");
 
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 34c8f4ed58de..9471cb6f59d5 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -45,7 +45,7 @@ void SvxDefaultColorOptPage::InsertColorEntry(const XColorEntry& rEntry, sal_Int
 
     VclPtr<VirtualDevice> xDevice = VclPtr<VirtualDevice>::Create();
     xDevice->SetOutputSize(aImageSize);
-    const Rectangle aRect(Point(0, 0), aImageSize);
+    const ::tools::Rectangle aRect(Point(0, 0), aImageSize);
     xDevice->SetFillColor(rColor);
     xDevice->SetLineColor(rStyleSettings.GetDisableColor());
     xDevice->DrawRect(aRect);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index f781f0c7e715..23b9b4cba00b 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -157,7 +157,7 @@ public:
     void            NotifyChange( const Bitmap* pBitmap );
 
 protected:
-    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) override;
+    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect ) override;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual void    Resize() override;
 
@@ -169,7 +169,7 @@ private:
     Bitmap*         pBitmap;
     Point           aDrawPos;
     Size            aDrawSize;
-    Rectangle       aDrawRect;
+    ::tools::Rectangle       aDrawRect;
     sal_uInt8            nTransparency;
 };
 
@@ -282,11 +282,11 @@ void BackgroundPreviewImpl::recalcDrawPos()
 void BackgroundPreviewImpl::Resize()
 {
     Window::Resize();
-    aDrawRect = Rectangle(Point(0,0), GetOutputSizePixel());
+    aDrawRect = ::tools::Rectangle(Point(0,0), GetOutputSizePixel());
     recalcDrawPos();
 }
 
-void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
 {
     const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
     rRenderContext.SetBackground(Wallpaper(rStyleSettings.GetWindowColor()));
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 363c56af80c2..cd4bc8a97ba8 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -779,16 +779,16 @@ Size SvxCropExample::GetOptimalSize() const
 
 VCL_BUILDER_FACTORY_CONSTRUCTOR(SvxCropExample, 0)
 
-void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
 {
     Size aWinSize(rRenderContext.PixelToLogic(GetOutputSizePixel()));
     rRenderContext.SetLineColor();
     rRenderContext.SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
     rRenderContext.SetRasterOp(RasterOp::OverPaint);
-    rRenderContext.DrawRect(Rectangle(Point(), aWinSize));
+    rRenderContext.DrawRect(::tools::Rectangle(Point(), aWinSize));
 
     rRenderContext.SetLineColor(Color(COL_WHITE));
-    Rectangle aRect(Point((aWinSize.Width() - aFrameSize.Width())/2,
+    ::tools::Rectangle aRect(Point((aWinSize.Width() - aFrameSize.Width())/2,
                           (aWinSize.Height() - aFrameSize.Height())/2),
                           aFrameSize);
     aGrf.Draw(&rRenderContext, aRect.TopLeft(), aRect.GetSize());
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9b3e0e580892..d28fdbff8267 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -145,7 +145,7 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr,
 #*
 #************************************************************************/
 
-void SvxNumberPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void SvxNumberPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
 {
     vcl::Font aDrawFont = rRenderContext.GetFont();
     Size aSzWnd(GetOutputSizePixel());
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 063e265ca04f..3da5e1033da7 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2349,7 +2349,7 @@ SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits)
 VCL_BUILDER_FACTORY_ARGS(SvxNumberingPreview, WB_BORDER)
 
 // paint preview of numeration
-void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
+void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& /*rRect*/)
 {
     Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel()));
 
@@ -2521,11 +2521,11 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan
                     nXStart = static_cast<sal_uInt16>(rFmt.GetIndentAt() / nWidthRelation);
                 }
 
-                Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2));
+                ::tools::Rectangle aRect1(Point(nTextXPos, nYStart + nFontHeight / 2), Size(aSize.Width() / 2, 2));
                 pVDev->SetFillColor(aBackColor);
                 pVDev->DrawRect(aRect1);
 
-                Rectangle aRect2(Point(nXStart, nYStart + nLineHeight + nFontHeight / 2 ), Size(aSize.Width() / 2, 2));
+                ::tools::Rectangle aRect2(Point(nXStart, nYStart + nLineHeight + nFontHeight / 2 ), Size(aSize.Width() / 2, 2));
                 pVDev->DrawRect(aRect2);
                 nYStart += 2 * nLineHeight;
             }
@@ -2616,7 +2616,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectan
                     pVDev->SetFillColor( aLineColor );
                     pVDev->SetLineColor( aLineColor );
                 }
-                Rectangle aRect1(Point(nXStart + nTextOffset, nYStart + nTopOffset), Size(nWidth, nRectHeight));
+                ::tools::Rectangle aRect1(Point(nXStart + nTextOffset, nYStart + nTopOffset), Size(nWidth, nRectHeight));
                 pVDev->DrawRect(aRect1);
             }
         }
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index f6f42f4312fd..25870806419f 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -54,7 +54,7 @@ public:
     virtual ~TabWin_Impl() override { disposeOnce(); }
     virtual void dispose() override { mpPage.clear(); vcl::Window::dispose(); }
 
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect) override;
 
     void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; }
     void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; }
@@ -79,7 +79,7 @@ void FillUpWithDefTabs_Impl( long nDefDist, SvxTabStopItem& rTabs )
     }
 }
 
-void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
+void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&)
 {
     // Paint tabulators
     Point aPoint;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index d8916301c142..e990af8fcd2e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -228,7 +228,7 @@ void SvxAngleTabPage::Construct()
     }
 
     { // #i75273#
-        Rectangle aTempRect(pView->GetAllMarkedRect());
+        ::tools::Rectangle aTempRect(pView->GetAllMarkedRect());
         pView->GetSdrPageView()->LogicToPagePos(aTempRect);
         maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
     }
@@ -473,7 +473,7 @@ void SvxSlantTabPage::Construct()
     SetFieldUnit(*m_pMtrRadius, eDlgUnit, true);
 
     { // #i75273#
-        Rectangle aTempRect(pView->GetAllMarkedRect());
+        ::tools::Rectangle aTempRect(pView->GetAllMarkedRect());
         pView->GetSdrPageView()->LogicToPagePos(aTempRect);
         maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
     }
@@ -507,7 +507,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
     if( bModified )
     {
         // set reference points
-        Rectangle aObjectRect(pView->GetAllMarkedRect());
+        ::tools::Rectangle aObjectRect(pView->GetAllMarkedRect());
         pView->GetSdrPageView()->LogicToPagePos(aObjectRect);
         Point aPt = aObjectRect.Center();
 
@@ -536,7 +536,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
         pModel->BegUndo(pUndo->GetComment());
 
     EnhancedCustomShape2d aShape(pObj);
-    Rectangle aLogicRect = aShape.GetLogicRect();
+    ::tools::Rectangle aLogicRect = aShape.GetLogicRect();
 
     for (int i = 0; i < 2; ++i)
     {
@@ -651,7 +651,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
                 Point aMinPosition;
                 aShape.GetHandlePosition(i, aMinPosition);
 
-                Rectangle aLogicRect = aShape.GetLogicRect();
+                ::tools::Rectangle aLogicRect = aShape.GetLogicRect();
                 aInitialPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
                 aMaxPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
                 aMinPosition.Move(-aLogicRect.Left(), -aLogicRect.Top());
@@ -697,7 +697,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
 
     if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) )
     {
-        const Rectangle aTempRect(pRectItem->GetValue());
+        const ::tools::Rectangle aTempRect(pRectItem->GetValue());
         maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
     }
 }
@@ -829,13 +829,13 @@ void SvxPositionSizeTabPage::Construct()
     }
 
     { // #i75273#
-        Rectangle aTempRect(mpView->GetAllMarkedRect());
+        ::tools::Rectangle aTempRect(mpView->GetAllMarkedRect());
         mpView->GetSdrPageView()->LogicToPagePos(aTempRect);
         maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
     }
 
     { // #i75273#
-        Rectangle aTempRect(mpView->GetWorkArea());
+        ::tools::Rectangle aTempRect(mpView->GetWorkArea());
         mpView->GetSdrPageView()->LogicToPagePos(aTempRect);
         maWorkRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
     }
@@ -930,7 +930,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs )
             double fY((GetCoreValue( *m_pMtrPosY, mePoolUnit ) + maAnchor.getY()) * fUIScale);
 
             { // #i75273#
-                Rectangle aTempRect(mpView->GetAllMarkedRect());
+                ::tools::Rectangle aTempRect(mpView->GetAllMarkedRect());
                 mpView->GetSdrPageView()->LogicToPagePos(aTempRect);
                 maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
             }
@@ -1149,7 +1149,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
     if( SfxItemState::SET == rSet.GetItemState( GetWhich( SID_ATTR_TRANSFORM_INTERN ) , false, reinterpret_cast<SfxPoolItem const **>(&pRectItem) ) )
     {
         { // #i75273#
-            const Rectangle aTempRect(pRectItem->GetValue());
+            const ::tools::Rectangle aTempRect(pRectItem->GetValue());
             maRange = basegfx::B2DRange(aTempRect.Left(), aTempRect.Top(), aTempRect.Right(), aTempRect.Bottom());
         }
 
@@ -1166,7 +1166,7 @@ DeactivateRC SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
         double fY((double)m_pMtrPosY->GetValue());
 
         GetTopLeftPosition(fX, fY, maRange);
-        const Rectangle aOutRectangle(
+        const ::tools::Rectangle aOutRectangle(
             basegfx::fround(fX), basegfx::fround(fY),
             basegfx::fround(fX + maRange.getWidth()), basegfx::fround(fY + maRange.getHeight()));
         _pSet->Put(SfxRectangleItem(SID_ATTR_TRANSFORM_INTERN, aOutRectangle));
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 240b9fac5274..c53476d3b72f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1262,7 +1262,7 @@ OPreviewWindow::OPreviewWindow(vcl::Window* _pParent)
     ImplInitSettings();
 }
 
-bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
+bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const
 {
     const Size aWinSize( GetOutputSizePixel() );
     Size       aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
@@ -1288,14 +1288,14 @@ bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
         const Point aNewPos( ( aWinSize.Width()  - aNewSize.Width() ) >> 1,
                              ( aWinSize.Height() - aNewSize.Height() ) >> 1 );
 
-        rResultRect = Rectangle( aNewPos, aNewSize );
+        rResultRect = tools::Rectangle( aNewPos, aNewSize );
         bRet = true;
     }
 
     return bRet;
 }
 
-void OPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void OPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     Window::Paint(rRenderContext, rRect);
 
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 09091df09989..0041f6c636d2 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -50,7 +50,7 @@ namespace dbaui
     class OPreviewWindow : public vcl::Window
     {
         GraphicObject       m_aGraphicObj;
-        Rectangle           m_aPreviewRect;
+        tools::Rectangle           m_aPreviewRect;
 
         /** gets the graphic center rect
             @param  rGraphic
@@ -61,7 +61,7 @@ namespace dbaui
             @return
                 <TRUE/> when successful
         */
-        bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+        bool ImplGetGraphicCenterRect( const Graphic& rGraphic, tools::Rectangle& rResultRect ) const;
         void ImplInitSettings();
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
@@ -69,7 +69,7 @@ namespace dbaui
         explicit OPreviewWindow(vcl::Window* _pParent);
 
         // Window overrides
-        virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override;
+        virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Rectangle& rRect) override;
 
         void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); }
     };
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 9961e28beb2d..08af0e8e7fd4 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -84,7 +84,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
     EnableEntryMnemonics();
 }
 
-void OCreationList::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect )
+void OCreationList::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect )
 {
     SetBackground();
 
@@ -148,9 +148,9 @@ void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const
         onSelected( pEntry );
 }
 
-Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
+tools::Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
 {
-    Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine );
+    tools::Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine );
     aRect.Left() = 0;
 
     // try to let the focus rect start before the bitmap item - this looks better
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 31ab9c7bf89b..c9b14279c90c 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -61,7 +61,7 @@ namespace dbaui
         virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
         virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
         virtual void KeyInput( const KeyEvent& rKEvt ) override;
-        virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+        virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
         virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ) override;
         virtual void GetFocus() override;
         virtual void LoseFocus() override;
@@ -72,7 +72,7 @@ namespace dbaui
 
     protected:
         virtual void        PreparePaint(vcl::RenderContext& rRenderContext, SvTreeListEntry& rEntry) override;
-        virtual Rectangle   GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) override;
+        virtual tools::Rectangle   GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) override;
         virtual void        ModelHasCleared() override;
 
         // IMnemonicEntryList
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index ac2b9f195909..2ba5b8f2ef74 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -57,7 +57,7 @@ namespace dbaui
 
         sal_Int32                GetEntryCount() const { return m_aIconControl->GetEntryCount(); }
         SvxIconChoiceCtrlEntry*  GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); }
-        Rectangle                GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); }
+        tools::Rectangle                GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); }
 
         /** automatically creates mnemonics for the icon/texts in our left hand side panel
         */
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index f8831c38ef4b..389a1bb5d628 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -240,7 +240,7 @@ void OApplicationView::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-void OApplicationView::resizeDocumentView(Rectangle& _rPlayground)
+void OApplicationView::resizeDocumentView(tools::Rectangle& _rPlayground)
 {
     if ( m_pWin && !_rPlayground.IsEmpty() )
     {
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 289f8c59af38..cc34525ae665 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -91,7 +91,7 @@ namespace dbaui
     protected:
 
         // return the Rectangle where I can paint myself
-        virtual void resizeDocumentView(Rectangle& rRect) override;
+        virtual void resizeDocumentView(tools::Rectangle& rRect) override;
 
         // OEventListenerAdapter
         virtual void _disposing( const css::lang::EventObject& _rSource ) override;
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index f40bcf13f009..fee1b1ab6932 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -186,7 +186,7 @@ void UnoDataBrowserView::hideStatus()
     Update();
 }
 
-void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
+void UnoDataBrowserView::resizeDocumentView(tools::Rectangle& _rPlayground)
 {
     Point   aSplitPos;
     Size    aSplitSize;
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 206d529d071f..e9db894c50e4 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -71,11 +71,11 @@ namespace dbaui
         vcl::Window::dispose();
     }
 
-    void ODataView::resizeDocumentView( Rectangle& /*_rPlayground*/ )
+    void ODataView::resizeDocumentView( tools::Rectangle& /*_rPlayground*/ )
     {
     }
 
-    void ODataView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect)
+    void ODataView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect)
     {
         // draw the background
         {
@@ -90,9 +90,9 @@ namespace dbaui
         Window::Paint(rRenderContext, _rRect);
     }
 
-    void ODataView::resizeAll( const Rectangle& _rPlayground )
+    void ODataView::resizeAll( const tools::Rectangle& _rPlayground )
     {
-        Rectangle aPlayground( _rPlayground );
+        tools::Rectangle aPlayground( _rPlayground );
 
         // position the separator
         const Size aSeparatorSize( aPlayground.GetWidth(), 2 );
@@ -106,7 +106,7 @@ namespace dbaui
     void ODataView::Resize()
     {
         Window::Resize();
-        resizeAll( Rectangle( Point( 0, 0), GetSizePixel() ) );
+        resizeAll( tools::Rectangle( Point( 0, 0), GetSizePixel() ) );
     }
     bool ODataView::PreNotify( NotifyEvent& _rNEvt )
     {
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 41832fcd5992..bd8dbae2c479 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -597,7 +597,7 @@ void SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMouseP
     bool bResizingCol = false;
     if (HEADERBAR_ITEM_NOTFOUND != nId)
     {
-        Rectangle aColRect = GetItemRect(nId);
+        tools::Rectangle aColRect = GetItemRect(nId);
         aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing
         aColRect.Right() -= 3;
         bResizingCol = !aColRect.IsInside(_rMousePos);
@@ -1265,7 +1265,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
             // no valid cell under the mouse cursor
             break;
 
-        Rectangle aRect = GetCellRect(nRow, nCol, false);
+        tools::Rectangle aRect = GetCellRect(nRow, nCol, false);
         if (!aRect.IsInside(rEvt.maPosPixel))
             // not dropped within a cell (a cell isn't as wide as the column - the are small spaces)
             break;
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index f996db591258..39ada9ecf47e 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -112,7 +112,7 @@ namespace dbaui
         using ORelationControl_Base::Init;
         virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override;
         virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override;
-        virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override;
+        virtual void PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId ) const override;
         virtual bool SeekRow( long nRow ) override;
         virtual bool SaveModified() override;
         virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const override;
@@ -335,7 +335,7 @@ namespace dbaui
         return true;
     }
 
-    void ORelationControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
+    void ORelationControl::PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const
     {
         OUString aText = GetCellText( m_nDataPos, nColumnId );
 
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx
index 03bcdcb879a7..fb3ae70035c5 100644
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ b/dbaccess/source/ui/control/ScrollHelper.cxx
@@ -34,7 +34,7 @@ namespace dbaui
     void OScrollHelper::scroll(const Point& _rPoint, const Size& _rOutputSize)
     {
         // Scrolling Areas
-        Rectangle aScrollArea( Point(0, _rOutputSize.Height() - LISTBOX_SCROLLING_AREA),
+        tools::Rectangle aScrollArea( Point(0, _rOutputSize.Height() - LISTBOX_SCROLLING_AREA),
                                      Size(_rOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
 
         // if pointer in bottom area begin scroll
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 58de1f22855a..1e07be29d9ea 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -386,7 +386,7 @@ bool OTableGrantControl::SeekRow( long nRow )
     return (nRow <= m_aTableNames.getLength());
 }
 
-void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
+void OTableGrantControl::PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const
 {
 
     if(nColumnId != COL_TABLE_NAME)
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 57a61ecbcb8e..72d93564842f 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -134,7 +134,7 @@ void OSplitterView::Resize()
 
         //set the size of the splitter
         m_pSplitter->SetPosSizePixel( aSplitPos, Size( aPlaygroundSize.Width(), aSplitSize.Height() ) );
-        m_pSplitter->SetDragRectPixel( Rectangle(aPlaygroundPos,aPlaygroundSize) );
+        m_pSplitter->SetDragRectPixel( tools::Rectangle(aPlaygroundPos,aPlaygroundSize) );
     }
 
     if ( m_pRight )
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index dc6537b4c3c6..27036b7125c9 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -295,7 +295,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt )
             if ( m_pActionListener->requestQuickHelp( pEntry, sQuickHelpText ) )
             {
                 Size aSize( GetOutputSizePixel().Width(), GetEntryHeight() );
-                Rectangle aScreenRect( OutputToScreenPixel( GetEntryPosition( pEntry ) ), aSize );
+                tools::Rectangle aScreenRect( OutputToScreenPixel( GetEntryPosition( pEntry ) ), aSize );
 
                 Help::ShowQuickHelp( this, aScreenRect,
                                      sQuickHelpText, QuickHelpFlags::Left | QuickHelpFlags::VCenter );
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 9bcd358b30a9..5f4abcd8261c 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -46,7 +46,7 @@ void OMarkableTreeListBox::dispose()
     DBTreeListBox::dispose();
 }
 
-void OMarkableTreeListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect)
+void OMarkableTreeListBox::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect)
 {
     if (!IsEnabled())
     {
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 207e017ad06b..661f6813f4a3 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -240,8 +240,8 @@ namespace dbaui
         sal_Int32 nItemIndex = LISTBOX_ENTRY_NOTFOUND;
         if ( GetIndexForPoint( aRequestPos, nItemIndex ) != -1 )
         {
-            Rectangle aItemRect( GetBoundingRectangle( nItemIndex ) );
-            aItemRect = Rectangle(
+            tools::Rectangle aItemRect( GetBoundingRectangle( nItemIndex ) );
+            aItemRect = tools::Rectangle(
                 OutputToScreenPixel( aItemRect.TopLeft() ),
                 OutputToScreenPixel( aItemRect.BottomRight() ) );
             OUString sHelpText = impl_getDocumentAtIndex( nItemIndex, true ).first;
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index a7e0ec20ab8c..dfad2d52b031 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -113,7 +113,7 @@ namespace dbaui
         return true;
     }
 
-    void IndexFieldsControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const
+    void IndexFieldsControl::PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect, sal_uInt16 _nColumnId ) const
     {
         Point aPos(_rRect.TopLeft());
         aPos.X() += 1;
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 8cd2ee05a6c8..56bed0d40fcd 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -462,7 +462,7 @@ void OSQLMessageBox::impl_positionControls()
     m_aTitle->SetText( sPrimary );
     m_aTitle->Show();
 
-    Rectangle aPrimaryRect( m_aTitle->GetPosPixel(), m_aTitle->GetSizePixel() );
+    tools::Rectangle aPrimaryRect( m_aTitle->GetPosPixel(), m_aTitle->GetSizePixel() );
 
     // secondary text (if applicable)
     m_aMessage->SetStyle( m_aMessage->GetStyle() | WB_NOLABEL );
@@ -470,7 +470,7 @@ void OSQLMessageBox::impl_positionControls()
     m_aMessage->SetText( sSecondary );
 
     lcl_positionInAppFont( *this, *m_aMessage.get(), TEXT_POS_X, OUTER_MARGIN + 16 + 3, DIALOG_WIDTH - TEXT_POS_X - 2 * OUTER_MARGIN, 8 );
-    Rectangle aSecondaryRect( m_aMessage->GetPosPixel(), m_aMessage->GetSizePixel() );
+    tools::Rectangle aSecondaryRect( m_aMessage->GetPosPixel(), m_aMessage->GetSizePixel() );
 
     bool bHaveSecondaryText = !sSecondary.isEmpty();
 
@@ -487,13 +487,13 @@ void OSQLMessageBox::impl_positionControls()
     // if there's no secondary text ...
     if ( !bHaveSecondaryText )
     {   // then give the primary text as much horizontal space as it needs
-        Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sPrimary, DrawTextFlags::WordBreak | DrawTextFlags::MultiLine | DrawTextFlags::Center ) );
+        tools::Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sPrimary, DrawTextFlags::WordBreak | DrawTextFlags::MultiLine | DrawTextFlags::Center ) );
         aPrimaryRect.Right() = aPrimaryRect.Left() + aSuggestedRect.GetWidth();
         aPrimaryRect.Bottom() = aPrimaryRect.Top() + aSuggestedRect.GetHeight();
         // and center it horizontally
         m_aTitle->SetStyle( ( m_aTitle->GetStyle() & ~WB_LEFT ) | WB_CENTER );
 
-        Rectangle aInfoRect( m_aInfoImage->GetPosPixel(), m_aInfoImage->GetSizePixel() );
+        tools::Rectangle aInfoRect( m_aInfoImage->GetPosPixel(), m_aInfoImage->GetSizePixel() );
         // also, if it's not as high as the image ...
         if ( aPrimaryRect.GetHeight() < m_aInfoImage->GetSizePixel().Height() )
         {   // ... make it fit the image height
@@ -511,7 +511,7 @@ void OSQLMessageBox::impl_positionControls()
     }
 
     // adjust dialog size accordingly
-    const Rectangle& rBottomTextRect( bHaveSecondaryText ? aSecondaryRect : aPrimaryRect );
+    const tools::Rectangle& rBottomTextRect( bHaveSecondaryText ? aSecondaryRect : aPrimaryRect );
     Size aBorderSize = LogicToPixel( Size( OUTER_MARGIN, OUTER_MARGIN ), MapUnit::MapAppFont );
     Size aDialogSize( LogicToPixel( Size( DIALOG_WIDTH, 30 ), MapUnit::MapAppFont ) );
     aDialogSize.Height() = rBottomTextRect.Bottom() + aBorderSize.Height();
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index 5ad17084e20e..fffbcc79b02c 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.hxx
@@ -52,15 +52,15 @@ namespace dbaui
 
         OConnectionLine& operator=( const OConnectionLine& rLine );
 
-        Rectangle           GetBoundingRect();
+        tools::Rectangle           GetBoundingRect();
         bool                RecalcLine();
         void                Draw( OutputDevice* pOutDev );
         bool                CheckHit( const Point& rMousePos ) const;
 
         bool                IsValid() const;
 
-        Rectangle           GetSourceTextPos() const;
-        Rectangle           GetDestTextPos() const;
+        tools::Rectangle           GetSourceTextPos() const;
+        tools::Rectangle           GetDestTextPos() const;
 
         const OConnectionLineDataRef& GetData() const { return m_pData; }
 
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index 2167cc0a3bcb..c22e549e6116 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -62,7 +62,7 @@ namespace dbaui
         OScrollWindowHelper* getScrollHelper() const { return m_pScrollWindow; }
     protected:
         // return the Rectangle where I can paint myself
-        virtual void resizeDocumentView(Rectangle& rRect) override;
+        virtual void resizeDocumentView(tools::Rectangle& rRect) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 5ecceca3577f..a95dead35eb5 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -88,8 +88,8 @@ namespace dbaui
         std::vector<VclPtr<OTableConnection> >    m_vTableConnection;
 
         Idle                m_aDragScrollIdle;
-        Rectangle           m_aDragRect;
-        Rectangle           m_aSizingRect;
+        tools::Rectangle           m_aDragRect;
+        tools::Rectangle           m_aSizingRect;
         Point               m_aDragOffset;
         Point               m_aScrollOffset;
         Point               m_ptPrevDraggingPos;
@@ -128,7 +128,7 @@ namespace dbaui
         ScrollBar& GetVScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetVScrollBar(); }
         DECL_LINK( ScrollHdl, ScrollBar*, void );
 
-        void DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+        void DrawConnections(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
         void InvalidateConnections();
 
         void BeginChildMove( OTableWindow* pTabWin, const Point& rMousePos );
@@ -270,7 +270,7 @@ namespace dbaui
         virtual void MouseButtonUp( const MouseEvent& rEvt ) override;
         virtual void MouseButtonDown( const MouseEvent& rEvt ) 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 ConnDoubleClicked(VclPtr<OTableConnection>& rConnection);
         void SetDefaultTabWinPosSize( OTableWindow* pTabWin );
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index d6360ca4442b..493ea9296f68 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -144,7 +144,7 @@ namespace dbaui
                                 ,OTableFieldDescRef& aInfo);
     protected:
         // return the Rectangle where I can paint myself
-        virtual void resizeDocumentView(Rectangle& rRect) override;
+        virtual void resizeDocumentView(tools::Rectangle& rRect) override;
         DECL_LINK( SplitHdl, Splitter*, void );
 
     private:
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index e5de1f31d0f0..af2e82ccc50e 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -26,7 +26,7 @@
 #include "TableConnectionData.hxx"
 
 class Point;
-class Rectangle;
+namespace tools { class Rectangle; }
 
 namespace dbaui
 {
@@ -86,12 +86,12 @@ namespace dbaui
             return (_pTable == GetSourceWin() || _pTable == GetDestWin());
         }
 
-        Rectangle   GetBoundingRect() const;
+        tools::Rectangle   GetBoundingRect() const;
 
         const TTableConnectionData::value_type& GetData() const { return m_pData; }
         const std::vector<OConnectionLine*>&  GetConnLineList() const { return m_vConnLine; }
         OJoinTableView*                  GetParent() const { return m_pParent; }
-        virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+        virtual void Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
         using Window::Draw;
         virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
     };
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 0d73d19078f1..6f9dd87af9e7 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -70,7 +70,7 @@ namespace dbaui
     protected:
 
         // return the Rectangle where I can paint myself
-        virtual void resizeDocumentView(Rectangle& rRect) override;
+        virtual void resizeDocumentView(tools::Rectangle& rRect) override;
 
     public:
         OTableDesignView(   vcl::Window* pParent,
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index ddfd05e8c979..ed0fd74deb74 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -86,7 +86,7 @@ protected:
     virtual bool IsTabAllowed(bool bForward) const override;
     virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) override;
     virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) override;
-    virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const override;
+    virtual void PaintCell( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColId ) const override;
     virtual bool SeekRow( long nRow ) override;
     virtual bool SaveModified() override;
     virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const override;
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index 205c5f298ff3..5acc6b872f80 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -83,7 +83,7 @@ namespace dbaui
 
     protected:
         virtual void    Resize() override;
-        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& rEvt ) override;
         virtual void    MouseButtonDown( const MouseEvent& rEvt ) override;
         virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
@@ -172,7 +172,7 @@ namespace dbaui
 
         /** returns the new sizing
         */
-        Rectangle getSizingRect(const Point& _rPos,const Size& _rOutputSize) const;
+        tools::Rectangle getSizingRect(const Point& _rPos,const Size& _rOutputSize) const;
 
         // window override
         virtual void                StateChanged( StateChangedType nStateChange ) override;
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index ad9618f71b0b..5b51cf707a1a 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -84,7 +84,7 @@ namespace dbaui
     protected:
         virtual bool PreNotify( NotifyEvent& rNEvt ) override;
         virtual void GetFocus() override;
-        virtual void resizeDocumentView(Rectangle& rRect) override;
+        virtual void resizeDocumentView(tools::Rectangle& rRect) override;
         virtual void _disposing( const css::lang::EventObject& _rSource ) override;
 
     private:
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 3ddeca497062..0fcfc4d8c0d3 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -72,7 +72,7 @@ namespace dbaui
 
     protected:
         // EditBrowseBox overridables
-        virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const override;
+        virtual void PaintCell( OutputDevice& _rDev, const tools::Rectangle& _rRect, sal_uInt16 _nColumnId ) const override;
         virtual bool SeekRow(long nRow) override;
         virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) override;
         virtual bool IsTabAllowed(bool bForward) const override;
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index d10e461de4a1..c132bd1ec8c3 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -50,7 +50,7 @@ public:
     void SetCheckHandler(const Link<void*,void>& _rHdl) { m_aCheckButtonHandler = _rHdl; }
 
 protected:
-    virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect) override;
+    virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& _rRect) override;
     virtual void checkedButton_noBroadcast(SvTreeListEntry* _pEntry);
 
     SvButtonState   implDetermineState(SvTreeListEntry* _pEntry);
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index c4aa690c4891..9cd55dccdf48 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -93,10 +93,10 @@ namespace dbaui
 
     protected:
         // re-arrange the controls belonging to the document itself
-        virtual void resizeAll( const Rectangle& _rPlayground ) override;
+        virtual void resizeAll( const tools::Rectangle& _rPlayground ) override;
 
         // arrange derived classes controls in the rectangle given
-        virtual void resizeDocumentView(Rectangle& _rPlayground) override;
+        virtual void resizeDocumentView(tools::Rectangle& _rPlayground) override;
     };
     // end of temp classes
 
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index a14d86e50c7d..8745e1c67714 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/