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>

51 files changed, 117 insertions, 117 deletions

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/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -38,21 +38,21 @@ namespace
             @param  _rBase      the base point
             @param  _aVector    the vector which will be added
     */
-    inline Rectangle calcRect(const Point& _rBase,const Point& _aVector)
+    inline tools::Rectangle calcRect(const Point& _rBase,const Point& _aVector)
     {
-        return Rectangle( _rBase - _aVector, _rBase + _aVector );
+        return tools::Rectangle( _rBase - _aVector, _rBase + _aVector );
     }
     /** GetTextPos calculate the rectangle for the connection to be drawn
             @param  _pWin           the table window where to draw it
             @param  _aConnPos       the connection point
             @param  _aDescrLinePos  the description line pos
     */
-    Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos)
+    tools::Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos)
     {
         VclPtr<OTableWindowListBox> pListBox = _pWin ? _pWin->GetListBox() : nullptr;
         OSL_ENSURE(_pWin && pListBox, "OConnectionLine::GetSourceTextPos : invalid call !");
 
-        Rectangle aReturn;
+        tools::Rectangle aReturn;
         if ( pListBox )
         {
             const long nRowHeight = pListBox->GetEntryHeight();
@@ -145,10 +145,10 @@ OConnectionLine& OConnectionLine::operator=( const OConnectionLine& rLine )
     return *this;
 }
 
-Rectangle OConnectionLine::GetBoundingRect()
+tools::Rectangle OConnectionLine::GetBoundingRect()
 {
     // determine surrounding rectangle
-    Rectangle aBoundingRect( Point(0,0), Point(0,0) );
+    tools::Rectangle aBoundingRect( Point(0,0), Point(0,0) );
     if( !IsValid() )
         return aBoundingRect;
 
@@ -186,7 +186,7 @@ Rectangle OConnectionLine::GetBoundingRect()
         aBottomRight.X() += DESCRIPT_LINE_WIDTH;
     }
 
-    aBoundingRect = Rectangle( aTopLeft-Point(2,17), aBottomRight+Point(2,2) );
+    aBoundingRect = tools::Rectangle( aTopLeft-Point(2,17), aBottomRight+Point(2,2) );
 
     return aBoundingRect;
 }
@@ -323,12 +323,12 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const
     return false;
 }
 
-Rectangle OConnectionLine::GetSourceTextPos() const
+tools::Rectangle OConnectionLine::GetSourceTextPos() const
 {
     return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos);
 }
 
-Rectangle OConnectionLine::GetDestTextPos() const
+tools::Rectangle OConnectionLine::GetDestTextPos() const
 {
     return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos);
 }
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 40e54d0b801e..8621f30311f1 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -108,7 +108,7 @@ namespace dbaui
     awt::Rectangle SAL_CALL OConnectionLineAccess::getBounds(  )
     {
         ::osl::MutexGuard aGuard( m_aMutex  );
-        Rectangle aRect(m_pLine ? m_pLine->GetBoundingRect() : Rectangle());
+        tools::Rectangle aRect(m_pLine ? m_pLine->GetBoundingRect() : tools::Rectangle());
         return awt::Rectangle(aRect.getX(),aRect.getY(),aRect.getWidth(),aRect.getHeight());
     }
     awt::Point SAL_CALL OConnectionLineAccess::getLocation(  )
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 81564fb9f9bb..f8573dcec78b 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -86,7 +86,7 @@ void OJoinDesignView::initialize()
 {
 }
 
-void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground)
+void OJoinDesignView::resizeDocumentView(tools::Rectangle& _rPlayground)
 {
     m_pScrollWindow->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() );
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 6f383c341841..0c8fedfc97f9 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -531,7 +531,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
         aNewPos.Y() = (nRow+1) * TABWIN_SPACING_Y;
 
         // determine rectangle for the corresponding line
-        Rectangle aRowRect( Point(0,0), aOutSize );
+        tools::Rectangle aRowRect( Point(0,0), aOutSize );
         aRowRect.Top() = nRow * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD );
         aRowRect.Bottom() = (nRow+1) * ( TABWIN_SPACING_Y + TABWIN_HEIGHT_STD );
 
@@ -541,7 +541,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
         for(;aIter != aEnd;++aIter)
         {
             OTableWindow* pOtherTabWin = aIter->second;
-            Rectangle aOtherTabWinRect( pOtherTabWin->GetPosPixel(), pOtherTabWin->GetSizePixel() );
+            tools::Rectangle aOtherTabWinRect( pOtherTabWin->GetPosPixel(), pOtherTabWin->GetSizePixel() );
 
             if(
                 ( (aOtherTabWinRect.Top()>aRowRect.Top()) && (aOtherTabWinRect.Top()<aRowRect.Bottom()) ) ||
@@ -933,7 +933,7 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
     }
 }
 
-void OJoinTableView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void OJoinTableView::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     DrawConnections(rRenderContext, rRect);
 }
@@ -945,7 +945,7 @@ void OJoinTableView::InvalidateConnections()
         conn->InvalidateConnection();
 }
 
-void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     // draw Joins
     for(const auto& connection : m_vTableConnection)
@@ -1068,7 +1068,7 @@ void OJoinTableView::ScrollWhileDragging()
     }
 
     // redraw DraggingRect
-    m_aDragRect = Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel());
+    m_aDragRect = tools::Rectangle(m_ptPrevDraggingPos - m_aDragOffset, m_pDragWin->GetSizePixel());
     Update();
     ShowTracking( m_aDragRect, ShowTrackFlags::Small | ShowTrackFlags::TrackWindow );
 }
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index fadd63dcd72e..85acecdb4700 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2526,7 +2526,7 @@ void OQueryDesignView::initialize()
     reset();
 }
 
-void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground)
+void OQueryDesignView::resizeDocumentView(tools::Rectangle& _rPlayground)
 {
     Point aPlaygroundPos( _rPlayground.TopLeft() );
     Size aPlaygroundSize( _rPlayground.GetSize() );
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 27222c9f7fd3..496ced84a687 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1206,7 +1206,7 @@ bool OSelectionBrowseBox::SeekRow(long nRow)
     return nRow < m_nVisibleCount;
 }
 
-void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
+void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const
 {
     rDev.SetClipRegion(vcl::Region(rRect));
 
@@ -1227,9 +1227,9 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
     rDev.SetClipRegion( );
 }
 
-void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const
+void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const
 {
-    Rectangle aRect(rRect);
+    tools::Rectangle aRect(rRect);
     aRect.TopLeft().Y() -= 2;
     OUString  aLabel(ModuleRes(STR_QUERY_HANDLETEXT));
 
@@ -1262,7 +1262,7 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId)
     InsertDataColumn( _nColumnId , OUString(), DEFAULT_SIZE );
 
     // Neuzeichnen
-    Rectangle aInvalidRect = GetInvalidRect( _nColumnId );
+    tools::Rectangle aInvalidRect = GetInvalidRect( _nColumnId );
     Invalidate( aInvalidRect );
 
     ActivateCell( nCurrentRow, nCurCol );
@@ -1458,13 +1458,13 @@ void OSelectionBrowseBox::SetColWidth(sal_uInt16 nColId, long nNewWidth)
         ActivateCell(GetCurRow(), GetCurColumnId());
 }
 
-Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
+tools::Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
 {
     // The rectangle is the full output area of the window
-    Rectangle aInvalidRect( Point(0,0), GetOutputSizePixel() );
+    tools::Rectangle aInvalidRect( Point(0,0), GetOutputSizePixel() );
 
     // now update the left side
-    Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel
+    tools::Rectangle aFieldRect(GetCellRect( 0, nColId )); // used instead of GetFieldRectPixel
     aInvalidRect.Left() = aFieldRect.Left();
 
     return aInvalidRect;
@@ -1523,7 +1523,7 @@ void OSelectionBrowseBox::InsertColumn(const OTableFieldDescRef& pEntry, sal_uIn
 
     SetColWidth(nColumnId,getDesignView()->getColWidth(GetColumnPos(nColumnId)-1));
     // redraw
-    Rectangle aInvalidRect = GetInvalidRect( nColumnId );
+    tools::Rectangle aInvalidRect = GetInvalidRect( nColumnId );
     Invalidate( aInvalidRect );
 
     ActivateCell( nCurrentRow, nCurCol );
@@ -1916,7 +1916,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                     sal_uInt16 nSelId = GetColumnId(
                         sal::static_int_cast< sal_uInt16 >(
                             FirstSelectedColumn() ) );
-                    ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
+                    ::tools::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
 
                     aMenuPos = aColRect.TopCenter();
                 }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 8fa74e9b6c49..f4cad626d5f7 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -182,8 +182,8 @@ namespace dbaui
     protected:
         virtual bool                SeekRow( long nRow ) override;
 
-        virtual void                PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const override;
-        virtual void                PaintCell(OutputDevice& rDev, const Rectangle& rRect,
+        virtual void                PaintStatusCell(OutputDevice& rDev, const tools::Rectangle& rRect) const override;
+        virtual void                PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect,
                                               sal_uInt16 nColumnId ) const override;
 
         virtual sal_Int8            AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override;
@@ -219,7 +219,7 @@ namespace dbaui
             // rCol contains the Nummer of the first empty column (in pOTableFieldDescList)
 
         void            RemoveField( sal_uInt16 nId );
-        Rectangle       GetInvalidRect( sal_uInt16 nColId );
+        tools::Rectangle       GetInvalidRect( sal_uInt16 nColId );
         long            GetRealRow(long nRow) const;
         long            GetBrowseRow(long nRowId) const;
         bool            GetFunctionName(sal_uInt32 _nFunctionTokenId, OUString& rFkt);
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 606e9f10ba9b..d8c9859f8d0a 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -157,7 +157,7 @@ namespace dbaui
 
     void OTableConnection::InvalidateConnection()
     {
-        Rectangle rcBounding = GetBoundingRect();
+        tools::Rectangle rcBounding = GetBoundingRect();
         rcBounding.Bottom() += 1;
         rcBounding.Right() += 1;
         // I believe Invalidate and Draw(Rectangle) do not behave consistent: in any case it
@@ -167,11 +167,11 @@ namespace dbaui
         m_pParent->Invalidate( rcBounding, InvalidateFlags::NoChildren );
     }
 
-    Rectangle OTableConnection::GetBoundingRect() const
+    tools::Rectangle OTableConnection::GetBoundingRect() const
     {
         // determine all lines of the surrounding rectangle
-        Rectangle aBoundingRect( Point(0,0), Point(0,0) );
-        Rectangle aTempRect;
+        tools::Rectangle aBoundingRect( Point(0,0), Point(0,0) );
+        tools::Rectangle aTempRect;
         std::vector<OConnectionLine*>::const_iterator aEnd = m_vConnLine.end();
         for(std::vector<OConnectionLine*>::const_iterator aIter = m_vConnLine.begin();aIter != aEnd;++aIter)
         {
@@ -190,7 +190,7 @@ namespace dbaui
         return aBoundingRect;
     }
 
-    void OTableConnection::Draw(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
+    void OTableConnection::Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/)
     {
         // Draw line
         for( const auto& pLine : m_vConnLine )
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index aad254bdb8b7..fc18fe0e166a 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -64,7 +64,7 @@ namespace DatabaseObject = css::sdb::application::DatabaseObject;
 
 namespace {
 
-void Draw3DBorder(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void Draw3DBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     // Use the System Style-Settings for my colours
     const StyleSettings& aSystemStyle = Application::GetSettings().GetStyleSettings();
@@ -328,16 +328,16 @@ void OTableWindow::DataChanged(const DataChangedEvent& rDCEvt)
     }
 }
 
-void OTableWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
+void OTableWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
-    Rectangle aRect(Point(0,0), GetOutputSizePixel());
+    tools::Rectangle aRect(Point(0,0), GetOutputSizePixel());
     Window::Paint(rRenderContext, rRect);
     Draw3DBorder(rRenderContext, aRect);
 }
 
-Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSize) const
+tools::Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSize) const
 {
-    Rectangle aSizingRect = Rectangle( GetPosPixel(), GetSizePixel() );
+    tools::Rectangle aSizingRect = tools::Rectangle( GetPosPixel(), GetSizePixel() );
 
     if( m_nSizingFlags & SizingFlags::Top )
     {
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 0a0c98cc3357..1998abcf86c7 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -152,7 +152,7 @@ namespace dbaui
         if(m_pTable && !m_pTable->IsDisposed())
         {
             Point aPoint(_aPoint.X,_aPoint.Y);
-            Rectangle aRect(m_pTable->GetDesktopRectPixel());
+            tools::Rectangle aRect(m_pTable->GetDesktopRectPixel());
             if( aRect.IsInside(aPoint) )
                 aRet = this;
             else if( m_pTable->GetListBox()->GetDesktopRectPixel().IsInside(aPoint))
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index e45cccad0525..82aefa64fa4f 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -233,9 +233,9 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
                 return DND_ACTION_NONE;
 
             // Scrolling Areas
-            Rectangle aBottomScrollArea( Point(0, aOutputSize.Height()-LISTBOX_SCROLLING_AREA),
+            tools::Rectangle aBottomScrollArea( Point(0, aOutputSize.Height()-LISTBOX_SCROLLING_AREA),
                                          Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
-            Rectangle aTopScrollArea( Point(0,0), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
+            tools::Rectangle aTopScrollArea( Point(0,0), Size(aOutputSize.Width(), LISTBOX_SCROLLING_AREA) );
 
              // scroll up if the pointer is on the upper scroll area
             if( aBottomScrollArea.IsInside(m_aMousePos) )
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index ac50e2a5aa75..71faa6c0d282 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -88,7 +88,7 @@ void OTableWindowTitle::RequestHelp( const HelpEvent& rHEvt )
         if( !aHelpText.isEmpty())
         {
             // show help
-            Rectangle aItemRect(Point(0,0),GetSizePixel());
+            tools::Rectangle aItemRect(Point(0,0),GetSizePixel());
             aItemRect = LogicToPixel( aItemRect );
             Point aPt = OutputToScreenPixel( aItemRect.TopLeft() );
             aItemRect.Left()   = aPt.X();
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 2118643b32e5..19912ac849d0 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -88,9 +88,9 @@ namespace dbaui
         return m_pViewSwitch->forceInitialView();
     }
 
-    void OQueryContainerWindow::resizeAll( const Rectangle& _rPlayground )
+    void OQueryContainerWindow::resizeAll( const tools::Rectangle& _rPlayground )
     {
-        Rectangle aPlayground( _rPlayground );
+        tools::Rectangle aPlayground( _rPlayground );
 
         if ( m_pBeamer && m_pBeamer->IsVisible() )
         {
@@ -120,7 +120,7 @@ namespace dbaui
         ODataView::resizeAll( aPlayground );
     }
 
-    void OQueryContainerWindow::resizeDocumentView( Rectangle& _rPlayground )
+    void OQueryContainerWindow::resizeDocumentView( tools::Rectangle& _rPlayground )
     {
         m_pViewSwitch->SetPosSizePixel( _rPlayground.TopLeft(), Size( _rPlayground.GetWidth(), _rPlayground.GetHeight() ) );
 
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index 6b0468508fda..6b4b1ef74649 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -48,7 +48,7 @@ ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTa
     return *this;
 }
 
-void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect )
+void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect )
 {
     OTableConnection::Draw(rRenderContext, rRect);
     ORelationTableConnectionData* pData = static_cast< ORelationTableConnectionData* >(GetData().get());
@@ -56,7 +56,7 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re
         return;
 
     // search lines for top line
-    Rectangle aBoundingRect;
+    tools::Rectangle aBoundingRect;
     long nTop = GetBoundingRect().Bottom();
     long nTemp;
 
@@ -83,8 +83,8 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re
     if (!pTopLine)
         return;
 
-    Rectangle aSourcePos = pTopLine->GetSourceTextPos();
-    Rectangle aDestPos = pTopLine->GetDestTextPos();
+    tools::Rectangle aSourcePos = pTopLine->GetSourceTextPos();
+    tools::Rectangle aDestPos = pTopLine->GetDestTextPos();
 
     OUString aSourceText;
     OUString aDestText;
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
index 02eccc775d15..4684b7c26417 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
@@ -34,7 +34,7 @@ namespace dbaui
 
         ORelationTableConnection& operator=( const ORelationTableConnection& rConn );
 
-        virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
+        virtual void Draw(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
         using OTableConnection::Draw;
     };
 }
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 5895b8376f17..d62b5cbd844c 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -304,7 +304,7 @@ bool OTableEditorCtrl::SeekRow(long _nRow)
     return SetDataPtr(_nRow);
 }
 
-void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
+void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect,
                                    sal_uInt16 nColumnId ) const
 {
     const OUString aText( GetCellText( m_nCurrentPos, nColumnId ));
@@ -1329,13 +1329,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
                     sal_uInt16 nSelId = GetColumnId(
                         sal::static_int_cast< sal_uInt16 >(
                             FirstSelectedColumn() ) );
-                    ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
+                    ::tools::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) );
 
                     aMenuPos = aColRect.TopCenter();
                 }
                 else if ( GetSelectRowCount() > 0 )
                 {
-                    ::Rectangle aColRect( GetFieldRectPixel( FirstSelectedRow(), HANDLE_ID ) );
+                    ::tools::Rectangle aColRect( GetFieldRectPixel( FirstSelectedRow(), HANDLE_ID ) );
 
                     aMenuPos = aColRect.TopCenter();
                 }
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 4eb3426b16b7..28bb1acc977e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -88,7 +88,7 @@ namespace dbaui
     protected:
         virtual void Command( const CommandEvent& rEvt ) override;
         virtual bool SeekRow(long nRow) override;
-        virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect,
+        virtual void PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect,
                                sal_uInt16 nColumnId ) const override;
 
         virtual void CursorMoved() override;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 05b30b82bcf9..ca3b1ffd6660 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -90,7 +90,7 @@ void OTableBorderWindow::Resize()
     // Verschiebebereich Splitter mittleres Drittel des Outputs
     long nDragPosY = nOutputHeight/3;
     long nDragSizeHeight = nOutputHeight/3;
-    m_aHorzSplitter->SetDragRectPixel( Rectangle(Point(0,nDragPosY), Size(nOutputWidth,nDragSizeHeight) ), this );
+    m_aHorzSplitter->SetDragRectPixel( tools::Rectangle(Point(0,nDragPosY), Size(nOutputWidth,nDragSizeHeight) ), this );
     if( (nSplitPos < nDragPosY) || (nSplitPos > (nDragPosY+nDragSizeHeight)) )
         nSplitPos = nDragPosY+nDragSizeHeight-5;
 
@@ -203,7 +203,7 @@ void OTableDesignView::initialize()
     GetEditorCtrl()->DisplayData(0);
 }
 
-void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground)
+void OTableDesignView::resizeDocumentView(tools::Rectangle& _rPlayground)
 {
     m_pWin->SetPosSizePixel( _rPlayground.TopLeft(), _rPlayground.GetSize() );
 
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index d21025f5fd59..cce951ac698b 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -102,7 +102,7 @@ void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr )
     getGenPage()->SaveData( pFieldDescr );
 }
 
-void OTableFieldDescWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
+void OTableFieldDescWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/)
 {
     // 3D-line at the top window border
     const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index c2878e947fc7..addd546728ac 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -50,7 +50,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;
 
     public:
         explicit OTableFieldDescWin( vcl::Window* pParent);