1 files changed, 28 insertions, 28 deletions

diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index e2d321defa80..1728cc390c3f 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -168,33 +168,33 @@ public:
     /** Return the bounding box of the preview or, when selected, of the page
         object.  Thus, it returns something like a visual bounding box.
     */
-    Rectangle GetInnerBoundingBox (
+    ::tools::Rectangle GetInnerBoundingBox (
         model::SlideSorterModel& rModel,
         const sal_Int32 nIndex) const;
 
     Range GetValidHorizontalSizeRange() const;
     Range GetValidVerticalSizeRange() const;
 
-    Range GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const;
+    Range GetRangeOfVisiblePageObjects (const ::tools::Rectangle& aVisibleArea) const;
     sal_Int32 GetIndex (
         const sal_Int32 nRow,
         const sal_Int32 nColumn,
         const bool bClampToValidRange) const;
 
-        Rectangle GetPageObjectBox (
+        ::tools::Rectangle GetPageObjectBox (
         const sal_Int32 nIndex,
         const bool bIncludeBorderAndGap = false) const;
 
-    Rectangle GetPageObjectBox (
+    ::tools::Rectangle GetPageObjectBox (
         const sal_Int32 nRow,
         const sal_Int32 nColumn) const;
 
-    Rectangle AddBorderAndGap (
-        const Rectangle& rBoundingBox,
+    ::tools::Rectangle AddBorderAndGap (
+        const ::tools::Rectangle& rBoundingBox,
         const sal_Int32 nRow,
         const sal_Int32 nColumn) const;
 
-    Rectangle GetTotalBoundingBox() const;
+    ::tools::Rectangle GetTotalBoundingBox() const;
 
     virtual ~Implementation();
 
@@ -348,14 +348,14 @@ Size Layouter::GetPageObjectSize() const
     return mpImplementation->maPageObjectSize;
 }
 
-Rectangle Layouter::GetPageObjectBox (
+::tools::Rectangle Layouter::GetPageObjectBox (
     const sal_Int32 nIndex,
     const bool bIncludeBorderAndGap) const
 {
     return mpImplementation->GetPageObjectBox(nIndex, bIncludeBorderAndGap);
 }
 
-Rectangle Layouter::GetTotalBoundingBox() const
+::tools::Rectangle Layouter::GetTotalBoundingBox() const
 {
     return mpImplementation->GetTotalBoundingBox();
 }
@@ -387,7 +387,7 @@ Range Layouter::GetValidVerticalSizeRange() const
     return mpImplementation->GetValidVerticalSizeRange();
 }
 
-Range Layouter::GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const
+Range Layouter::GetRangeOfVisiblePageObjects (const ::tools::Rectangle& aVisibleArea) const
 {
     return mpImplementation->GetRangeOfVisiblePageObjects(aVisibleArea);
 }
@@ -687,8 +687,8 @@ void Layouter::Implementation::CalculateGeometricPosition (
     if (rPosition.IsAtRunStart())
     {
         // Place indicator at the top of the column.
-        const Rectangle aOuterBox (GetPageObjectBox(nIndex));
-        const Rectangle aInnerBox (GetInnerBoundingBox(rModel, nIndex));
+        const ::tools::Rectangle aOuterBox (GetPageObjectBox(nIndex));
+        const ::tools::Rectangle aInnerBox (GetInnerBoundingBox(rModel, nIndex));
         if (bIsVertical)
         {
             nLeadingLocation = aOuterBox.Top();
@@ -707,8 +707,8 @@ void Layouter::Implementation::CalculateGeometricPosition (
     {
         // Place indicator at the bottom/right of the column/row.
 
-        const Rectangle aOuterBox (GetPageObjectBox(nIndex-1));
-        const Rectangle aInnerBox (GetInnerBoundingBox(rModel, nIndex-1));
+        const ::tools::Rectangle aOuterBox (GetPageObjectBox(nIndex-1));
+        const ::tools::Rectangle aInnerBox (GetInnerBoundingBox(rModel, nIndex-1));
         if (bIsVertical)
         {
             nLeadingLocation = aInnerBox.Bottom();
@@ -728,8 +728,8 @@ void Layouter::Implementation::CalculateGeometricPosition (
     else
     {
         // Place indicator between two rows/columns.
-        const Rectangle aBox1 (GetInnerBoundingBox(rModel, nIndex-1));
-        const Rectangle aBox2 (GetInnerBoundingBox(rModel, nIndex));
+        const ::tools::Rectangle aBox1 (GetInnerBoundingBox(rModel, nIndex-1));
+        const ::tools::Rectangle aBox2 (GetInnerBoundingBox(rModel, nIndex));
         if (bIsVertical)
         {
             nLeadingLocation = aBox1.Bottom();
@@ -786,13 +786,13 @@ void Layouter::Implementation::CalculateGeometricPosition (
     }
 }
 
-Rectangle Layouter::Implementation::GetInnerBoundingBox (
+::tools::Rectangle Layouter::Implementation::GetInnerBoundingBox (
     model::SlideSorterModel& rModel,
     const sal_Int32 nIndex) const
 {
     model::SharedPageDescriptor pDescriptor (rModel.GetPageDescriptor(nIndex));
     if ( ! pDescriptor)
-        return Rectangle();
+        return ::tools::Rectangle();
 
     PageObjectLayouter::Part ePart = PageObjectLayouter::Part::Preview;
 
@@ -818,7 +818,7 @@ Range Layouter::Implementation::GetValidVerticalSizeRange() const
         mnTopBorder + maMaximalSize.Height() + mnBottomBorder);
 }
 
-Range Layouter::Implementation::GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const
+Range Layouter::Implementation::GetRangeOfVisiblePageObjects (const ::tools::Rectangle& aVisibleArea) const
 {
     const sal_Int32 nRow0 (GetRowAtPosition(aVisibleArea.Top(), true, GM_NEXT));
     const sal_Int32 nCol0 (GetColumnAtPosition(aVisibleArea.Left(),true, GM_NEXT));
@@ -899,25 +899,25 @@ sal_Int32 Layouter::Implementation::GetIndex (
         return -1;
 }
 
-Rectangle Layouter::Implementation::GetPageObjectBox (
+::tools::Rectangle Layouter::Implementation::GetPageObjectBox (
     const sal_Int32 nIndex,
     const bool bIncludeBorderAndGap) const
 {
     const sal_Int32 nRow (nIndex / mnColumnCount);
     const sal_Int32 nColumn (nIndex % mnColumnCount);
 
-    const Rectangle aBoundingBox (GetPageObjectBox(nRow,nColumn));
+    const ::tools::Rectangle aBoundingBox (GetPageObjectBox(nRow,nColumn));
     if (bIncludeBorderAndGap)
         return AddBorderAndGap(aBoundingBox, nRow, nColumn);
     else
         return aBoundingBox;
 }
 
-Rectangle Layouter::Implementation::GetPageObjectBox (
+::tools::Rectangle Layouter::Implementation::GetPageObjectBox (
     const sal_Int32 nRow,
     const sal_Int32 nColumn) const
 {
-    return Rectangle(
+    return ::tools::Rectangle(
         Point (mnLeftBorder
             + nColumn * maPageObjectSize.Width()
             + (nColumn>0 ? nColumn : 0) * mnHorizontalGap,
@@ -927,12 +927,12 @@ Rectangle Layouter::Implementation::GetPageObjectBox (
         maPageObjectSize);
 }
 
-Rectangle Layouter::Implementation::AddBorderAndGap (
-    const Rectangle& rBoundingBox,
+::tools::Rectangle Layouter::Implementation::AddBorderAndGap (
+    const ::tools::Rectangle& rBoundingBox,
     const sal_Int32 nRow,
     const sal_Int32 nColumn) const
 {
-    Rectangle aBoundingBox (rBoundingBox);
+    ::tools::Rectangle aBoundingBox (rBoundingBox);
 
     if (nColumn == 0)
         aBoundingBox.Left() = 0;
@@ -953,7 +953,7 @@ Rectangle Layouter::Implementation::AddBorderAndGap (
     return aBoundingBox;
 }
 
-Rectangle Layouter::Implementation::GetTotalBoundingBox() const
+::tools::Rectangle Layouter::Implementation::GetTotalBoundingBox() const
 {
     sal_Int32 nHorizontalSize = 0;
     sal_Int32 nVerticalSize = 0;
@@ -974,7 +974,7 @@ Rectangle Layouter::Implementation::GetTotalBoundingBox() const
             nVerticalSize += (nRowCount-1) * mnVerticalGap;
     }
 
-    return Rectangle (
+    return ::tools::Rectangle (
         Point(0,0),
         Size (nHorizontalSize, nVerticalSize)
         );