[Libreoffice-commits] core.git: sdext/source

[Stephan Bergmann]

 sdext/source/presenter/PresenterPaneBorderPainter.cxx |   34 ++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 94bfb93f3960eb55d8f3388d578e3ce03d02507d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 27 13:04:00 2017 +0200

    PresenterPaneBorderPainter::Renderer::PaintBitmap rpBackgroundBitmap is unused
    
    ...ever since 4d91841e0bc18d5b01fe85eb03eb0be589cf0c74 "INTEGRATION: CWS
    presenterscreen".  (But PresenterTheme::GetBitmap is called with "Background" at
    least also from PresenterWindowManager::SetTheme in
    sdext/source/presenter/PresenterWindowManager.cxx, so that code cannot be
    cleaned away.)
    
    Change-Id: I2cdf96ce4d27af2d0beca51e5769fbf148973431

diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 249a435372dc..28b1fd6cdf95 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -81,7 +81,6 @@ namespace {
         SharedBitmapDescriptor mpBottom;
         SharedBitmapDescriptor mpBottomRight;
         SharedBitmapDescriptor mpBottomCallout;
-        SharedBitmapDescriptor mpBackground;
         SharedBitmapDescriptor mpEmpty;
         PresenterTheme::SharedFontDescriptor mpFont;
         sal_Int32 mnFontXOffset;
@@ -147,8 +146,7 @@ private:
         const sal_Int32 nStartOffset,
         const sal_Int32 nEndOffset,
         const bool bExpand,
-        const SharedBitmapDescriptor& rpBitmap,
-        const SharedBitmapDescriptor& rpBackgroundBitmap);
+        const SharedBitmapDescriptor& rpBitmap);
 };
 
 // ===== PresenterPaneBorderPainter ===========================================
@@ -438,15 +436,14 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
     SharedBitmapDescriptor pBottomLeft (pStyle->mpBottomLeft);
     SharedBitmapDescriptor pBottomRight (pStyle->mpBottomRight);
     SharedBitmapDescriptor pBottom (pStyle->mpBottom);
-    SharedBitmapDescriptor pBackground (pStyle->mpBackground);
 
     // Paint the sides.
     PaintBitmap(aCenterBox, rUpdateBox, 0,-1,
-        pTopLeft->mnXOffset, pTopRight->mnXOffset, true, pTop, pBackground);
+        pTopLeft->mnXOffset, pTopRight->mnXOffset, true, pTop);
     PaintBitmap(aCenterBox, rUpdateBox, -1,0,
-        pTopLeft->mnYOffset, pBottomLeft->mnYOffset, true, pLeft, pBackground);
+        pTopLeft->mnYOffset, pBottomLeft->mnYOffset, true, pLeft);
     PaintBitmap(aCenterBox, rUpdateBox, +1,0,
-        pTopRight->mnYOffset, pBottomRight->mnYOffset, true, pRight, pBackground);
+        pTopRight->mnYOffset, pBottomRight->mnYOffset, true, pRight);
     if (mbHasCallout && pStyle->mpBottomCallout->GetNormalBitmap().is())
     {
         const sal_Int32 nCalloutWidth (pStyle->mpBottomCallout->mnWidth);
@@ -457,25 +454,25 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
         if (nCalloutX > pBottomRight->mnXOffset + aCenterBox.X + aCenterBox.Width)
             nCalloutX = pBottomRight->mnXOffset + aCenterBox.X + aCenterBox.Width;
         // Paint bottom callout.
-        PaintBitmap(aCenterBox, rUpdateBox, 0,+1, nCalloutX,0, false, pStyle->mpBottomCallout, pBackground);
+        PaintBitmap(aCenterBox, rUpdateBox, 0,+1, nCalloutX,0, false, pStyle->mpBottomCallout);
         // Paint regular bottom bitmap left and right.
         PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
-            pBottomLeft->mnXOffset, nCalloutX-aCenterBox.Width, true, pBottom, pBackground);
+            pBottomLeft->mnXOffset, nCalloutX-aCenterBox.Width, true, pBottom);
         PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
-            nCalloutX+nCalloutWidth, pBottomRight->mnXOffset, true, pBottom, pBackground);
+            nCalloutX+nCalloutWidth, pBottomRight->mnXOffset, true, pBottom);
     }
     else
     {
         // Stretch the bottom bitmap over the full width.
         PaintBitmap(aCenterBox, rUpdateBox, 0,+1,
-            pBottomLeft->mnXOffset, pBottomRight->mnXOffset, true, pBottom, pBackground);
+            pBottomLeft->mnXOffset, pBottomRight->mnXOffset, true, pBottom);
     }
 
     // Paint the corners.
-    PaintBitmap(aCenterBox, rUpdateBox, -1,-1, 0,0, false, pTopLeft, pBackground);
-    PaintBitmap(aCenterBox, rUpdateBox, +1,-1, 0,0, false, pTopRight, pBackground);
-    PaintBitmap(aCenterBox, rUpdateBox, -1,+1, 0,0, false, pBottomLeft, pBackground);
-    PaintBitmap(aCenterBox, rUpdateBox, +1,+1, 0,0, false, pBottomRight, pBackground);
+    PaintBitmap(aCenterBox, rUpdateBox, -1,-1, 0,0, false, pTopLeft);
+    PaintBitmap(aCenterBox, rUpdateBox, +1,-1, 0,0, false, pTopRight);
+    PaintBitmap(aCenterBox, rUpdateBox, -1,+1, 0,0, false, pBottomLeft);
+    PaintBitmap(aCenterBox, rUpdateBox, +1,+1, 0,0, false, pBottomRight);
 
     // Paint the title.
     PaintTitle(rsTitle, pStyle, rUpdateBox, aOuterBox, aInnerBox);
@@ -604,11 +601,8 @@ void PresenterPaneBorderPainter::Renderer::PaintBitmap(
     const sal_Int32 nStartOffset,
     const sal_Int32 nEndOffset,
     const bool bExpand,
-    const SharedBitmapDescriptor& rpBitmap,
-    const SharedBitmapDescriptor& rpBackgroundBitmap)
+    const SharedBitmapDescriptor& rpBitmap)
 {
-    (void)rpBackgroundBitmap;
-
     bool bUseCanvas (mxCanvas.is());
     if ( ! bUseCanvas)
         return;
@@ -765,7 +759,6 @@ RendererPaneStyle::RendererPaneStyle (
       mpBottom(),
       mpBottomRight(),
       mpBottomCallout(),
-      mpBackground(),
       mpEmpty(new PresenterBitmapDescriptor()),
       mpFont(),
       mnFontXOffset(0),
@@ -786,7 +779,6 @@ RendererPaneStyle::RendererPaneStyle (
         mpBottom = GetBitmap(rpTheme, rsStyleName, "Bottom");
         mpBottomRight = GetBitmap(rpTheme, rsStyleName, "BottomRight");
         mpBottomCallout = GetBitmap(rpTheme, rsStyleName, "BottomCallout");
-        mpBackground = GetBitmap(rpTheme, OUString(), "Background");
 
         // Get font description.
         mpFont = rpTheme->GetFont(rsStyleName);