loplugin:constantparam

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

7 files changed, 11 insertions, 12 deletions

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 48b27079b58b..a2d3ce5b4c08 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -84,7 +84,7 @@ public:
     virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
 
     /// isolated only way to set GraphicObject to allow more actions when doing so
-    void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
+    void SetGraphic(const Graphic& rGraphic);
 
     /// wrappers for non-const calls at GraphicObject
     void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData, OutputDevice* pFirstFrameOutDev)
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 76f6f0b5d2ee..e06eaf120a81 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -149,7 +149,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
         {
             aGrfSz = ::GetGraphicSizeTwip( aGrf, nullptr );
 
-            pSwGrfNode->SetGraphic(aGrf, "");
+            pSwGrfNode->SetGraphic(aGrf);
             bUpdate = true;
 
             // Always use the correct graphic size
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index cd346b957123..635e0f8d80cd 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -367,9 +367,9 @@ void SwGrfNode::onGraphicChanged()
     }
 }
 
-void SwGrfNode::SetGraphic(const Graphic& rGraphic, const OUString& rLink)
+void SwGrfNode::SetGraphic(const Graphic& rGraphic)
 {
-    maGrfObj.SetGraphic(rGraphic, rLink);
+    maGrfObj.SetGraphic(rGraphic, OUString());
     onGraphicChanged();
 }
 
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 9f943e756d0e..3b09ec200ca9 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1789,8 +1789,7 @@ static Writer& OutCSS1_SwFootnoteInfo( Writer& rWrt, const SwEndNoteInfo& rInfo,
     return rWrt;
 }
 
-Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet,
-                                    const OUString& rEmbeddedGraphicName )
+Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
@@ -1805,6 +1804,7 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet,
     if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false,
                                                &pItem ) )
     {
+        OUString rEmbeddedGraphicName;
         OutCSS1_SvxBrush( rWrt, *pItem, Css1Background::Page, &rEmbeddedGraphicName );
     }
 
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index afc7e02f89fe..02a1eec40068 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1092,7 +1092,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
 
         if( m_bCfgOutStyles )
         {
-            OutCSS1_BodyTagStyleOpt( *this, rItemSet, OUString() );
+            OutCSS1_BodyTagStyleOpt( *this, rItemSet );
         }
         // append events
         if( m_pDoc->GetDocShell() )   // only with DocShell BASIC is possible
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index f3bf90476603..1aff873f8fc8 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -669,7 +669,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt );
 Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt );
 Writer& OutHTML_INetFormat( Writer&, const SwFormatINetFormat& rINetFormat, bool bOn );
 
-Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet, const OUString& rGraphicURL );
+Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet );
 Writer& OutCSS1_ParaTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet );
 
 Writer& OutCSS1_HintSpanTag( Writer& rWrt, const SfxPoolItem& rHt );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index aceb1dcf277e..7860245bd411 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -197,12 +197,11 @@ void lclGetAbsPath(OUString& rPath, sal_uInt16 nLevel, SwDocShell const * pDocSh
 
 namespace
 {
-    void lclIgnoreString32(SvStream& rStrm, bool b16Bit)
+    void lclIgnoreUString32(SvStream& rStrm)
     {
         sal_uInt32 nChars(0);
         rStrm.ReadUInt32(nChars);
-        if (b16Bit)
-            nChars *= 2;
+        nChars *= 2;
         rStrm.SeekRel(nChars);
     }
 }
@@ -241,7 +240,7 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, SwDocShell const * pDocS
 
     // description (ignore)
     if( ::get_flag( nFlags, WW8_HLINK_DESCR ) )
-        lclIgnoreString32( rStrm, true );
+        lclIgnoreUString32( rStrm );
 
     // target frame
     if( ::get_flag( nFlags, WW8_HLINK_FRAME ) )