From ff339c89b51ed571d55c762e43aa1a6ee9ada1cb Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 4 Apr 2017 14:13:00 +0200
Subject: loplugin:constantparam part2

Change-Id: I7ec4c946be52a6b56aee908426f95ecacc7b0746
Reviewed-on: https://gerrit.libreoffice.org/36072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 filter/source/msfilter/escherex.cxx | 8 ++++----
 filter/source/msfilter/msdffimp.cxx | 9 ++++-----
 filter/source/msfilter/svdfppt.cxx  | 4 ++--
 filter/source/msfilter/viscache.hxx | 4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'filter')

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index ce47bfccd440..122dca177e20 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4113,11 +4113,11 @@ sal_uInt32 EscherGraphicProvider::GetBlibStoreContainerSize( SvStream* pMergePic
 }
 
 void EscherGraphicProvider::WriteBlibStoreEntry(SvStream& rSt,
-    sal_uInt32 nBlipId, bool bWritePictureOffSet, sal_uInt32 nResize)
+    sal_uInt32 nBlipId, sal_uInt32 nResize)
 {
     if (nBlipId > mnBlibEntrys || nBlipId == 0)
         return;
-    mpBlibEntrys[nBlipId-1]->WriteBlibEntry(rSt, bWritePictureOffSet, nResize);
+    mpBlibEntrys[nBlipId-1]->WriteBlibEntry(rSt, true/*bWritePictureOffSet*/, nResize);
 }
 
 void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pMergePicStreamBSE )
@@ -4794,8 +4794,8 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm )
     }
 }
 
-EscherExGlobal::EscherExGlobal( EscherGraphicProviderFlags nGraphicProvFlags ) :
-    EscherGraphicProvider( nGraphicProvFlags ),
+EscherExGlobal::EscherExGlobal() :
+    EscherGraphicProvider( EscherGraphicProviderFlags::NONE ),
     mpPicStrm( nullptr ),
     mbHasDggCont( false ),
     mbPicStrmQueried( false )
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index cad1ea27f9a7..02c01d70cca3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5512,8 +5512,7 @@ SdrObject* SvxMSDffManager::FinalizeObj(DffObjData& /* rObjData */, SdrObject* p
 void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
                                       sal_uLong         nTxBx,
                                       SdrObject*    pObject,
-                                      SwFlyFrameFormat*  pFly,
-                                      short         nHdFtSection) const
+                                      SwFlyFrameFormat*  pFly) const
 {
     sal_uInt16 nShpCnt = m_pShapeOrders->size();
     for (sal_uInt16 nShapeNum=0; nShapeNum < nShpCnt; nShapeNum++)
@@ -5525,7 +5524,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong         nId,
             rOrder.nTxBxComp = nTxBx;
             rOrder.pObj      = pObject;
             rOrder.pFly      = pFly;
-            rOrder.nHdFtSection = nHdFtSection;
+            rOrder.nHdFtSection = 0;
         }
     }
 }
@@ -6578,7 +6577,7 @@ bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile &
     sal_uInt16 nAspect = ASPECT_CONTENT;
     sal_uLong nAdviseModes = 2;
 
-    Impl_OlePres aEle( SotClipboardFormatId::GDIMETAFILE );
+    Impl_OlePres aEle;
     // Convert the size in 1/100 mm
     // If a not applicable MapUnit (device dependent) is used,
     // SV tries to guess a best match for the right value
@@ -7290,7 +7289,7 @@ SvxMSDffImportRec::SvxMSDffImportRec()
       nCropFromBottom( 0 ),
       nCropFromLeft( 0 ),
       nCropFromRight( 0 ),
-      aTextId( 0, 0 ),
+      aTextId(),
       nNextShapeId( 0 ),
       nShapeId( 0 ),
       eShapeType( mso_sptNil ),
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 6cbec6992f76..088b01766a26 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -159,9 +159,9 @@ using namespace drawing             ;
 using namespace container           ;
 using namespace table               ;
 
-PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFlags ) :
+PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm ) :
     rDocStream      ( rDocStrm ),
-    nImportFlags    ( nFlags )
+    nImportFlags    ( 0 )
 {
 }
 
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 0a73ee75dbf6..a604f5d1015e 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -35,8 +35,8 @@ class Impl_OlePres
     sal_uInt32      nAdvFlags;
     Size            aSize;      // size in 100TH_MM
 public:
-    explicit Impl_OlePres( SotClipboardFormatId nF )
-        : nFormat( nF )
+    explicit Impl_OlePres()
+        : nFormat( SotClipboardFormatId::GDIMETAFILE )
         , nAspect( ASPECT_CONTENT )
         , pMtf( nullptr )
         , nAdvFlags( 0x2 )  // found in document
-- 
cgit