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>

11 files changed, 73 insertions, 73 deletions

diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index d34cb90a5bd1..85ae72dd1f3b 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -310,7 +310,7 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds()
     if( mxCell.is() )
     {
         // Get the cell's bounding box in internal coordinates (in 100th of mm)
-        const ::Rectangle aCellRect( mxCell->getCellRect() );
+        const ::tools::Rectangle aCellRect( mxCell->getCellRect() );
 
         // Transform coordinates from internal to pixel.
         if (maShapeTreeInfo.GetViewForwarder() == nullptr)
@@ -329,9 +329,9 @@ css::awt::Rectangle SAL_CALL AccessibleCell::getBounds()
             int y = aPixelPosition.getY() - aParentLocation.Y;
 
             // Clip with parent (with coordinates relative to itself).
-            ::Rectangle aBBox ( x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
+            ::tools::Rectangle aBBox ( x, y, x + aPixelSize.getWidth(), y + aPixelSize.getHeight());
             awt::Size aParentSize (xParentComponent->getSize());
-            ::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height);
+            ::tools::Rectangle aParentBBox (0,0, aParentSize.Width, aParentSize.Height);
             aBBox = aBBox.GetIntersection (aParentBBox);
             aBoundingBox = awt::Rectangle ( aBBox.getX(), aBBox.getY(), aBBox.getWidth(), aBBox.getHeight());
         }
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index a5637875a821..41601c98be83 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -653,7 +653,7 @@ SfxStyleSheet* Cell::GetStyleSheet() const
         return nullptr;
 }
 
-void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const
+void Cell::TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const
 {
     rAnchorRect.Left() = maCellRect.Left() + GetTextLeftDistance();
     rAnchorRect.Right() = maCellRect.Right() - GetTextRightDistance();
@@ -692,7 +692,7 @@ sal_Int32 Cell::getMinimumHeight()
     SdrTableObj& rTableObj = dynamic_cast< SdrTableObj& >( GetObject() );
     sal_Int32 nMinimumHeight = 0;
 
-    Rectangle aTextRect;
+    tools::Rectangle aTextRect;
     TakeTextAnchorRect( aTextRect );
     Size aSize( aTextRect.GetSize() );
     aSize.Height()=0x0FFFFFFF;
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 9b568c584c11..0d599784335a 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -67,14 +67,14 @@ public:
 
     SVX_DLLPRIVATE void cloneFrom( const CellRef& rCell );
 
-    SVX_DLLPRIVATE void setCellRect( ::Rectangle& rCellRect ) { maCellRect = rCellRect; }
-    SVX_DLLPRIVATE const ::Rectangle& getCellRect() const { return maCellRect; }
-    SVX_DLLPRIVATE ::Rectangle& getCellRect() { return maCellRect; }
+    SVX_DLLPRIVATE void setCellRect( ::tools::Rectangle& rCellRect ) { maCellRect = rCellRect; }
+    SVX_DLLPRIVATE const ::tools::Rectangle& getCellRect() const { return maCellRect; }
+    SVX_DLLPRIVATE ::tools::Rectangle& getCellRect() { return maCellRect; }
 
     OutlinerParaObject* GetEditOutlinerParaObject() const;
     SVX_DLLPRIVATE void SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr );
     SVX_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const override;
-    SVX_DLLPRIVATE void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
+    SVX_DLLPRIVATE void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const;
 
     SVX_DLLPRIVATE virtual const SfxItemSet& GetItemSet() const override;
     SVX_DLLPRIVATE void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems);
@@ -212,7 +212,7 @@ private:
     ::sal_Int32     mnRowSpan;
     ::sal_Int32     mnColSpan;
 
-    Rectangle       maCellRect;
+    tools::Rectangle       maCellRect;
 
     css::uno::Reference< css::table::XTable > mxTable;
 };
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 3ccbc3e744cd..ce2b7cbd49c2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -146,7 +146,7 @@ SfxItemSet* TableProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
 class TableObjectGeoData : public SdrTextObjGeoData
 {
 public:
-    Rectangle   maLogicRect;
+    tools::Rectangle   maLogicRect;
 };
 
 TableStyleSettings::TableStyleSettings()
@@ -203,10 +203,10 @@ public:
     void SetModel(SdrModel* pOldModel, SdrModel* pNewModel);
 
     CellRef getCell( const CellPos& rPos ) const;
-    void LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHeight );
+    void LayoutTable( tools::Rectangle& rArea, bool bFitWidth, bool bFitHeight );
 
     void ApplyCellStyles();
-    void UpdateCells( Rectangle& rArea );
+    void UpdateCells( tools::Rectangle& rArea );
 
     SdrTableObjImpl();
     virtual ~SdrTableObjImpl() override;
@@ -237,8 +237,8 @@ public:
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 private:
     static SdrTableObjImpl* lastLayoutTable;
-    static Rectangle lastLayoutInputRectangle;
-    static Rectangle lastLayoutResultRectangle;
+    static tools::Rectangle lastLayoutInputRectangle;
+    static tools::Rectangle lastLayoutResultRectangle;
     static bool lastLayoutFitWidth;
     static bool lastLayoutFitHeight;
     static WritingMode lastLayoutMode;
@@ -248,8 +248,8 @@ private:
 };
 
 SdrTableObjImpl* SdrTableObjImpl::lastLayoutTable = nullptr;
-Rectangle SdrTableObjImpl::lastLayoutInputRectangle;
-Rectangle SdrTableObjImpl::lastLayoutResultRectangle;
+tools::Rectangle SdrTableObjImpl::lastLayoutInputRectangle;
+tools::Rectangle SdrTableObjImpl::lastLayoutResultRectangle;
 bool SdrTableObjImpl::lastLayoutFitWidth;
 bool SdrTableObjImpl::lastLayoutFitHeight;
 WritingMode SdrTableObjImpl::lastLayoutMode;
@@ -684,7 +684,7 @@ sal_Int32 SdrTableObjImpl::getRowCount() const
     return mxTable.is() ? mxTable->getRowCount() : 0;
 }
 
-void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHeight )
+void SdrTableObjImpl::LayoutTable( tools::Rectangle& rArea, bool bFitWidth, bool bFitHeight )
 {
     if( mpLayouter && mpTableObj->GetModel() )
     {
@@ -722,7 +722,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
     }
 }
 
-void SdrTableObjImpl::UpdateCells( Rectangle& rArea )
+void SdrTableObjImpl::UpdateCells( tools::Rectangle& rArea )
 {
     if( mpLayouter && mxTable.is() )
     {
@@ -758,7 +758,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel)
 }
 
 
-SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows)
+SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::tools::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows)
 : SdrTextObj( rNewRect )
 , maLogicRect( rNewRect )
 {
@@ -1315,7 +1315,7 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
 {
     if( (pEditStatus->GetStatusWord() & EditStatusFlags::TextHeightChanged) && mpImpl.is() && mpImpl->mpLayouter )
     {
-        Rectangle aRect0( maRect );
+        tools::Rectangle aRect0( maRect );
         maRect = maLogicRect;
         mpImpl->LayoutTable( maRect, false, false );
         SetRectsDirty();
@@ -1380,14 +1380,14 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
 }
 
 
-void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const
+void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool bLineWidth ) const
 {
     if( mpImpl.is() )
         TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
 }
 
 
-void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
+void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
 {
     if( !mpImpl.is())
         return;
@@ -1396,7 +1396,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     if( !xCell.is() )
         return;
 
-    Rectangle aAnkRect;
+    tools::Rectangle aAnkRect;
     TakeTextAnchorRect( rPos, aAnkRect );
 
     SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
@@ -1465,7 +1465,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     if (pAnchorRect)
         *pAnchorRect=aAnkRect;
 
-    rTextRect=Rectangle(aTextPos,aTextSiz);
+    rTextRect=tools::Rectangle(aTextPos,aTextSiz);
 }
 
 
@@ -1524,7 +1524,7 @@ void SdrTableObj::getActiveCellPos( CellPos& rPos ) const
 }
 
 
-void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect )
+void SdrTableObj::getCellBounds( const CellPos& rPos, ::tools::Rectangle& rCellRect )
 {
     if( mpImpl.is() )
     {
@@ -1535,16 +1535,16 @@ void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect )
 }
 
 
-void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
+void SdrTableObj::TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const
 {
     if( mpImpl.is() )
         TakeTextAnchorRect( mpImpl->maEditPos, rAnchorRect );
 }
 
 
-void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRect ) const
+void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, tools::Rectangle& rAnchorRect ) const
 {
-    Rectangle aAnkRect(maRect);
+    tools::Rectangle aAnkRect(maRect);
 
     if( mpImpl.is() )
     {
@@ -1558,17 +1558,17 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec
 }
 
 
-void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const
+void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin) const
 {
     if( mpImpl.is() )
         TakeTextEditArea( mpImpl->maEditPos, pPaperMin, pPaperMax, pViewInit, pViewMin );
 }
 
 
-void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin ) const
+void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* pPaperMax, tools::Rectangle* pViewInit, tools::Rectangle* pViewMin ) const
 {
     Size aPaperMin,aPaperMax;
-    Rectangle aViewInit;
+    tools::Rectangle aViewInit;
     TakeTextAnchorRect( rPos, aViewInit );
 
     Size aAnkSiz(aViewInit.GetSize());
@@ -1701,19 +1701,19 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj)
 }
 
 
-const Rectangle& SdrTableObj::GetSnapRect() const
+const tools::Rectangle& SdrTableObj::GetSnapRect() const
 {
     return maRect;
 }
 
 
-void SdrTableObj::NbcSetSnapRect(const Rectangle& rRect)
+void SdrTableObj::NbcSetSnapRect(const tools::Rectangle& rRect)
 {
     NbcSetLogicRect( rRect );
 }
 
 
-const Rectangle& SdrTableObj::GetLogicRect() const
+const tools::Rectangle& SdrTableObj::GetLogicRect() const
 {
     return maLogicRect;
 }
@@ -1740,7 +1740,7 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
         if (bUpdMerk) rOutl.SetUpdateMode(false);
         Size aPaperMin;
         Size aPaperMax;
-        Rectangle aEditArea;
+        tools::Rectangle aEditArea;
         TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,nullptr);
 
         rOutl.SetMinAutoPaperSize(aPaperMin);
@@ -1835,7 +1835,7 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject)
 }
 
 
-void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect)
+void SdrTableObj::NbcSetLogicRect(const tools::Rectangle& rRect)
 {
     maLogicRect=rRect;
     ImpJustifyRect(maLogicRect);
@@ -1851,9 +1851,9 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect)
 }
 
 
-void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ )
+void SdrTableObj::AdjustToMaxRect( const tools::Rectangle& rMaxRect, bool /* bShrinkOnly = false */ )
 {
-    Rectangle aAdjustRect( rMaxRect );
+    tools::Rectangle aAdjustRect( rMaxRect );
     aAdjustRect.setHeight( GetLogicRect().getHeight() );
     SetLogicRect( aAdjustRect );
 }
@@ -1870,7 +1870,7 @@ void SdrTableObj::NbcMove(const Size& rSiz)
 
 void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    Rectangle aOldRect( maLogicRect );
+    tools::Rectangle aOldRect( maLogicRect );
     ResizeRect(maLogicRect,rRef,xFact,yFact);
 
     maRect = maLogicRect;
@@ -1881,11 +1881,11 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
 
 bool SdrTableObj::AdjustTextFrameWidthAndHeight()
 {
-    Rectangle aNeuRect(maLogicRect);
+    tools::Rectangle aNeuRect(maLogicRect);
     bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect);
     if (bRet)
     {
-        Rectangle aBoundRect0;
+        tools::Rectangle aBoundRect0;
         if (pUserCall!=nullptr)
             aBoundRect0=GetLastBoundRect();
         maRect = aNeuRect;
@@ -1898,12 +1898,12 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight()
 }
 
 
-bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const
+bool SdrTableObj::AdjustTextFrameWidthAndHeight(tools::Rectangle& rR, bool bHeight, bool bWidth) const
 {
     if((pModel == nullptr) || rR.IsEmpty() || !mpImpl.is() || !mpImpl->mxTable.is() )
         return false;
 
-    Rectangle aRectangle( rR );
+    tools::Rectangle aRectangle( rR );
     mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight );
 
     if( aRectangle != rR )
@@ -1926,7 +1926,7 @@ void SdrTableObj::NbcReformatText()
 
 void SdrTableObj::ReformatText()
 {
-    Rectangle aBoundRect0;
+    tools::Rectangle aBoundRect0;
     if (pUserCall!=nullptr)
         aBoundRect0=GetLastBoundRect();
     NbcReformatText();
@@ -2188,7 +2188,7 @@ bool SdrTableObj::applySpecialDrag(SdrDragStat& rDrag)
         case SdrHdlKind::Lower:
         case SdrHdlKind::LowerRight:
         {
-            const Rectangle aNewRectangle(ImpDragCalcRect(rDrag));
+            const tools::Rectangle aNewRectangle(ImpDragCalcRect(rDrag));
 
             if (aNewRectangle != maRect)
             {
@@ -2257,7 +2257,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag
 bool SdrTableObj::BegCreate(SdrDragStat& rStat)
 {
     rStat.SetOrtho4Possible();
-    Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
+    tools::Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     maRect = aRect1;
@@ -2267,7 +2267,7 @@ bool SdrTableObj::BegCreate(SdrDragStat& rStat)
 
 bool SdrTableObj::MovCreate(SdrDragStat& rStat)
 {
-    Rectangle aRect1;
+    tools::Rectangle aRect1;
     rStat.TakeCreateRect(aRect1);
     ImpJustifyRect(aRect1);
     rStat.SetActionRect(aRect1);
@@ -2298,7 +2298,7 @@ bool SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
 
 basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) const
 {
-    Rectangle aRect1;
+    tools::Rectangle aRect1;
     rDrag.TakeCreateRect(aRect1);
     aRect1.Justify();
 
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index f7d8d7da1fc4..0e53a54d7450 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2082,7 +2082,7 @@ void SvxTableController::updateSelectionOverlay()
         {
             sdr::overlay::OverlayObjectCell::RangeVector aRanges;
 
-            Rectangle aStartRect, aEndRect;
+            tools::Rectangle aStartRect, aEndRect;
             CellPos aStart,aEnd;
             getSelectedCells( aStart, aEnd );
             pTableObj->getCellBounds( aStart, aStartRect );
@@ -2123,10 +2123,10 @@ void SvxTableController::updateSelectionOverlay()
             if (pOutDev && comphelper::LibreOfficeKit::isActive())
             {
                 // Left edge of aStartRect.
-                Rectangle aSelectionStart(aStartRect.Left(), aStartRect.Top(), aStartRect.Left(), aStartRect.Bottom());
+                tools::Rectangle aSelectionStart(aStartRect.Left(), aStartRect.Top(), aStartRect.Left(), aStartRect.Bottom());
                 // Right edge of aEndRect.
-                Rectangle aSelectionEnd(aEndRect.Right(), aEndRect.Top(), aEndRect.Right(), aEndRect.Bottom());
-                Rectangle aSelection(a2DRange.getMinX(), a2DRange.getMinY(), a2DRange.getMaxX(), a2DRange.getMaxY());
+                tools::Rectangle aSelectionEnd(aEndRect.Right(), aEndRect.Top(), aEndRect.Right(), aEndRect.Bottom());
+                tools::Rectangle aSelection(a2DRange.getMinX(), a2DRange.getMinY(), a2DRange.getMaxX(), a2DRange.getMaxY());
 
                 if (pOutDev->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
                 {
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 63b2ac8f4d47..01eb2ce65ae0 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -238,7 +238,7 @@ drawinglayer::primitive2d::Primitive2DContainer OverlayTableEdge::createOverlayO
 
 
 TableBorderHdl::TableBorderHdl(
-    const Rectangle& rRect,
+    const tools::Rectangle& rRect,
     bool bAnimate)
 :   SdrHdl(rRect.TopLeft(), SdrHdlKind::Move),
     maRectangle(rRect),
diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index 48f0f679008e..3b34cfac640d 100644
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
@@ -70,7 +70,7 @@ class TableBorderHdl : public SdrHdl
 {
 public:
     TableBorderHdl(
-        const Rectangle& rRect,
+        const tools::Rectangle& rRect,
         bool bAnimate);
 
     virtual Pointer GetPointer() const override;
@@ -81,7 +81,7 @@ protected:
     virtual void CreateB2dIAObject() override;
 
 private:
-    Rectangle maRectangle;
+    tools::Rectangle maRectangle;
 
     bool            mbAnimate : 1;
 };
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index efba5de5ef01..ae588b11a5aa 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -496,7 +496,7 @@ typedef std::vector< MergeableCellVector > MergeVector;
 typedef std::vector< sal_Int32 > Int32Vector;
 
 
-void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit )
+void TableLayouter::LayoutTableWidth( tools::Rectangle& rArea, bool bFit )
 {
     const sal_Int32 nColCount = getColumnCount();
     const sal_Int32 nRowCount = getRowCount();
@@ -648,7 +648,7 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit )
 }
 
 
-void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
+void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit )
 {
     const sal_Int32 nColCount = getColumnCount();
     const sal_Int32 nRowCount = getRowCount();
@@ -807,7 +807,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
 
 /** try to fit the table into the given rectangle.
     If the rectangle is to small, it will be grown to fit the table. */
-void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFitHeight )
+void TableLayouter::LayoutTable( tools::Rectangle& rRectangle, bool bFitWidth, bool bFitHeight )
 {
     if( !mxTable.is() )
         return;
@@ -837,7 +837,7 @@ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFi
 }
 
 
-void TableLayouter::updateCells( Rectangle& rRectangle )
+void TableLayouter::updateCells( tools::Rectangle& rRectangle )
 {
     const sal_Int32 nColCount = getColumnCount();
     const sal_Int32 nRowCount = getRowCount();
@@ -853,7 +853,7 @@ void TableLayouter::updateCells( Rectangle& rRectangle )
                 basegfx::B2IRectangle aCellArea;
                 if( getCellArea( xCell, aPos, aCellArea ) )
                 {
-                    Rectangle aCellRect;
+                    tools::Rectangle aCellRect;
                     aCellRect.Left() = aCellArea.getMinX();
                     aCellRect.Right() = aCellArea.getMaxX();
                     aCellRect.Top() = aCellArea.getMinY();
@@ -1034,7 +1034,7 @@ void TableLayouter::UpdateBorderLayout()
 }
 
 
-void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol )
+void TableLayouter::DistributeColumns( ::tools::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol )
 {
     if( mxTable.is() ) try
     {
@@ -1072,7 +1072,7 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol,
 }
 
 
-void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow )
+void TableLayouter::DistributeRows( ::tools::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow )
 {
     if( mxTable.is() ) try
     {
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 5798179214dd..cf577e905437 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -31,7 +31,7 @@
 
 #include "svx/svdotable.hxx"
 
-class Rectangle;
+namespace tools { class Rectangle; }
 
 
 namespace editeng {
@@ -67,7 +67,7 @@ public:
 
         if bFitWidth or bFitHeight is set, the model is changed.
     */
-    void LayoutTable( ::Rectangle& rRectangle, bool bFitWidth, bool bFitHeight );
+    void LayoutTable( ::tools::Rectangle& rRectangle, bool bFitWidth, bool bFitHeight );
 
     void UpdateBorderLayout();
 
@@ -89,21 +89,21 @@ public:
     /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */
     editeng::SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const;
 
-    void updateCells( ::Rectangle& rRectangle );
+    void updateCells( ::tools::Rectangle& rRectangle );
 
     sal_Int32 getHorizontalEdge( int nEdgeY, sal_Int32* pnMin, sal_Int32* pnMax );
     sal_Int32 getVerticalEdge( int nEdgeX , sal_Int32* pnMin, sal_Int32* pnMax);
 
-    void DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol );
-    void DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow );
+    void DistributeColumns( ::tools::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol );
+    void DistributeRows( ::tools::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow );
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 
 private:
     CellRef getCell( const CellPos& rPos ) const;
     basegfx::B2ITuple getCellSize( const CellRef& xCell, const CellPos& rPos ) const;
 
-    void LayoutTableWidth( ::Rectangle& rArea, bool bFit );
-    void LayoutTableHeight( ::Rectangle& rArea, bool bFit );
+    void LayoutTableWidth( ::tools::Rectangle& rArea, bool bFit );
+    void LayoutTableHeight( ::tools::Rectangle& rArea, bool bFit );
 
     bool isValidColumn( sal_Int32 nColumn ) const { return (nColumn >= 0) && (nColumn < static_cast<sal_Int32>( maColumns.size())); }
     bool isValidRow( sal_Int32 nRow ) const { return (nRow >= 0) && (nRow < static_cast<sal_Int32>( maRows.size())); }
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 5dad05c6104f..6f217f08c1fc 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -346,7 +346,7 @@ void SdrTableRTFParser::FillTable()
             }
         }
 
-        Rectangle aRect( mrTableObj.GetSnapRect() );
+        tools::Rectangle aRect( mrTableObj.GetSnapRect() );
         aRect.Right() = aRect.Left() + nLastEdge;
         mrTableObj.NbcSetSnapRect( aRect );
 
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 24fc6655b86e..fc1adcda3dad 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -520,7 +520,7 @@ namespace sdr
 
                     // create range using the model data directly. This is in SdrTextObj::aRect which i will access using
                     // GetGeoRect() to not trigger any calculations. It's the unrotated geometry.
-                    const Rectangle& rObjectRectangle(rTableObj.GetGeoRect());
+                    const tools::Rectangle& rObjectRectangle(rTableObj.GetGeoRect());
                     const basegfx::B2DRange aObjectRange(rObjectRectangle.Left(), rObjectRectangle.Top(), rObjectRectangle.Right(), rObjectRectangle.Bottom());
 
                     // for each cell we need potentially a cell primitive and a border primitive
@@ -680,7 +680,7 @@ namespace sdr
             else
             {
                 // take unrotated snap rect (direct model data) for position and size
-                const Rectangle& rRectangle = rTableObj.GetGeoRect();
+                const tools::Rectangle& rRectangle = rTableObj.GetGeoRect();
                 const basegfx::B2DRange aObjectRange(
                     rRectangle.Left(), rRectangle.Top(),
                     rRectangle.Right(), rRectangle.Bottom());