loplugin:constantparam

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

5 files changed, 9 insertions, 14 deletions

diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index dc263e378d62..098956b246b3 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -253,8 +253,7 @@ public:
                        sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt,
                        sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust,
                        sal_uInt16 nLMargin, sal_uInt16 nRMargin, sal_uInt16 nBWidth,
-                       sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth,
-                       sal_uInt16 nInhLeftBWidth, sal_uInt16 nInhRightBWidth );
+                       sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth );
 
     ~SwHTMLTableLayout();
 
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 7d9d8e5bb2d4..a86030a01301 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -166,9 +166,7 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable,
                                       sal_uInt16 nCellSp, SvxAdjust eAdjust,
                                       sal_uInt16 nLMargin, sal_uInt16 nRMargin,
                                       sal_uInt16 nBWidth, sal_uInt16 nLeftBWidth,
-                                      sal_uInt16 nRightBWidth,
-                                      sal_uInt16 nInhLeftBWidth,
-                                      sal_uInt16 nInhRightBWidth )
+                                      sal_uInt16 nRightBWidth )
     : m_aColumns( nCls )
     , m_aCells( static_cast<size_t>(nRws)*nCls )
     , m_pSwTable( pTable )
@@ -191,8 +189,8 @@ SwHTMLTableLayout::SwHTMLTableLayout( const SwTable * pTable,
     , m_nBorder( nBorderOpt )
     , m_nLeftBorderWidth( nLeftBWidth )
     , m_nRightBorderWidth( nRightBWidth )
-    , m_nInhLeftBorderWidth( nInhLeftBWidth )
-    , m_nInhRightBorderWidth( nInhRightBWidth )
+    , m_nInhLeftBorderWidth( 0 )
+    , m_nInhRightBorderWidth( 0 )
     , m_nBorderWidth( nBWidth )
     , m_nDelayedResizeAbsAvail( 0 )
     , m_nLastResizeAbsAvail( 0 )
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index c595c7bc6f61..7c8e2ddb3ae5 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1100,8 +1100,7 @@ SwHTMLTableLayout *HTMLTable::CreateLayoutInfo()
                         nW, m_bPrcWidth, m_nBorder, m_nCellPadding,
                         m_nCellSpacing, m_eTableAdjust,
                         m_nLeftMargin, m_nRightMargin,
-                        nBorderWidth, nLeftBorderWidth, nRightBorderWidth,
-                        0/*nInhLeftBorderWidth*/, 0/*nInhRightBorderWidth*/ );
+                        nBorderWidth, nLeftBorderWidth, nRightBorderWidth );
 
     bool bExportable = true;
     sal_uInt16 i;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b1b7ca61eb81..9b8795fa63b9 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -21,6 +21,7 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 
 #include <i18nlangtag/languagetag.hxx>
@@ -493,8 +494,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
                                       const Graphic& rGrf,
                                       const tools::Rectangle& rBoundRect,
                                       const tools::Rectangle& rVisArea,
-                                      const int _nCalledByGroup,
-                                      sal_Int64 nAspect ) const
+                                      const int _nCalledByGroup ) const
 {
     // #i32596# - no import of OLE object, if it's inside a group.
     // NOTE: This can be undone, if grouping of Writer fly frames is possible or
@@ -523,7 +523,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
             ErrCode nError = ERRCODE_NONE;
             pRet = CreateSdrOLEFromStorage( sStorageName, xSrcStg, xDstStg,
                 rGrf, rBoundRect, rVisArea, pStData, nError,
-                nSvxMSDffOLEConvFlags, nAspect, rReader.GetBaseURL());
+                nSvxMSDffOLEConvFlags, css::embed::Aspects::MSOLE_CONTENT, rReader.GetBaseURL());
         }
     }
     return pRet;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d6abe149a5fb..a849d47b6507 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -749,8 +749,7 @@ private:
                                   const Graphic& rGrf,
                                   const tools::Rectangle& rBoundRect,
                                   const tools::Rectangle& rVisArea,
-                                  const int _nCalledByGroup,
-                                  sal_Int64 nAspect ) const override;
+                                  const int _nCalledByGroup ) const override;
 
     SwMSDffManager(const SwMSDffManager&) = delete;
     SwMSDffManager& operator=(const SwMSDffManager&) = delete;