loplugin:constantparam

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

3 files changed, 9 insertions, 30 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index b599a701f679..8af97408a2d7 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -751,7 +751,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
         pDev->DrawRect( aRect );
     }
 
-    ImplPaintData( *pDev, tools::Rectangle( aRealPos, aRealSize ), true, /*bDrawSelection*/true );
+    ImplPaintData( *pDev, tools::Rectangle( aRealPos, aRealSize ), true );
 
     // restore the column widths/data row height
     nDataRowHeight = nOriginalHeight;
@@ -771,7 +771,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
 }
 
 
-void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections)
+void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRect, bool _bForeignDevice)
 {
     Point aOverallAreaPos = _bForeignDevice ? _rRect.TopLeft() : Point(0,0);
     Size aOverallAreaSize = _bForeignDevice ? _rRect.GetSize() : pDataWin->GetOutputSizePixel();
@@ -828,8 +828,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
         tools::Rectangle aRowRect( Point( _rRect.TopLeft().X(), aPos.Y() ),
                 Size( _rRect.GetSize().Width(), nDataRowHeigt ) );
 
-        bool bRowSelected   =   _bDrawSelections
-                            &&  !bHideSelect
+        bool bRowSelected   =   !bHideSelect
                             &&  IsRowSelected( nRow );
         if ( bRowSelected )
         {
@@ -865,8 +864,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const tools::Rectangle& _rRec
             }
 
             // prepare Column-AutoHighlight
-            bool bColAutoHighlight  =   _bDrawSelections
-                                    &&  bColumnCursor
+            bool bColAutoHighlight  =   bColumnCursor
                                     &&  IsColumnSelected( pCol->GetId() );
             if ( bColAutoHighlight )
             {
@@ -1027,7 +1025,7 @@ void BrowseBox::PaintData( vcl::Window const & rWin, vcl::RenderContext& rRender
         Resize();
     // MI: who was that? Window::Update();
 
-    ImplPaintData(rRenderContext, rRect, false, true);
+    ImplPaintData(rRenderContext, rRect, false);
 }
 
 void BrowseBox::UpdateScrollbars()
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index b0a8530787bd..6608f2cb177f 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -317,7 +317,6 @@ public:
     tools::Rectangle           CalcTextRect(
                             SvxIconChoiceCtrlEntry*,
                             const Point* pPos = nullptr,
-                            bool bForInplaceEdit = false,
                             const OUString* pStr = nullptr
                         );
 
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 8c867d5d2904..86a72f6ddb67 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1473,7 +1473,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
     rRenderContext.Push(PushFlags::FONT | PushFlags::TEXTCOLOR);
 
     OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry));
-    tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, false, &aEntryText));
+    tools::Rectangle aTextRect(CalcTextRect(pEntry, &rPos, &aEntryText));
     tools::Rectangle aBmpRect(CalcBmpRect(pEntry, &rPos));
 
     bool bShowSelection = (bSelected && (eSelectionMode != SelectionMode::NONE));
@@ -1673,7 +1673,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pE
 }
 
 tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry,
-    const Point* pEntryPos, bool bEdit, const OUString* pStr )
+    const Point* pEntryPos, const OUString* pStr )
 {
     OUString aEntryText;
     if( !pStr )
@@ -1687,8 +1687,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
         aBound.SetPos( *pEntryPos );
 
     tools::Rectangle aTextRect( aMaxTextRect );
-    if( !bEdit )
-        aTextRect = pView->GetTextRect( aTextRect, aEntryText, nCurTextDrawFlags );
+    aTextRect = pView->GetTextRect( aTextRect, aEntryText, nCurTextDrawFlags );
 
     Size aTextSize( aTextRect.GetSize() );
 
@@ -1701,23 +1700,6 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p
         case WB_ICON:
             aPos.AdjustY(aImageSize.Height() );
             aPos.AdjustY(VER_DIST_BMP_STRING );
-            // at little more space when editing
-            if( bEdit )
-            {
-                // +20%
-                long nMinWidth = (( (aImageSize.Width()*10) / 100 ) * 2 ) +
-                                 aImageSize.Width();
-                if( nMinWidth > nBoundWidth )
-                    nMinWidth = nBoundWidth;
-
-                if( aTextSize.Width() < nMinWidth )
-                    aTextSize.setWidth( nMinWidth );
-
-                // when editing, overlap with the area below is allowed
-                Size aOptSize = aMaxTextRect.GetSize();
-                if( aOptSize.Height() > aTextSize.Height() )
-                    aTextSize.setHeight( aOptSize.Height() );
-            }
             aPos.AdjustX((nBoundWidth - aTextSize.Width()) / 2 );
             break;
 
@@ -2886,7 +2868,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
 
     OUString sQuickHelpText = pEntry->GetQuickHelpText();
     OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry ) );
-    tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, false, &aEntryText ) );
+    tools::Rectangle aTextRect( CalcTextRect( pEntry, nullptr, &aEntryText ) );
     if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() )
         return false;