loplugin:constantparam in vcl

Change-Id: Ic32e4098dcdae5ca5d7fe2749badedabda86a90d
Reviewed-on: https://gerrit.libreoffice.org/44043
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 30 insertions, 43 deletions

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 4d2a5e4142b6..1f05f3fc5be6 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -175,46 +175,36 @@ namespace {
     }
 }
 
-static void ImplCalcBorder( WindowAlign eAlign, bool bNoAlign,
+static void ImplCalcBorder( WindowAlign eAlign,
                             long& rLeft, long& rTop,
                             long& rRight, long& rBottom )
 {
-    if ( bNoAlign )
+    switch ( eAlign )
     {
+    case WindowAlign::Top:
         rLeft   = 2;
         rTop    = 2;
         rRight  = 2;
+        rBottom = 0;
+        break;
+    case WindowAlign::Left:
+        rLeft   = 0;
+        rTop    = 2;
+        rRight  = 2;
         rBottom = 2;
-    }
-    else
-    {
-        switch ( eAlign )
-        {
-        case WindowAlign::Top:
-            rLeft   = 2;
-            rTop    = 2;
-            rRight  = 2;
-            rBottom = 0;
-            break;
-        case WindowAlign::Left:
-            rLeft   = 0;
-            rTop    = 2;
-            rRight  = 2;
-            rBottom = 2;
-            break;
-        case WindowAlign::Bottom:
-            rLeft   = 2;
-            rTop    = 0;
-            rRight  = 2;
-            rBottom = 2;
-            break;
-        default:
-            rLeft   = 0;
-            rTop    = 2;
-            rRight  = 2;
-            rBottom = 2;
-            break;
-        }
+        break;
+    case WindowAlign::Bottom:
+        rLeft   = 2;
+        rTop    = 0;
+        rRight  = 2;
+        rBottom = 2;
+        break;
+    default:
+        rLeft   = 0;
+        rTop    = 2;
+        rRight  = 2;
+        rBottom = 2;
+        break;
     }
 }
 
@@ -1296,7 +1286,7 @@ void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
 
     if ( nStyle & WB_BORDER )
     {
-        ImplCalcBorder( meAlign, false/*bNoAlign*/, mnLeftBorder, mnTopBorder,
+        ImplCalcBorder( meAlign, mnLeftBorder, mnTopBorder,
                         mnRightBorder, mnBottomBorder );
     }
     else
@@ -2905,7 +2895,7 @@ void SplitWindow::ImplNewAlign()
 
     if ( mnWinStyle & WB_BORDER )
     {
-        ImplCalcBorder( meAlign, false/*bNoAlign*/, mnLeftBorder, mnTopBorder,
+        ImplCalcBorder( meAlign, mnLeftBorder, mnTopBorder,
                         mnRightBorder, mnBottomBorder );
     }
 
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 45099edbefe0..fa0129bdba53 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2443,18 +2443,15 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl, Timer *, void)
         ImplFormat();
 }
 
-static void ImplDrawMoreIndicator(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, bool bSetColor, bool bRotate )
+static void ImplDrawMoreIndicator(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect, bool bRotate )
 {
     rRenderContext.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
     rRenderContext.SetLineColor();
 
-    if (bSetColor)
-    {
-        if (rRenderContext.GetSettings().GetStyleSettings().GetFaceColor().IsDark())
-            rRenderContext.SetFillColor(Color(COL_WHITE));
-        else
-            rRenderContext.SetFillColor(Color(COL_BLACK));
-    }
+    if (rRenderContext.GetSettings().GetStyleSettings().GetFaceColor().IsDark())
+        rRenderContext.SetFillColor(Color(COL_WHITE));
+    else
+        rRenderContext.SetFillColor(Color(COL_BLACK));
     float fScaleFactor = rRenderContext.GetDPIScaleFactor();
 
     int linewidth = 1 * fScaleFactor;
@@ -2593,7 +2590,7 @@ void ToolBox::ImplDrawMenuButton(vcl::RenderContext& rRenderContext, bool bHighl
             ImplDrawButton(rRenderContext, mpData->maMenubuttonItem.maRect, 2, false, true, false );
 
         if (ImplHasClippedItems())
-            ImplDrawMoreIndicator(rRenderContext, mpData->maMenubuttonItem.maRect, true, !mbHorz);
+            ImplDrawMoreIndicator(rRenderContext, mpData->maMenubuttonItem.maRect, !mbHorz);
 
         // store highlight state
         mpData->mbMenubuttonSelected = bHighlight;