loplugin:checkunusedparams in sw(part4)

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

10 files changed, 28 insertions, 41 deletions

diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index d486ffb3c45f..f059050717ac 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1932,8 +1932,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
     return bRet;
 }
 
-void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
-                                           const SvxCSS1PropertyInfo &rPropInfo,
+void SwHTMLParser::SetAnchorAndAdjustment( const SvxCSS1PropertyInfo &rPropInfo,
                                            SfxItemSet &rFrameItemSet )
 {
     SwFormatAnchor aAnchor;
@@ -2037,8 +2036,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
     rFrameItemSet.Put( SwFormatSurround( eSurround ) );
 }
 
-void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
-                               SvxCSS1PropertyInfo &rPropInfo,
+void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
                                SfxItemSet &rFrameItemSet,
                                SwTwips nDfltWidth, sal_uInt8 nDfltPrcWidth )
 {
@@ -2079,7 +2077,6 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
 }
 
 void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
-                                   SvxCSS1PropertyInfo & /*rPropInfo*/,
                                    HtmlFrameFormatFlags nFlags,
                                    SfxItemSet &rFrameItemSet )
 {
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index f528368230b5..423f2b670155 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -412,14 +412,14 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
         if( !IsNewDoc() )
             Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
-        SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, rItemSet, rPropInfo,
+        SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, rPropInfo,
                                 aFrameItemSet );
 
-        SetVarSize( rItemSet, rPropInfo, aFrameItemSet );
+        SetVarSize( rPropInfo, aFrameItemSet );
 
         SetSpace( Size(0,0), rItemSet, rPropInfo, aFrameItemSet );
 
-        SetFrameFormatAttrs( rItemSet, rPropInfo,
+        SetFrameFormatAttrs( rItemSet,
                         HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Padding|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
                         aFrameItemSet );
 
@@ -447,12 +447,12 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
             Reader::ResetFrameFormatAttrs( *pFrameItemSet );
 
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE,
-                                rItemSet, rPropInfo, *pFrameItemSet );
+                                rPropInfo, *pFrameItemSet );
         Size aDummy(0,0);
         SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
                     *pFrameItemSet );
         SetSpace( aDummy, rItemSet, rPropInfo, *pFrameItemSet );
-        SetFrameFormatAttrs( rItemSet, rPropInfo, HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
+        SetFrameFormatAttrs( rItemSet, HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
                         *pFrameItemSet );
 
         bRet = true;
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 751f89c3cfb5..3cd38830f0aa 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -134,8 +134,7 @@ static Writer& OutHTML_FrameFormatAsMulticol( Writer& rWrt, const SwFrameFormat&
 static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& rFormat );
 static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
                                           const SwFrameFormat& rFrameFormat, bool bSpan );
-static Writer& OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFormat,
-                                      bool bInCntnr );
+static Writer& OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFormat );
 
 static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rFormat,
                                       bool bInCntnr );
@@ -501,7 +500,7 @@ void SwHTMLWriter::OutFrameFormat( AllHtmlFlags nMode, const SwFrameFormat& rFra
                     static_cast<const SwDrawFrameFormat &>(rFrameFormat), *pSdrObject );
         break;
     case HtmlOut::GraphicFrame:
-        OutHTML_FrameFormatAsImage( *this, rFrameFormat, pCntnrStr != nullptr );
+        OutHTML_FrameFormatAsImage( *this, rFrameFormat );
         break;
     }
 
@@ -1710,8 +1709,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
     return rWrt;
 }
 
-static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFrameFormat,
-                                       bool /*bInCntnr*/ )
+static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& rFrameFormat )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 1ee611cfd9f5..8e6ef04b7c65 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -146,11 +146,8 @@ void SwHTMLParser::ConnectImageMaps()
     }
 }
 
-/*  */
-
 void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                            sal_Int16 eHoriOri,
-                                           const SfxItemSet &rCSS1ItemSet,
                                            const SvxCSS1PropertyInfo &rCSS1PropInfo,
                                            SfxItemSet& rFrameItemSet )
 {
@@ -167,7 +164,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
     else if( SwCSS1Parser::MayBePositioned( rCSS1PropInfo, true ) )
     {
         // If the alignment can be set via CSS1 options we use them.
-        SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrameItemSet );
+        SetAnchorAndAdjustment( rCSS1PropInfo, rFrameItemSet );
     }
     else
     {
@@ -535,12 +532,12 @@ IMAGE_SETEVENT:
         aFrameSet.Put( aBoxItem );
     }
 
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, aFrameSet );
 
     SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrameSet );
 
     // set other CSS1 attributes
-    SetFrameFormatAttrs( aItemSet, aPropInfo, HtmlFrameFormatFlags::Box, aFrameSet );
+    SetFrameFormatAttrs( aItemSet, HtmlFrameFormatFlags::Box, aFrameSet );
 
     Size aTwipSz( bPrcWidth ? 0 : nWidth, bPrcHeight ? 0 : nHeight );
     if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() )
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index 66109b02cab7..d4d4895521e3 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -549,8 +549,7 @@ void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken )
     ShowStatline();
 }
 
-void SwHTMLParser::EndNumBulListItem( HtmlTokenId nToken, bool bSetColl,
-                                      bool /*bLastPara*/ )
+void SwHTMLParser::EndNumBulListItem( HtmlTokenId nToken, bool bSetColl )
 {
     // Create a new paragraph
     if( nToken == HtmlTokenId::NONE && m_pPam->GetPoint()->nContent.GetIndex() )
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 3e5b9de50293..adc048cb3b67 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -439,7 +439,7 @@ void SwHTMLParser::InsertEmbed()
     // den Anker setzen
     if( !bHidden )
     {
-        SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet );
+        SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, aFrameSet );
     }
     else
     {
@@ -610,7 +610,7 @@ void SwHTMLParser::NewObject()
         Reader::ResetFrameFormatAttrs( rFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, rFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
@@ -744,7 +744,7 @@ void SwHTMLParser::InsertApplet()
         Reader::ResetFrameFormatAttrs( rFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, rFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
@@ -927,7 +927,7 @@ void SwHTMLParser::InsertFloatingFrame()
         Reader::ResetFrameFormatAttrs( aFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, aFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 3d18e2c40e88..b1151ca37313 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -617,19 +617,19 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         if( !IsNewDoc() )
             Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
-        SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, aItemSet, aPropInfo,
+        SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, aPropInfo,
                                 aFrameItemSet );
 
         // The width is either the WIDTH attribute's value or contained
         // in some style option.
-        SetVarSize( aItemSet, aPropInfo, aFrameItemSet, nTwipWidth, nPrcWidth );
+        SetVarSize( aPropInfo, aFrameItemSet, nTwipWidth, nPrcWidth );
 
         SetSpace( Size(0,0), aItemSet, aPropInfo, aFrameItemSet );
 
         // Set some other frame attributes. If the background is set, its
         // it will be cleared here. That for, it won't be set at the section,
         // too.
-        SetFrameFormatAttrs( aItemSet, aPropInfo,
+        SetFrameFormatAttrs( aItemSet,
                         HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Padding|HtmlFrameFormatFlags::Direction,
                         aFrameItemSet );
 
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index b319109f3b26..35b8f59e981f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -495,7 +495,7 @@ class HTMLTable
     // Setting the border with the help of guidelines of the Parent-Table
     void InheritBorders( const HTMLTable *pParent,
                          sal_uInt16 nRow, sal_uInt16 nCol,
-                         sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
+                         sal_uInt16 nRowSpan,
                          bool bFirstPara, bool bLastPara );
 
     // Inherit the left and the right border of the surrounding table
@@ -1789,7 +1789,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
 
 void HTMLTable::InheritBorders( const HTMLTable *pParent,
                                 sal_uInt16 nRow, sal_uInt16 nCol,
-                                sal_uInt16 nRowSpan, sal_uInt16 /*nColSpan*/,
+                                sal_uInt16 nRowSpan,
                                 bool bFirstPara, bool bLastPara )
 {
     OSL_ENSURE( m_nRows>0 && m_nCols>0 && m_nCurrentRow==m_nRows,
@@ -1924,7 +1924,6 @@ void HTMLTable::SetBorders()
                     {
                         pTable->InheritBorders( this, i, j,
                                                 pCell->GetRowSpan(),
-                                                pCell->GetColSpan(),
                                                 bFirstPara,
                                                 nullptr==pCnts->Next() );
                         pTable->SetBorders();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4ecd85550174..96b8dc578475 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1709,7 +1709,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
     case HtmlTokenId::UNORDERLIST_OFF:
         if( m_nOpenParaToken != HtmlTokenId::NONE )
             EndPara();
-        EndNumBulListItem( HtmlTokenId::NONE, true, GetNumInfo().GetDepth()==1 );
+        EndNumBulListItem( HtmlTokenId::NONE, true );
         EndNumBulList( nToken );
         break;
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index b23528a9732e..a1ef95e54d8c 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -613,8 +613,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void NewNumBulList( HtmlTokenId nToken );
     void EndNumBulList( HtmlTokenId nToken = HtmlTokenId::NONE );
     void NewNumBulListItem( HtmlTokenId nToken );
-    void EndNumBulListItem( HtmlTokenId nToken, bool bSetColl,
-                            bool bLastPara=false );
+    void EndNumBulListItem( HtmlTokenId nToken, bool bSetColl);
 
     // definitions lists <DL> with <DD>, <DT>
     void NewDefList();
@@ -663,18 +662,16 @@ private:
     // in Attrset (htmlgrin.cxx)
     void SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                  sal_Int16 eHoriOri,
-                                 const SfxItemSet &rItemSet,
                                  const SvxCSS1PropertyInfo &rPropInfo,
                                  SfxItemSet& rFrameSet );
     void SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                  sal_Int16 eHoriOri,
                                  SfxItemSet& rFrameSet,
                                  bool bDontAppend=false );
-    void SetAnchorAndAdjustment( const SfxItemSet &rItemSet,
-                                 const SvxCSS1PropertyInfo &rPropInfo,
+    void SetAnchorAndAdjustment( const SvxCSS1PropertyInfo &rPropInfo,
                                  SfxItemSet &rFrameItemSet );
 
-    static void SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
+    static void SetFrameFormatAttrs( SfxItemSet &rItemSet,
                          HtmlFrameFormatFlags nFlags, SfxItemSet &rFrameItemSet );
 
     // create frames and register auto bound frames
@@ -686,7 +683,7 @@ private:
                      bool bPrcWidth, bool bPrcHeight,
                      SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet );
-    static void SetVarSize( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
+    static void SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet, SwTwips nDfltWidth=MINLAY,
                      sal_uInt8 nDltPrcWidth=0 );
     static void SetSpace( const Size& rPixSpace, SfxItemSet &rItemSet,