renaissance1: #i107215# Modified painting and layouting of page objects.

1 files changed, 4 insertions, 8 deletions

diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 65f67efaeb22..026b60238d91 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -73,6 +73,8 @@ public:
         MouseOverIndicator,
         // Bounding box of the page number.
         PageNumber,
+        // Bounding box of the frame that sometimes is painted around the page number.
+        PageNumberFrame,
         // Bounding box of the pane name.
         Name,
         // Indicator whether or not there is a slide transition associated
@@ -140,18 +142,12 @@ public:
         const Point& rWindowLocation);
 
 private:
-    /// Minimal border around the page number area.
-    static const sal_Int32 mnPageNumberOffset;
-    static const sal_Int32 mnOuterBorderWidth;
-    static const sal_Int32 mnInfoAreaMinWidth;
-    static const Size maButtonSize;
-    static const sal_Int32 mnButtonGap;
-
     SharedSdWindow mpWindow;
     Size maPageObjectSize;
     double mnModelToWindowScale;
     Rectangle maPageObjectBoundingBox;
     Rectangle maPageNumberAreaBoundingBox;
+    Rectangle maPageNumberFrameBoundingBox;
     Rectangle maPreviewBoundingBox;
     Rectangle maTransitionEffectBoundingBox;
     Rectangle maButtonAreaBoundingBox;
@@ -161,7 +157,7 @@ private:
     Rectangle CalculatePreviewBoundingBox (
         Size& rPageObjectSize,
         const Size& rPreviewModelSize,
-        const sal_Int32 nInfoAreaWidth);
+        const sal_Int32 nPageNumberAreaWidth);
 };