loplugin:constantparam in chart2..connectivity

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

4 files changed, 11 insertions, 36 deletions

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 725e0cba2248..8a1d65859002 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -100,8 +100,7 @@ namespace svx
 
     public:
         void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
-            Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation,
-            vcl::ControlLayoutData* _pLayoutData = nullptr );
+            Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation );
     };
 
     PseudoRubyText::PseudoRubyText()
@@ -118,13 +117,8 @@ namespace svx
 
 
     void PseudoRubyText::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect, DrawTextFlags _nTextStyle,
-                               Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation,
-                               vcl::ControlLayoutData* _pLayoutData )
+                               Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation )
     {
-        bool bLayoutOnly  = (nullptr != _pLayoutData);
-        MetricVector* pTextMetrics = bLayoutOnly ? &_pLayoutData->m_aUnicodeBoundRects : nullptr;
-        OUString* pDisplayText = bLayoutOnly ? &_pLayoutData->m_aDisplayText       : nullptr;
-
         Size aPlaygroundSize(_rRect.GetSize());
 
         // the font for the secondary text:
@@ -194,10 +188,10 @@ namespace svx
         nDrawTextStyle &= ~DrawTextFlags( DrawTextFlags::Right | DrawTextFlags::Left | DrawTextFlags::Bottom | DrawTextFlags::Top );
         nDrawTextStyle |= DrawTextFlags::Center | DrawTextFlags::VCenter;
 
-        rRenderContext.DrawText( aPrimaryRect, m_sPrimaryText, nDrawTextStyle, pTextMetrics, pDisplayText );
+        rRenderContext.DrawText( aPrimaryRect, m_sPrimaryText, nDrawTextStyle );
         {
             FontSwitch aFontRestore(rRenderContext, aSmallerFont);
-            rRenderContext.DrawText( aSecondaryRect, m_sSecondaryText, nDrawTextStyle, pTextMetrics, pDisplayText );
+            rRenderContext.DrawText( aSecondaryRect, m_sSecondaryText, nDrawTextStyle );
         }
 
         // outta here
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index fbaaf4753159..3e38e4da4bf1 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -155,12 +155,11 @@ VCL_BUILDER_FACTORY_ARGS(SvtIconChoiceCtrl,
                          WB_NODRAGSELECTION | WB_TABSTOP);
 
 IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
-                                     const OUString& rUIXMLDescription,
-                                     const SfxItemSet *pItemSet )
+                                     const OUString& rUIXMLDescription )
 :   ModalDialog         ( pParent, rID, rUIXMLDescription ),
     mnCurrentPageId ( USHRT_MAX ),
 
-    pSet            ( pItemSet ),
+    pSet            ( nullptr ),
     pOutSet         ( nullptr ),
     pExampleSet     ( nullptr ),
     pRanges         ( nullptr ),
@@ -273,12 +272,9 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
     CreatePage      pCreateFunc /* != 0 */
 )
 {
-    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
-                                                         nullptr );
+    IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc );
     maPageList.push_back( pData );
 
-    pData->fnGetRanges = nullptr;
-
     sal_uInt16 *pId = new sal_uInt16 ( nId );
     SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->InsertEntry( rIconText, rChoiceIcon );
     pEntry->SetUserData ( static_cast<void*>(pId) );
@@ -531,20 +527,6 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
     std::vector<sal_uInt16> aUS;
 
     size_t nCount = maPageList.size();
-    for ( size_t i = 0; i < nCount; ++i )
-    {
-        IconChoicePageData* pData = maPageList[ i ];
-        if ( pData->fnGetRanges )
-        {
-            const sal_uInt16* pTmpRanges = (pData->fnGetRanges)();
-            const sal_uInt16* pIter = pTmpRanges;
-
-            sal_uInt16 nLen;
-            for( nLen = 0; *pIter; ++nLen, ++pIter )
-                ;
-            aUS.insert( aUS.end(), pTmpRanges, pTmpRanges + nLen );
-        }
-    }
 
     // remove double Id's
     {
diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx
index a83e11ac991f..6c02303647f2 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -21,8 +21,8 @@
 #include "dialmgr.hxx"
 #include "newtabledlg.hxx"
 
-SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent )
-    : m_pDialog( VclPtr<ModalDialog>::Create( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" ) )
+SvxNewTableDialog::SvxNewTableDialog()
+    : m_pDialog( VclPtr<ModalDialog>::Create( nullptr, "NewTableDialog", "cui/ui/newtabledialog.ui" ) )
 {
     m_pDialog->get(mpNumRows, "rows");
     m_pDialog->get(mpNumColumns, "columns");
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 95e4fbc3ebc6..3cceae8a9a74 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -71,7 +71,7 @@ using namespace css::document;
 
 void ShowErrorDialog( const Any& aException )
 {
-    std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( nullptr, aException ));
+    std::unique_ptr<SvxScriptErrorDialog> pDlg(new SvxScriptErrorDialog( aException ));
     pDlg->Execute();
 }
 
@@ -1434,8 +1434,7 @@ OUString GetErrorMessage( const css::uno::Any& aException )
 
 }
 
-SvxScriptErrorDialog::SvxScriptErrorDialog(
-    vcl::Window* , css::uno::Any aException )
+SvxScriptErrorDialog::SvxScriptErrorDialog( css::uno::Any aException )
     : m_sMessage()
 {
     SolarMutexGuard aGuard;