loplugin:checkunusedparams in sw

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

32 files changed, 120 insertions, 177 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 07208deea24d..591b730fde30 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1203,8 +1203,7 @@ public:
                     const SwCellFrame* pBoxFrame );
     void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
                     const SwCellFrame* pBoxFrame );
-    static void GetTabRows( SwTabCols &rFill, const SwCursor* pCursor,
-                    const SwCellFrame* pBoxFrame );
+    static void GetTabRows( SwTabCols &rFill, const SwCellFrame* pBoxFrame );
     void SetTabRows( const SwTabCols &rNew, bool bCurColOnly,
                     const SwCellFrame* pBoxFrame );
 
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 10bb1ac1f57d..b1fb68ff9785 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -529,7 +529,7 @@ class SwExtUserFieldType : public SwFieldType
 public:
     SwExtUserFieldType();
 
-    static OUString         Expand(sal_uInt16 nSubType, sal_uInt32 nFormat);
+    static OUString         Expand(sal_uInt16 nSubType);
     virtual SwFieldType*    Copy() const override;
 };
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 3631e5f62f4d..44056b7ee190 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -790,8 +790,7 @@ bool SwAccessibleParagraph::GetLineBoundary(
 
 bool SwAccessibleParagraph::GetParagraphBoundary(
     i18n::Boundary& rBound,
-    const OUString& rText,
-    sal_Int32 )
+    const OUString& rText )
 {
     rBound.startPos = 0;
     rBound.endPos = rText.getLength();
@@ -859,7 +858,7 @@ bool SwAccessibleParagraph::GetTextBoundary(
             break;
 
         case AccessibleTextType::PARAGRAPH:
-            bRet = GetParagraphBoundary( rBound, rText, nPos );
+            bRet = GetParagraphBoundary( rBound, rText );
             break;
 
         case AccessibleTextType::CHARACTER:
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 03cea24198dc..7a726822ebfc 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -209,8 +209,7 @@ protected:
                               const OUString& rText,
                               sal_Int32 nPos );
     static bool GetParagraphBoundary( css::i18n::Boundary& rBound,
-                                   const OUString& rText,
-                                   sal_Int32 nPos );
+                                   const OUString& rText );
     bool GetAttributeBoundary( css::i18n::Boundary& rBound,
                                    sal_Int32 nPos );
     bool GetGlyphBoundary( css::i18n::Boundary& rBound,
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 636325f872b5..775f62ba3509 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1378,9 +1378,7 @@ void DocumentFieldsManager::SetFixFields( const DateTime* pNewDateTime )
                     {
                         bChgd = true;
                         SwExtUserField* pExtUserField = static_cast<SwExtUserField*>(pFormatField->GetField());
-                        pExtUserField->SetExpansion( SwExtUserFieldType::Expand(
-                                            pExtUserField->GetSubType(),
-                                            pExtUserField->GetFormat()));
+                        pExtUserField->SetExpansion( SwExtUserFieldType::Expand(pExtUserField->GetSubType()) );
                     }
                     break;
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 8b4fb2936fe2..a1f7a5e28547 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2584,8 +2584,7 @@ static bool lcl_IsFrameInColumn( const SwCellFrame& rFrame, SwSelBoxes& rBoxes )
     return false;
 }
 
-void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
-                        const SwCellFrame* pBoxFrame )
+void SwDoc::GetTabRows( SwTabCols &rFill, const SwCellFrame* pBoxFrame )
 {
     OSL_ENSURE( pBoxFrame, "GetTabRows called without pBoxFrame" );
 
@@ -2816,7 +2815,7 @@ void SwDoc::SetTabRows( const SwTabCols &rNew, bool bCurColOnly,
     }
     aOld.SetLeftMin ( nLeftMin );
 
-    GetTabRows( aOld, nullptr, pBoxFrame );
+    GetTabRows( aOld, pBoxFrame );
 
     GetIDocumentUndoRedo().StartUndo( SwUndoId::TABLE_ATTR, nullptr );
 
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index e228308cd205..969ac29d08bb 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1855,7 +1855,7 @@ SwFieldType* SwExtUserFieldType::Copy() const
     return pTyp;
 }
 
-OUString SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 )
+OUString SwExtUserFieldType::Expand(sal_uInt16 nSub )
 {
     UserOptToken nRet = static_cast<UserOptToken>(USHRT_MAX);
     switch(nSub)
@@ -1893,13 +1893,13 @@ OUString SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 )
 SwExtUserField::SwExtUserField(SwExtUserFieldType* pTyp, sal_uInt16 nSubTyp, sal_uInt32 nFormat) :
     SwField(pTyp, nFormat), nType(nSubTyp)
 {
-    aContent = SwExtUserFieldType::Expand(nType, GetFormat());
+    aContent = SwExtUserFieldType::Expand(nType);
 }
 
 OUString SwExtUserField::Expand() const
 {
     if (!IsFixed())
-        const_cast<SwExtUserField*>(this)->aContent = SwExtUserFieldType::Expand(nType, GetFormat());
+        const_cast<SwExtUserField*>(this)->aContent = SwExtUserFieldType::Expand(nType);
 
     return aContent;
 }
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 3162adff5e6d..89836edd94f1 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -621,7 +621,7 @@ void SwFEShell::GetTabRows_( SwTabCols &rToFill, const SwFrame *pBox )
     }
     if ( !pLastRows )
     {
-        SwDoc::GetTabRows( rToFill, nullptr, static_cast<const SwCellFrame*>(pBox) );
+        SwDoc::GetTabRows( rToFill, static_cast<const SwCellFrame*>(pBox) );
 
         pLastRows   = new SwTabCols( rToFill );
         g_pRowCacheLastTable = pTab->GetTable();
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 35835e61148b..36c261f11088 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -81,8 +81,7 @@ static SwTwips lcl_CalcContentHeight(SwLayoutFrame & frm)
     return nRemaining;
 }
 
-static void lcl_LayoutFrameEnsureMinHeight(SwLayoutFrame & rFrame,
-                                         const SwBorderAttrs * )
+static void lcl_LayoutFrameEnsureMinHeight(SwLayoutFrame & rFrame)
 {
     SwTwips nMinHeight = lcl_GetFrameMinHeight(rFrame);
 
@@ -405,7 +404,7 @@ void SwHeadFootFrame::Format(vcl::RenderContext* pRenderContext, const SwBorderA
     }
     else
     {
-        lcl_LayoutFrameEnsureMinHeight(*this, pAttrs);
+        lcl_LayoutFrameEnsureMinHeight(*this);
 
         long nUL = pAttrs->CalcTop()  + pAttrs->CalcBottom();
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2bca01b9ca08..3b0e364f601c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4886,9 +4886,7 @@ static void lcl_MakeBorderLine(SwRect const& rRect,
  */
 static void lcl_PaintLeftRightLine( const bool         _bLeft,
                              const SwFrame&           _rFrame,
-                             const SwPageFrame&       /*_rPage*/,
                              const SwRect&          _rOutRect,
-                             const SwRect&          /*_rRect*/,
                              const SwBorderAttrs&   _rAttrs,
                              const SwRectFn&        _rRectFn,
                              SwPaintProperties& properties)
@@ -4967,10 +4965,7 @@ static void lcl_PaintLeftRightLine( const bool         _bLeft,
  * into <lcl_PaintTopLine>
  */
 static void lcl_PaintTopBottomLine( const bool         _bTop,
-                             const SwFrame&           ,
-                             const SwPageFrame&       /*_rPage*/,
                              const SwRect&          _rOutRect,
-                             const SwRect&          /*_rRect*/,
                              const SwBorderAttrs&   _rAttrs,
                              const SwRectFn&        _rRectFn,
                              SwPaintProperties& properties)
@@ -5468,8 +5463,8 @@ void SwFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage,
         {
             const SwFrame* pDirRefFrame = IsCellFrame() ? FindTabFrame() : this;
             SwRectFnSet aRectFnSet(pDirRefFrame);
-            ::lcl_PaintLeftRightLine ( true, *(this), *pPage, aRect, rRect, rAttrs, aRectFnSet.FnRect(), gProp);
-            ::lcl_PaintLeftRightLine ( false, *(this), *pPage, aRect, rRect, rAttrs, aRectFnSet.FnRect(), gProp);
+            ::lcl_PaintLeftRightLine ( true, *(this), aRect, rAttrs, aRectFnSet.FnRect(), gProp);
+            ::lcl_PaintLeftRightLine ( false, *(this), aRect, rAttrs, aRectFnSet.FnRect(), gProp);
             if ( !IsContentFrame() || rAttrs.GetTopLine( *(this) ) )
             {
                 // -
@@ -5480,11 +5475,11 @@ void SwFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage,
                     SwBorderAttrAccess aAccess( SwFrame::GetCache(),
                                                 pCellFrameForTopBorderAttrs );
                     const SwBorderAttrs &rTopAttrs = *aAccess.Get();
-                    ::lcl_PaintTopBottomLine( true, *(this), *pPage, aRect, rRect, rTopAttrs, aRectFnSet.FnRect(), gProp);
+                    ::lcl_PaintTopBottomLine( true, aRect, rTopAttrs, aRectFnSet.FnRect(), gProp);
                 }
                 else
                 {
-                    ::lcl_PaintTopBottomLine( true, *(this), *pPage, aRect, rRect, rAttrs, aRectFnSet.FnRect(), gProp );
+                    ::lcl_PaintTopBottomLine( true, aRect, rAttrs, aRectFnSet.FnRect(), gProp );
                 }
             }
             if ( !IsContentFrame() || rAttrs.GetBottomLine( *(this) ) )
@@ -5497,11 +5492,11 @@ void SwFrame::PaintBorder( const SwRect& rRect, const SwPageFrame *pPage,
                     SwBorderAttrAccess aAccess( SwFrame::GetCache(),
                                                 pCellFrameForBottomBorderAttrs );
                     const SwBorderAttrs &rBottomAttrs = *aAccess.Get();
-                    ::lcl_PaintTopBottomLine(false, *(this), *pPage, aRect, rRect, rBottomAttrs, aRectFnSet.FnRect(), gProp);
+                    ::lcl_PaintTopBottomLine(false, aRect, rBottomAttrs, aRectFnSet.FnRect(), gProp);
                 }
                 else
                 {
-                    ::lcl_PaintTopBottomLine(false, *(this), *pPage, aRect, rRect, rAttrs, aRectFnSet.FnRect(), gProp);
+                    ::lcl_PaintTopBottomLine(false, aRect, rAttrs, aRectFnSet.FnRect(), gProp);
                 }
             }
         }
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index 5fa2af0aedac..aadf0dced20d 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -62,10 +62,6 @@ bool SwRootFrame::HasSameRect( const SwRect& rRect )
     @param _pVirDev
     input/output parameter - instance of the virtual output device.
 
-    @param _pMapMode
-    input/output parameter - instance of the mapping mode, which will be set
-    at the virtual output device.
-
     @param _rNewOrigin
     input parameter - constant instance of the origin, which will be used in
     the virtual output device
@@ -73,7 +69,6 @@ bool SwRootFrame::HasSameRect( const SwRect& rRect )
 // define to control, if old or new solution for setting the mapping for
 // an virtual output device is used.
 void SetMappingForVirtDev(  const Point&    _rNewOrigin,
-                            MapMode*        ,
                             const vcl::RenderContext* _pOrgOutDev,
                             vcl::RenderContext*  _pVirDev )
 {
@@ -170,7 +165,7 @@ void SwLayVout::Enter(  SwViewShell *pShell, SwRect &rRect, bool bOn )
         MapMode aMapMode( pOut->GetMapMode() );
         // OD 12.11.2002 #96272# - use method to set mapping
         //aMapMode.SetOrigin( Point(0,0) - aRect.Pos() );
-        ::SetMappingForVirtDev( aRect.Pos(), &aMapMode, pOut, pVirDev );
+        ::SetMappingForVirtDev( aRect.Pos(), pOut, pVirDev );
 
         if( aMapMode != pVirDev->GetMapMode() )
             pVirDev->SetMapMode( aMapMode );
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index a4e669327098..05ad9d164281 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -69,8 +69,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
+    SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
@@ -82,8 +81,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport,
-        const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
+    SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override;
@@ -95,8 +93,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport,
-                const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
+    SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
         sal_Int32 Element,
@@ -109,8 +106,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport,
-            const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
+    SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport );
 
     virtual void SAL_CALL characters( const OUString & aChars ) override;
 
@@ -218,8 +214,7 @@ SwXMLBlockContext::SwXMLBlockContext(
 }
 
 SwXMLTextBlockDocumentContext::SwXMLTextBlockDocumentContext(
-    SwXMLTextBlockImport& rImport,
-    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
+    SwXMLTextBlockImport& rImport ) :
     SvXMLImportContext( rImport ),
     rLocalRef(rImport)
 {
@@ -227,17 +222,16 @@ SwXMLTextBlockDocumentContext::SwXMLTextBlockDocumentContext(
 
 uno::Reference< ::xml::sax::XFastContextHandler > SAL_CALL
 SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element,
-    const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
+    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ )
 {
     if ( Element == SwXMLTextBlockToken::OFFICE_BODY )
-        return new SwXMLTextBlockBodyContext( rLocalRef, xAttrList );
+        return new SwXMLTextBlockBodyContext( rLocalRef );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLTextBlockTextContext::SwXMLTextBlockTextContext(
-    SwXMLTextBlockImport& rImport,
-    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList */) :
+    SwXMLTextBlockImport& rImport) :
     SvXMLImportContext ( rImport ),
     rLocalRef( rImport )
 {
@@ -245,17 +239,16 @@ SwXMLTextBlockTextContext::SwXMLTextBlockTextContext(
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element,
-    const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
+    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ )
 {
     if ( Element == SwXMLTextBlockToken::TEXT_P )
-        return new SwXMLTextBlockParContext( rLocalRef, xAttrList );
+        return new SwXMLTextBlockParContext( rLocalRef );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext(
-    SwXMLTextBlockImport& rImport,
-    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
+    SwXMLTextBlockImport& rImport ) :
     SvXMLImportContext( rImport ),
     rLocalRef(rImport)
 {
@@ -263,19 +256,18 @@ SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext(
 
 uno::Reference < xml::sax::XFastContextHandler > SAL_CALL
 SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element,
-    const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
+    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ )
 {
     if( Element == SwXMLTextBlockToken::OFFICE_TEXT )
-        return new SwXMLTextBlockTextContext( rLocalRef, xAttrList );
+        return new SwXMLTextBlockTextContext( rLocalRef );
     else if( Element == SwXMLTextBlockToken::TEXT_P )
-        return new SwXMLTextBlockParContext( rLocalRef, xAttrList );
+        return new SwXMLTextBlockParContext( rLocalRef );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLTextBlockParContext::SwXMLTextBlockParContext(
-    SwXMLTextBlockImport& rImport,
-    const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
+    SwXMLTextBlockImport& rImport ) :
     SvXMLImportContext( rImport ),
     rLocalRef( rImport )
 {
@@ -340,7 +332,7 @@ SvXMLImportContext* SwXMLTextBlockImport::CreateFastContext( sal_Int32 Element,
 {
     if( Element == SwXMLTextBlockToken::OFFICE_DOCUMENT ||
         Element == SwXMLTextBlockToken::OFFICE_DOCUMENT_CONTENT )
-        return new SwXMLTextBlockDocumentContext( *this, xAttrList );
+        return new SwXMLTextBlockDocumentContext( *this );
     else
         return SvXMLImport::CreateFastContext( Element, xAttrList );
 }
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index e0d95b20b633..746bae9ff469 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -2499,8 +2499,7 @@ void SAL_CALL SwXTextField::update()
             {
                 SwExtUserField* pExtUserField = static_cast<SwExtUserField*>(pField);
                 pExtUserField->SetExpansion( SwExtUserFieldType::Expand(
-                                            pExtUserField->GetSubType(),
-                                            pExtUserField->GetFormat() ) );
+                                            pExtUserField->GetSubType() ) );
             }
             break;
 
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 4e67462f6ade..f023c0c05db4 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -452,8 +452,7 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE,
                                 rPropInfo, *pFrameItemSet );
         Size aDummy(0,0);
-        SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
-                    *pFrameItemSet );
+        SetFixSize( aDummy, aDummy, false, false, rPropInfo, *pFrameItemSet );
         SetSpace( aDummy, rItemSet, rPropInfo, *pFrameItemSet );
         SetFrameFormatAttrs( rItemSet, HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
                         *pFrameItemSet );
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 981a479b9490..62735d555e71 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -120,7 +120,6 @@ const HtmlFrmOpts HTML_FRMOPTS_OLE_CSS1       =
 void SwHTMLParser::SetFixSize( const Size& rPixSize,
                                const Size& rTwipDfltSize,
                                bool bPrcWidth, bool bPrcHeight,
-                               SfxItemSet& /*rCSS1ItemSet*/,
                                SvxCSS1PropertyInfo& rCSS1PropInfo,
                                SfxItemSet& rFlyItemSet )
 {
@@ -449,8 +448,7 @@ void SwHTMLParser::InsertEmbed()
 
     // and the size of the frame
     Size aDfltSz( HTML_DFLT_EMBED_WIDTH, HTML_DFLT_EMBED_HEIGHT );
-    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                aFrameSet );
+    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aPropInfo, aFrameSet );
     SetSpace( aSpace, aItemSet, aPropInfo, aFrameSet );
 
     // and insert into the document
@@ -612,8 +610,7 @@ void SwHTMLParser::NewObject()
 
     // and still the size of the frame
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
-    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                rFrameSet );
+    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aPropInfo, rFrameSet );
     SetSpace( aSpace, aItemSet, aPropInfo, rFrameSet );
 }
 #endif
@@ -746,8 +743,7 @@ void SwHTMLParser::InsertApplet()
 
     // and still the size or the frame
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
-    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                rFrameSet );
+    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aPropInfo, rFrameSet );
     SetSpace( aSpace, aItemSet, aPropInfo, rFrameSet );
 }
 #endif
@@ -929,8 +925,7 @@ void SwHTMLParser::InsertFloatingFrame()
 
     // and still the size of the frame
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
-    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                aFrameSet );
+    SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aPropInfo, aFrameSet );
     SetSpace( aSpace, aItemSet, aPropInfo, aFrameSet );
 
     // and insert into the document
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 5c84a9c7fc43..fdba8e03b3d9 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -2417,9 +2417,7 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
 }
 
 static bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
-                                   SfxItemSet & /*rItemSet*/,
                                    SvxCSS1PropertyInfo& rPropInfo,
-                                   const SvxCSS1Parser& /*rParser*/,
                                    SvxBoxItemLine nWhichLine )
 {
     OSL_ENSURE( pExpr, "no expression" );
@@ -2475,50 +2473,47 @@ static bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
 }
 
 static void ParseCSS1_padding_top( const CSS1Expression *pExpr,
-                                   SfxItemSet &rItemSet,
+                                   SfxItemSet & /*rItemSet*/,
                                    SvxCSS1PropertyInfo& rPropInfo,
-                                   const SvxCSS1Parser& rParser )
+                                   const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_padding_xxx( pExpr, rItemSet, rPropInfo, rParser, SvxBoxItemLine::TOP );
+    ParseCSS1_padding_xxx( pExpr, rPropInfo, SvxBoxItemLine::TOP );
 }
 
 static void ParseCSS1_padding_bottom( const CSS1Expression *pExpr,
-                                      SfxItemSet &rItemSet,
+                                      SfxItemSet & /*rItemSet*/,
                                       SvxCSS1PropertyInfo& rPropInfo,
-                                      const SvxCSS1Parser& rParser )
+                                      const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_padding_xxx( pExpr, rItemSet, rPropInfo, rParser,
-                           SvxBoxItemLine::BOTTOM );
+    ParseCSS1_padding_xxx( pExpr, rPropInfo, SvxBoxItemLine::BOTTOM );
 }
 
 static void ParseCSS1_padding_left( const CSS1Expression *pExpr,
-                                    SfxItemSet &rItemSet,
+                                    SfxItemSet & /*rItemSet*/,
                                     SvxCSS1PropertyInfo& rPropInfo,
-                                    const SvxCSS1Parser& rParser )
+                                    const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_padding_xxx( pExpr, rItemSet, rPropInfo, rParser, SvxBoxItemLine::LEFT );
+    ParseCSS1_padding_xxx( pExpr, rPropInfo, SvxBoxItemLine::LEFT );
 }
 
 static void ParseCSS1_padding_right( const CSS1Expression *pExpr,
-                                     SfxItemSet &rItemSet,
+                                     SfxItemSet & /*rItemSet*/,
                                      SvxCSS1PropertyInfo& rPropInfo,
-                                     const SvxCSS1Parser& rParser )
+                                     const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_padding_xxx( pExpr, rItemSet, rPropInfo, rParser,
-                           SvxBoxItemLine::RIGHT );
+    ParseCSS1_padding_xxx( pExpr, rPropInfo, SvxBoxItemLine::RIGHT );
 }
 
 static void ParseCSS1_padding( const CSS1Expression *pExpr,
-                               SfxItemSet &rItemSet,
+                               SfxItemSet & /*rItemSet*/,
                                SvxCSS1PropertyInfo& rPropInfo,
-                               const SvxCSS1Parser& rParser )
+                               const SvxCSS1Parser& /*rParser*/ )
 {
     int n=0;
     while( n<4 && pExpr && !pExpr->GetOp() )
     {
         SvxBoxItemLine nLine = n==0 || n==2 ? SvxBoxItemLine::BOTTOM : SvxBoxItemLine::LEFT;
-        if( ParseCSS1_padding_xxx( pExpr, rItemSet, rPropInfo, rParser,
-                                   nLine ) )
+        if( ParseCSS1_padding_xxx( pExpr, rPropInfo, nLine ) )
         {
             if( n==0 )
             {
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 48e895a7edfa..c56a4077c187 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -4848,7 +4848,7 @@ void SwHTMLParser::InsertSpacer()
             SvxCSS1PropertyInfo aDummyPropInfo;
 
             SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight,
-                        aDummyItemSet, aDummyPropInfo, aFrameSet );
+                        aDummyPropInfo, aFrameSet );
             SetSpace( aSpace, aDummyItemSet, aDummyPropInfo, aFrameSet );
 
             // protect the content
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 80233b825bcf..99932c7643ad 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -677,7 +677,7 @@ private:
     // (not for graphics, therefore htmlplug.cxx)
     static void SetFixSize( const Size& rPixSize, const Size& rTwipDfltSize,
                      bool bPrcWidth, bool bPrcHeight,
-                     SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
+                     SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet );
     static void SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet, SwTwips nDfltWidth=MINLAY,
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index d31fe60928e7..7f6f312e5d8b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7214,7 +7214,7 @@ void DocxAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
 }
 
 static void impl_WriteTabElement( FSHelperPtr const & pSerializer,
-                                  const SvxTabStop& rTab, long /* nCurrentLeft */ )
+                                  const SvxTabStop& rTab )
 {
     FastAttributeList *pTabElementAttrList = FastSerializerHelper::createAttrList();
 
@@ -7258,9 +7258,6 @@ static void impl_WriteTabElement( FSHelperPtr const & pSerializer,
 
 void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
 {
-    const SfxPoolItem* pLR = m_rExport.HasItem( RES_LR_SPACE );
-    long nCurrentLeft = pLR ? static_cast<const SvxLRSpaceItem*>(pLR)->GetTextLeft() : 0;
-
     sal_uInt16 nCount = rTabStop.Count();
 
     // <w:tabs> must contain at least one <w:tab>, so don't write it empty
@@ -7277,7 +7274,7 @@ void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
     for (sal_uInt16 i = 0; i < nCount; i++ )
     {
         if( rTabStop[i].GetAdjustment() != SvxTabAdjust::Default )
-            impl_WriteTabElement( m_pSerializer, rTabStop[i], nCurrentLeft );
+            impl_WriteTabElement( m_pSerializer, rTabStop[i] );
         else
             GetExport().setDefaultTabStop( rTabStop[i].GetTabPos());
     }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 11f2b7d56a7f..bda4776a8572 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -238,7 +238,7 @@ void RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNo
                 StartTableRow(pDeepInner);
             }
 
-            StartTableCell(pDeepInner);
+            StartTableCell();
         }
 
         // Again, if depth was incremented, start a new table even if we skipped the first cell.
@@ -257,9 +257,9 @@ void RtfAttributeOutput::StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNo
                     ww8::WW8TableNodeInfoInner::Pointer_t pInner(pTextNodeInfo->getInnerForDepth(nDepth));
 
                     m_bLastTable = (nDepth == pTextNodeInfo->getDepth());
-                    StartTable(pInner);
+                    StartTable();
                     StartTableRow(pInner);
-                    StartTableCell(pInner);
+                    StartTableCell();
                 }
 
                 m_nTableDepth = nCurrentDepth;
@@ -972,7 +972,7 @@ void RtfAttributeOutput::InitTableHelper(const ww8::WW8TableNodeInfoInner::Point
         m_pTableWrt = o3tl::make_unique<SwWriteTable>(pTable, pTable->GetTabLines(), nPageSize, nTableSz, false);
 }
 
-void RtfAttributeOutput::StartTable(const ww8::WW8TableNodeInfoInner::Pointer_t& /*pTableTextNodeInfoInner*/)
+void RtfAttributeOutput::StartTable()
 {
     // To trigger calling InitTableHelper()
     m_pTableWrt.reset(nullptr);
@@ -998,7 +998,7 @@ void RtfAttributeOutput::StartTableRow(const ww8::WW8TableNodeInfoInner::Pointer
     m_rExport.Strm().WriteCharPtr(m_aRowDefs.makeStringAndClear().getStr());
 }
 
-void RtfAttributeOutput::StartTableCell(const ww8::WW8TableNodeInfoInner::Pointer_t& /*pTableTextNodeInfoInner*/)
+void RtfAttributeOutput::StartTableCell()
 {
     m_bTableCellOpen = true;
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index fe790f91a497..46d586c219ba 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -462,9 +462,9 @@ private:
      * Table methods.
      */
     void InitTableHelper(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner);
-    void StartTable(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner);
+    void StartTable();
     void StartTableRow(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner);
-    void StartTableCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner);
+    void StartTableCell();
     void TableCellProperties(const ww8::WW8TableNodeInfoInner::Pointer_t& pTableTextNodeInfoInner);
     void EndTableCell();
     void EndTableRow();
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2a778eb8d8b0..62bd24fef2c2 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -634,7 +634,7 @@ sal_Int16 eHoriOri, sal_Int16 eHoriRel, SwTwips nPageLeft,
     return bRet;
 }
 
-bool RTLDrawingsHack(long &rLeft, long /*nWidth*/,
+bool RTLDrawingsHack(long &rLeft,
     sal_Int16 eHoriOri, sal_Int16 eHoriRel, SwTwips nPageLeft,
     SwTwips nPageRight, SwTwips nPageSize)
 {
@@ -676,7 +676,7 @@ void WW8Export::MiserableRTLFrameFormatHack(SwTwips &rLeft, SwTwips &rRight,
     ww8::Frame::WriterSource eSource = rFrameFormat.GetWriterType();
     if (eSource == ww8::Frame::eDrawing || eSource == ww8::Frame::eFormControl)
     {
-        if (RTLDrawingsHack(rLeft, nWidth, rHOr.GetHoriOrient(),
+        if (RTLDrawingsHack(rLeft, rHOr.GetHoriOrient(),
             rHOr.GetRelationOrient(), nPageLeft, nPageRight, nPageSize))
         {
             bRet = true;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 73e2341d3e65..6ad6db3cd749 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1916,7 +1916,7 @@ bool RTLGraphicsHack(SwTwips &rLeft, SwTwips nWidth,
     SwTwips nPageRight, SwTwips nPageSize);
 void MatchEscherMirrorIntoFlySet(const SvxMSDffImportRec &rRecord,
     SfxItemSet &rFlySet);
-bool RTLDrawingsHack(long &rLeft, long nWidth,
+bool RTLDrawingsHack(long &rLeft,
     sal_Int16 eHoriOri, sal_Int16 eHoriRel, SwTwips nPageLeft,
     SwTwips nPageRight, SwTwips nPageSize);
 #endif
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0a340b127d65..aed5f42b3368 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2753,8 +2753,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
 
 //        "table of ..." fields
 
-static void lcl_toxMatchACSwitch(  SwWW8ImplReader& /*rReader*/,
-                            SwDoc& rDoc,
+static void lcl_toxMatchACSwitch(SwDoc& rDoc,
                             SwTOXBase& rBase,
                             WW8ReadFieldParams& rParam,
                             SwCaptionDisplay eCaptionType)
@@ -3054,7 +3053,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, OUString& rStr )
                     break;
                 case 'a':
                 case 'c':
-                    lcl_toxMatchACSwitch(*this, m_rDoc, *pBase, aReadParam,
+                    lcl_toxMatchACSwitch(m_rDoc, *pBase, aReadParam,
                                            ('c' == nRet)
                                          ? CAPTION_COMPLETE
                                          : CAPTION_TEXT );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 41172c2bda21..e51efb7b29dc 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -120,8 +120,7 @@ class SwXMLBodyContext_Impl : public SvXMLImportContext
 public:
 
     SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
-                const OUString& rLName,
-                const Reference< xml::sax::XAttributeList > & xAttrList );
+                const OUString& rLName );
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
@@ -129,8 +128,7 @@ public:
 };
 
 SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport,
-                sal_uInt16 nPrfx, const OUString& rLName,
-                const Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) :
+                sal_uInt16 nPrfx, const OUString& rLName) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
     // tdf#107211: if at this point we don't have a defined char style "Default"
@@ -180,8 +178,7 @@ protected: // #i69629#
 public:
 
     SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
-                const OUString& rLName,
-                const Reference< xml::sax::XAttributeList > & xAttrList );
+                const OUString& rLName );
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
@@ -189,8 +186,7 @@ public:
 };
 
 SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport,
-                sal_uInt16 nPrfx, const OUString& rLName,
-                const Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) :
+                sal_uInt16 nPrfx, const OUString& rLName ) :
     SvXMLImportContext( rImport, nPrfx, rLName )
 {
 }
@@ -236,7 +232,7 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
     case XML_TOK_DOC_BODY:
         GetSwImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
         pContext = new SwXMLBodyContext_Impl( GetSwImport(), nPrefix,
-                                              rLocalName, xAttrList );
+                                              rLocalName );
         break;
     case XML_TOK_DOC_SETTINGS:
         pContext = new XMLDocumentSettingsContext( GetImport(), nPrefix, rLocalName, xAttrList );
@@ -261,7 +257,6 @@ public:
     SwXMLOfficeDocContext_Impl( SwXMLImport& rImport,
                 sal_uInt16 nPrfx,
                 const OUString& rLName,
-                const Reference< xml::sax::XAttributeList > & xAttrList,
                 const Reference< document::XDocumentProperties >& xDocProps);
 
     virtual SvXMLImportContext *CreateChildContext(
@@ -274,10 +269,9 @@ SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl(
                 SwXMLImport& rImport,
                 sal_uInt16 nPrfx,
                 const OUString& rLName,
-                const Reference< xml::sax::XAttributeList > & xAttrList,
                 const Reference< document::XDocumentProperties >& xDocProps) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
-    SwXMLDocContext_Impl( rImport, nPrfx, rLName, xAttrList ),
+    SwXMLDocContext_Impl( rImport, nPrfx, rLName ),
     SvXMLMetaDocumentContext( rImport, nPrfx, rLName, xDocProps)
 {
 }
@@ -316,8 +310,7 @@ public:
 
     SwXMLDocStylesContext_Impl( SwXMLImport& rImport,
                                 sal_uInt16 nPrfx,
-                                const OUString& rLName,
-                                const Reference< xml::sax::XAttributeList > & xAttrList );
+                                const OUString& rLName );
 
     virtual void EndElement() override;
 };
@@ -325,10 +318,9 @@ public:
 SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl(
                     SwXMLImport& rImport,
                     sal_uInt16 nPrfx,
-                    const OUString& rLName,
-                    const Reference< xml::sax::XAttributeList > & xAttrList ) :
+                    const OUString& rLName ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
-    SwXMLDocContext_Impl( rImport, nPrfx, rLName, xAttrList )
+    SwXMLDocContext_Impl( rImport, nPrfx, rLName )
 {
 }
 
@@ -360,8 +352,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
     if( XML_NAMESPACE_OFFICE==nPrefix &&
         ( IsXMLToken( rLocalName, XML_DOCUMENT_SETTINGS ) ||
           IsXMLToken( rLocalName, XML_DOCUMENT_CONTENT ) ))
-        pContext = new SwXMLDocContext_Impl( *this, nPrefix, rLocalName,
-                                             xAttrList );
+        pContext = new SwXMLDocContext_Impl( *this, nPrefix, rLocalName );
     else if ( XML_NAMESPACE_OFFICE==nPrefix &&
               IsXMLToken( rLocalName, XML_DOCUMENT_META ) )
     {
@@ -370,8 +361,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
     else if ( XML_NAMESPACE_OFFICE==nPrefix &&
               IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) )
     {
-        pContext = new SwXMLDocStylesContext_Impl( *this, nPrefix, rLocalName,
-                                                   xAttrList );
+        pContext = new SwXMLDocStylesContext_Impl( *this, nPrefix, rLocalName );
     }
     else if ( XML_NAMESPACE_OFFICE==nPrefix &&
               IsXMLToken( rLocalName, XML_DOCUMENT ) )
@@ -380,7 +370,7 @@ SvXMLImportContext *SwXMLImport::CreateContext(
             GetDocumentProperties());
         // flat OpenDocument file format
         pContext = new SwXMLOfficeDocContext_Impl( *this, nPrefix, rLocalName,
-                        xAttrList, xDocProps);
+                        xDocProps);
     }
     else
         pContext = SvXMLImport::CreateContext( nPrefix, rLocalName, xAttrList );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 243af1e295e0..2f339291ed90 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -631,7 +631,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
         {
             SwXMLTableContext *pTableContext =
                 new SwXMLTableContext( GetSwImport(), nPrefix, rLocalName,
-                                       xAttrList, GetTable() );
+                                       GetTable() );
             pContext = pTableContext;
             if( GetTable()->IsValid() )
                 InsertContent( pTableContext );
@@ -805,7 +805,6 @@ public:
     SwXMLTableColsContext_Impl(
             SwXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const Reference< xml::sax::XAttributeList > & xAttrList,
             SwXMLTableContext *pTable );
 
     virtual SvXMLImportContext *CreateChildContext(
@@ -817,7 +816,6 @@ public:
 
 SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl(
         SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
-        const Reference< xml::sax::XAttributeList > &,
         SwXMLTableContext *pTable ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
     xMyTable( pTable )
@@ -970,7 +968,6 @@ public:
 
     SwXMLTableRowsContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
-            const Reference< xml::sax::XAttributeList > & xAttrList,
             SwXMLTableContext *pTable,
             bool bHead );
 
@@ -984,7 +981,6 @@ public:
 SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLName,
-        const Reference< xml::sax::XAttributeList > &,
         SwXMLTableContext *pTable,
         bool bHead ) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
@@ -1367,7 +1363,6 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
 SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
         sal_uInt16 nPrfx,
         const OUString& rLName,
-        const Reference< xml::sax::XAttributeList > &,
         SwXMLTableContext *pTable ) :
     XMLTextTableContext( rImport, nPrfx, rLName ),
     m_pColumnDefaultCellStyleNames( nullptr ),
@@ -1413,7 +1408,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
     case XML_TOK_TABLE_COLS:
         if( IsValid() )
             pContext = new SwXMLTableColsContext_Impl( GetSwImport(), nPrefix,
-                                                       rLocalName, xAttrList,
+                                                       rLocalName,
                                                        this );
         break;
     case XML_TOK_TABLE_COL:
@@ -1427,7 +1422,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
         SAL_FALLTHROUGH;
     case XML_TOK_TABLE_ROWS:
         pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
-                                                   rLocalName, xAttrList,
+                                                   rLocalName,
                                                    this, bHeader );
         break;
     case XML_TOK_TABLE_ROW:
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index e81cd2b84688..2c1ec4c33fd8 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -133,7 +133,6 @@ public:
                        const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
     SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
                        const OUString& rLName,
-                       const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList,
                        SwXMLTableContext *pTable );
 
     virtual ~SwXMLTableContext() override;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 80095a2bdc13..a24b4bfe494b 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1094,8 +1094,8 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet)
                                                 rOldSet.Get(RES_HORI_ORIENT)) );
 
         const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB);
-        const sal_Int16 eHOri = GetAlignment(m_pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
-        const sal_Int16 eRel = GetRelation(m_pHMap, *m_pHoriRelationLB);
+        const sal_Int16 eHOri = GetAlignment(m_pHMap, nMapPos, *m_pHoriRelationLB);
+        const sal_Int16 eRel = GetRelation(*m_pHoriRelationLB);
 
         aHoriOrient.SetHoriOrient( eHOri );
         aHoriOrient.SetRelationOrient( eRel );
@@ -1130,8 +1130,8 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet)
                                                 rOldSet.Get(RES_VERT_ORIENT)) );
 
         const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB);
-        const sal_Int16 eVOri = GetAlignment(m_pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
-        const sal_Int16 eRel = GetRelation(m_pVMap, *m_pVertRelationLB);
+        const sal_Int16 eVOri = GetAlignment(m_pVMap, nMapPos, *m_pVertRelationLB);
+        const sal_Int16 eRel = GetRelation(*m_pVertRelationLB);
 
         aVertOrient.SetVertOrient    ( eVOri);
         aVertOrient.SetRelationOrient( eRel );
@@ -1628,7 +1628,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
     RelHdl(_rLB);
 }
 
-sal_Int16 SwFramePage::GetRelation(FrameMap * /*pMap*/, ListBox &rRelationLB)
+sal_Int16 SwFramePage::GetRelation(ListBox &rRelationLB)
 {
     const sal_Int32 nPos = rRelationLB.GetSelectEntryPos();
 
@@ -1642,7 +1642,7 @@ sal_Int16 SwFramePage::GetRelation(FrameMap * /*pMap*/, ListBox &rRelationLB)
 }
 
 sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos,
-        ListBox &/*rAlignLB*/, ListBox &rRelationLB)
+        ListBox &rRelationLB)
 {
     if (!pMap || nMapPos < 0)
         return 0;
@@ -1824,8 +1824,8 @@ void SwFramePage::RangeModifyHdl()
     {
         // alignment horizonal
         const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB);
-        aVal.nHoriOrient = GetAlignment(m_pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB);
-        aVal.nHRelOrient = GetRelation(m_pHMap, *m_pHoriRelationLB);
+        aVal.nHoriOrient = GetAlignment(m_pHMap, nMapPos, *m_pHoriRelationLB);
+        aVal.nHRelOrient = GetRelation(*m_pHoriRelationLB);
     }
     else
         aVal.nHoriOrient = text::HoriOrientation::NONE;
@@ -1834,8 +1834,8 @@ void SwFramePage::RangeModifyHdl()
     {
         // alignment vertical
         const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB);
-        aVal.nVertOrient = GetAlignment(m_pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB);
-        aVal.nVRelOrient = GetRelation(m_pVMap, *m_pVertRelationLB);
+        aVal.nVertOrient = GetAlignment(m_pVMap, nMapPos, *m_pVertRelationLB);
+        aVal.nVRelOrient = GetRelation(*m_pVertRelationLB);
     }
     else
         aVal.nVertOrient = text::VertOrientation::NONE;
@@ -1957,7 +1957,7 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void )
     FrameMap *pMap = bHori ? m_pHMap : m_pVMap;
 
     const sal_Int32 nMapPos = GetMapPos(pMap, rLB);
-    const sal_Int16 nAlign = GetAlignment(pMap, nMapPos, rLB, *pRelLB);
+    const sal_Int16 nAlign = GetAlignment(pMap, nMapPos, *pRelLB);
 
     if (bHori)
     {
@@ -2066,7 +2066,7 @@ IMPL_LINK( SwFramePage, RelHdl, ListBox&, rLB, void )
     {
         if(bHori)
         {
-            const sal_Int16 nRel = GetRelation(m_pHMap, *m_pHoriRelationLB);
+            const sal_Int16 nRel = GetRelation(*m_pHoriRelationLB);
             if(text::RelOrientation::PRINT_AREA == nRel && 0 == m_pVerticalDLB->GetSelectEntryPos())
             {
                 m_pVerticalDLB->SelectEntryPos(1);
@@ -2127,16 +2127,16 @@ void SwFramePage::UpdateExample()
     if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB);
-        m_pExampleWN->SetHAlign(GetAlignment(m_pHMap, nMapPos, *m_pHorizontalDLB, *m_pHoriRelationLB));
-        m_pExampleWN->SetHoriRel(GetRelation(m_pHMap, *m_pHoriRelationLB));
+        m_pExampleWN->SetHAlign(GetAlignment(m_pHMap, nMapPos, *m_pHoriRelationLB));
+        m_pExampleWN->SetHoriRel(GetRelation(*m_pHoriRelationLB));
     }
 
     nPos = m_pVerticalDLB->GetSelectEntryPos();
     if ( m_pVMap && nPos != LISTBOX_ENTRY_NOTFOUND )
     {
         const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB);
-        m_pExampleWN->SetVAlign(GetAlignment(m_pVMap, nMapPos, *m_pVerticalDLB, *m_pVertRelationLB));
-        m_pExampleWN->SetVertRel(GetRelation(m_pVMap, *m_pVertRelationLB));
+        m_pExampleWN->SetVAlign(GetAlignment(m_pVMap, nMapPos, *m_pVertRelationLB));
+        m_pExampleWN->SetVertRel(GetRelation(*m_pVertRelationLB));
     }
 
     // size
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index abb574054460..844dcdc0bde1 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -117,7 +117,7 @@ bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
             GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::GLOBAL_DOCUMENT, true);       // Globaldokument
 
         if ( GetCreateMode() ==  SfxObjectCreateMode::EMBEDDED )
-            SwTransferable::InitOle( this, *m_pDoc );
+            SwTransferable::InitOle( this );
 
         // set forbidden characters if necessary
         if (!utl::ConfigManager::IsAvoidConfig())
@@ -539,7 +539,7 @@ bool  SwDocShell::Load( SfxMedium& rMedium )
             case SfxObjectCreateMode::INTERNAL:
             case SfxObjectCreateMode::EMBEDDED:
                 {
-                    SwTransferable::InitOle( this, *m_pDoc );
+                    SwTransferable::InitOle( this );
                 }
                 // suppress SfxProgress, when we are Embedded
                 SW_MOD()->SetEmbeddedLoadSave( true );
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 47ef669f8012..d7c12cecf35a 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -303,7 +303,7 @@ void SwTransferable::AddSupportedFormats()
     }
 }
 
-void SwTransferable::InitOle( SfxObjectShell* pDoc, SwDoc& )
+void SwTransferable::InitOle( SfxObjectShell* pDoc )
 {
     //set OleVisArea. Upper left corner of the page and size of
     //RealSize in Twips.
@@ -443,7 +443,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
         // in CORE a new one was created (OLE-objects copied!)
         m_aDocShellRef = pTmpDoc->GetTmpDocShell();
         if( m_aDocShellRef.Is() )
-            SwTransferable::InitOle( m_aDocShellRef, *pTmpDoc );
+            SwTransferable::InitOle( m_aDocShellRef );
         pTmpDoc->SetTmpDocShell( nullptr );
 
         if( nSelectionType & SelectionType::Text && !m_pWrtShell->HasMark() )
@@ -596,7 +596,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
                                          SfxObjectCreateMode::EMBEDDED );
                 m_aDocShellRef = pNewDocSh;
                 m_aDocShellRef->DoInitNew();
-                SwTransferable::InitOle( m_aDocShellRef, *pDoc );
+                SwTransferable::InitOle( m_aDocShellRef );
             }
             bOK = SetObject( &m_aDocShellRef, SWTRANSFER_OBJECTTYPE_SWOLE,
                             rFlavor );
@@ -898,7 +898,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
         // a new one was created in CORE (OLE objects copied!)
         m_aDocShellRef = pTmpDoc->GetTmpDocShell();
         if( m_aDocShellRef.Is() )
-            SwTransferable::InitOle( m_aDocShellRef, *pTmpDoc );
+            SwTransferable::InitOle( m_aDocShellRef );
         pTmpDoc->SetTmpDocShell( nullptr );
 
         if( m_pWrtShell->IsObjSelected() )
@@ -1055,7 +1055,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr
     // a new one was created in CORE (OLE-Objects copied!)
     m_aDocShellRef = pCDoc->GetTmpDocShell();
     if( m_aDocShellRef.Is() )
-        SwTransferable::InitOle( m_aDocShellRef, *pCDoc );
+        SwTransferable::InitOle( m_aDocShellRef );
     pCDoc->SetTmpDocShell( nullptr );
 
     m_eBufferType = TransferBufferType::Document;
@@ -1379,7 +1379,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                                     : EXCHG_IN_ACTION_LINK == nAction
                                         ? SwPasteSdr::SetAttr
                                         : SwPasteSdr::Insert),
-                                pPt, nActionFlags, bMsg, nullptr );
+                                pPt, nActionFlags, nullptr );
                 break;
 
             case SotClipboardFormatId::FILE_LIST:
@@ -1427,7 +1427,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                 bool graphicInserted;
                 bRet = SwTransferable::PasteFileName( rData, rSh, nFormat,
                                             SwPasteSdr::Insert, pPt,
-                                            nActionFlags, bMsg,
+                                            nActionFlags,
                                             &graphicInserted );
                 if( graphicInserted )
                     bCallAutoCaption = true;
@@ -2524,7 +2524,7 @@ bool SwTransferable::PasteAsHyperlink( TransferableDataHelper& rData,
 bool SwTransferable::PasteFileName( TransferableDataHelper& rData,
                                     SwWrtShell& rSh, SotClipboardFormatId nFormat,
                                     SwPasteSdr nAction, const Point* pPt,
-                                    SotExchangeActionFlags nActionFlags, bool /* bMsg */,
+                                    SotExchangeActionFlags nActionFlags,
                                     bool * graphicInserted)
 {
     bool bRet = SwTransferable::PasteGrf( rData, rSh, nFormat, nAction,
@@ -2734,7 +2734,7 @@ bool SwTransferable::PasteFileList( TransferableDataHelper& rData,
             TransferableDataHelper aData( pHlp );
 
             if( SwTransferable::PasteFileName( aData, rSh, SotClipboardFormatId::SIMPLE_FILE, nAct,
-                                            pPt, SotExchangeActionFlags::NONE, bMsg, nullptr ))
+                                            pPt, SotExchangeActionFlags::NONE, nullptr ))
             {
                 if( bLink )
                 {
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index aa7d0916a047..260746e45deb 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -164,8 +164,8 @@ class SwFramePage: public SfxTabPage
                                ListBox& _rLB,
                                FixedText& _rFT );
     static sal_Int32 GetMapPos(const FrameMap *pMap, ListBox &rAlignLB);
-    static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
-    static sal_Int16 GetRelation(FrameMap *pMap, ListBox &rRelationLB);
+    static sal_Int16 GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, ListBox &rRelationLB);
+    static sal_Int16 GetRelation(ListBox &rRelationLB);
     RndStdIds       GetAnchor();
 
     void setOptimalFrameWidth();
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index c2f03e731f3b..91ee9d659ee8 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -116,7 +116,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
 
     static bool PasteFileName( TransferableDataHelper& rData,
                             SwWrtShell& rSh, SotClipboardFormatId nFormat, SwPasteSdr nAction,
-                            const Point* pPt, SotExchangeActionFlags nActionFlags, bool bMsg, bool * graphicInserted );
+                            const Point* pPt, SotExchangeActionFlags nActionFlags, bool * graphicInserted );
 
     static bool PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh,
                             SotClipboardFormatId nFormat, bool bLink, const Point* pDragPt,
@@ -155,7 +155,7 @@ public:
 
     // set properties on the document, like PageMargin, VisArea.
     // And set real Size
-    static void InitOle( SfxObjectShell* pDoc, SwDoc& rDoc );
+    static void InitOle( SfxObjectShell* pDoc );
 
     // copy - methods and helper methods for the copy
     int  Cut();