convert PageObjectLayouter to scoped enum

and drop unused MouseOverIndicator and Name enumerators

Change-Id: I7041d0b3792939709d73fed75ee858f0e649b840

7 files changed, 24 insertions, 33 deletions

diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 9daf8e92057e..72f67ba9a098 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -301,7 +301,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds()
     Rectangle aBBox (
         mrSlideSorter.GetView().GetLayouter().GetPageObjectLayouter()->GetBoundingBox(
             mrSlideSorter.GetModel().GetPageDescriptor(mnPageNumber),
-            ::sd::slidesorter::view::PageObjectLayouter::PageObject,
+            ::sd::slidesorter::view::PageObjectLayouter::Part::PageObject,
             ::sd::slidesorter::view::PageObjectLayouter::WindowCoordinateSystem));
 
     if (mxParent.is())
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a6486df3524f..d804ee8fcb20 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -204,7 +204,7 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt (
             // Make sure that the mouse is over the preview area.
             if ( ! mrView.GetLayouter().GetPageObjectLayouter()->GetBoundingBox(
                 pDescriptorAtPoint,
-                view::PageObjectLayouter::Preview,
+                view::PageObjectLayouter::Part::Preview,
                 view::PageObjectLayouter::WindowCoordinateSystem).IsInside(aWindowPosition))
             {
                 pDescriptorAtPoint.reset();
@@ -374,7 +374,7 @@ bool SlideSorterController::Command (
                     Rectangle aBBox (
                         mrView.GetLayouter().GetPageObjectLayouter()->GetBoundingBox (
                             pDescriptor,
-                            PageObjectLayouter::PageObject,
+                            PageObjectLayouter::Part::PageObject,
                             PageObjectLayouter::ModelCoordinateSystem));
                     aMenuLocation = aBBox.Center();
                 }
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 0b2eb12266f7..15ff687fcc04 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -52,7 +52,7 @@ public:
         const sal_Int32 nPageCount);
     ~PageObjectLayouter();
 
-    enum Part {
+    enum class Part {
         // The focus indicator is painted outside the actual page object.
         FocusIndicator,
         // This is the outer bounding box that includes the preview, page
@@ -60,12 +60,8 @@ public:
         PageObject,
         // Bounding box of the actual preview.
         Preview,
-        // Bounding box of the mouse indicator indicator frame.
-        MouseOverIndicator,
         // Bounding box of the page number.
         PageNumber,
-        // Bounding box of the pane name.
-        Name,
         // Indicator whether or not there is a slide transition associated
         // with this slide.
         TransitionEffectIndicator,
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 05ca714e6fa9..e2d321defa80 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -794,10 +794,10 @@ Rectangle Layouter::Implementation::GetInnerBoundingBox (
     if ( ! pDescriptor)
         return Rectangle();
 
-    PageObjectLayouter::Part ePart = PageObjectLayouter::Preview;
+    PageObjectLayouter::Part ePart = PageObjectLayouter::Part::Preview;
 
     if (pDescriptor->HasState(model::PageDescriptor::ST_Selected))
-        ePart = PageObjectLayouter::PageObject;
+        ePart = PageObjectLayouter::Part::PageObject;
 
     return mpPageObjectLayouter->GetBoundingBox(
             pDescriptor, ePart,
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index 4724ff8a0c0b..119a8cc44560 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -179,31 +179,26 @@ Rectangle PageObjectLayouter::GetBoundingBox (
     Rectangle aBoundingBox;
     switch (ePart)
     {
-        case FocusIndicator:
+        case Part::FocusIndicator:
             aBoundingBox = maFocusIndicatorBoundingBox;
             break;
 
-        case PageObject:
-        case MouseOverIndicator:
+        case Part::PageObject:
             aBoundingBox = maPageObjectBoundingBox;
             break;
 
-        case Preview:
+        case Part::Preview:
             aBoundingBox = maPreviewBoundingBox;
             break;
 
-        case PageNumber:
+        case Part::PageNumber:
             aBoundingBox = maPageNumberAreaBoundingBox;
             break;
 
-        case Name:
-            aBoundingBox = maPageNumberAreaBoundingBox;
-            break;
-
-        case TransitionEffectIndicator:
+        case Part::TransitionEffectIndicator:
             aBoundingBox = maTransitionEffectBoundingBox;
             break;
-        case CustomAnimationEffectIndicator:
+        case Part::CustomAnimationEffectIndicator:
             aBoundingBox = maCustomAnimationEffectBoundingBox;
             break;
     }
@@ -220,13 +215,13 @@ Rectangle PageObjectLayouter::GetBoundingBox (
 
 Size PageObjectLayouter::GetPreviewSize ()
 {
-    return GetBoundingBox(Point(0,0), PageObjectLayouter::Preview,
+    return GetBoundingBox(Point(0,0), PageObjectLayouter::Part::Preview,
                           WindowCoordinateSystem).GetSize();
 }
 
 Size PageObjectLayouter::GetGridMaxSize()
 {
-    return GetBoundingBox(Point(0,0), PageObjectLayouter::FocusIndicator,
+    return GetBoundingBox(Point(0,0), PageObjectLayouter::Part::FocusIndicator,
                           WindowCoordinateSystem).GetSize();
 }
 
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index f179b9bf9795..ea5fc5bcb2f4 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -121,7 +121,7 @@ void PageObjectPainter::PaintBackground (
         rDevice.SetLineColor(pPage->GetPageBackgroundColor(nullptr));
         const Rectangle aPreviewBox (pPageObjectLayouter->GetBoundingBox(
             rpDescriptor,
-            PageObjectLayouter::Preview,
+            PageObjectLayouter::Part::Preview,
             PageObjectLayouter::ModelCoordinateSystem));
         rDevice.DrawRect(aPreviewBox);
     }
@@ -134,7 +134,7 @@ void PageObjectPainter::PaintPreview (
 {
     const Rectangle aBox (pPageObjectLayouter->GetBoundingBox(
         rpDescriptor,
-        PageObjectLayouter::Preview,
+        PageObjectLayouter::Part::Preview,
         PageObjectLayouter::ModelCoordinateSystem));
 
     if (mpCache != nullptr)
@@ -194,7 +194,7 @@ Bitmap PageObjectPainter::GetPreviewBitmap (
         Bitmap aMarkedPreview (mpCache->GetMarkedPreviewBitmap(pPage));
         const Rectangle aPreviewBox (pPageObjectLayouter->GetBoundingBox(
             rpDescriptor,
-            PageObjectLayouter::Preview,
+            PageObjectLayouter::Part::Preview,
             PageObjectLayouter::ModelCoordinateSystem));
         if (aMarkedPreview.IsEmpty() || aMarkedPreview.GetSizePixel()!=aPreviewBox.GetSize())
         {
@@ -220,7 +220,7 @@ void PageObjectPainter::PaintPageNumber (
 {
     const Rectangle aBox (pPageObjectLayouter->GetBoundingBox(
         rpDescriptor,
-        PageObjectLayouter::PageNumber,
+        PageObjectLayouter::Part::PageNumber,
         PageObjectLayouter::ModelCoordinateSystem));
 
     // Determine the color of the page number.
@@ -276,7 +276,7 @@ void PageObjectPainter::PaintTransitionEffect (
     {
         const Rectangle aBox (pPageObjectLayouter->GetBoundingBox(
             rpDescriptor,
-            PageObjectLayouter::TransitionEffectIndicator,
+            PageObjectLayouter::Part::TransitionEffectIndicator,
             PageObjectLayouter::ModelCoordinateSystem));
 
         rDevice.DrawBitmapEx(
@@ -298,7 +298,7 @@ void PageObjectPainter::PaintCustomAnimationEffect (
     {
         const Rectangle aBox (pPageObjectLayouter->GetBoundingBox(
             rpDescriptor,
-            PageObjectLayouter::CustomAnimationEffectIndicator,
+            PageObjectLayouter::Part::CustomAnimationEffectIndicator,
             PageObjectLayouter::ModelCoordinateSystem));
         rDevice.DrawBitmapEx(
             aBox.TopCenter(),
@@ -366,12 +366,12 @@ void PageObjectPainter::PaintBackgroundDetail (
 
     const Rectangle aFocusSize (pPageObjectLayouter->GetBoundingBox(
                                         rpDescriptor,
-                                        PageObjectLayouter::FocusIndicator,
+                                        PageObjectLayouter::Part::FocusIndicator,
                                         PageObjectLayouter::ModelCoordinateSystem));
 
     const Rectangle aPageObjectBox (pPageObjectLayouter->GetBoundingBox(
                                         rpDescriptor,
-                                        PageObjectLayouter::PageObject,
+                                        PageObjectLayouter::Part::PageObject,
                                         PageObjectLayouter::ModelCoordinateSystem));
 
     // Fill the background with the background color of the slide sorter.
@@ -430,7 +430,7 @@ void PageObjectPainter::PaintBackgroundDetail (
     // Compensate for the border around the preview.
     const Rectangle aBox (pPageObjectLayouter->GetBoundingBox(
                                 rpDescriptor,
-                                PageObjectLayouter::Preview,
+                                PageObjectLayouter::Part::Preview,
                                 PageObjectLayouter::ModelCoordinateSystem));
     Rectangle aFrameBox (aBox.Left()-1,aBox.Top()-1,aBox.Right()+1,aBox.Bottom()+1);
     mpShadowPainter->PaintFrame(rDevice, aFrameBox);
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 9dc22257667b..cd312e40708d 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -110,7 +110,7 @@ void ToolTip::DoShow()
         Rectangle aBox (
             mrSlideSorter.GetView().GetLayouter().GetPageObjectLayouter()->GetBoundingBox(
                 mpDescriptor,
-                PageObjectLayouter::Preview,
+                PageObjectLayouter::Part::Preview,
                 PageObjectLayouter::WindowCoordinateSystem));
 
         // Do not show the help text when the (lower edge of the ) preview