loplugin:checkunusedparams in sw(part2)

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

29 files changed, 62 insertions, 78 deletions

diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 3bb687bed369..61b1b2267afb 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -164,7 +164,7 @@ class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
 
 public:
     SwDBNextSetField( SwDBNextSetFieldType*,
-                      const OUString& rCond, const OUString& rDummy, const SwDBData& rDBData);
+                      const OUString& rCond, const SwDBData& rDBData);
 
     virtual OUString        Expand() const override;
     virtual SwField*        Copy() const override;
@@ -239,7 +239,7 @@ class SwDBNameFieldType : public SwFieldType
 public:
     SwDBNameFieldType(SwDoc*);
 
-    OUString                Expand(sal_uLong) const;
+    OUString                Expand() const;
     virtual SwFieldType*    Copy() const override;
 };
 
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index f4741c1e9f3f..e9eb91a6b388 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -196,7 +196,7 @@ private:
 public:
 
     /// Creates DrawObject and registers it with the Model.
-    SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
+    SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn );
     static SwVirtFlyDrawObj* CreateNewRef(SwFlyFrame* pFly, SwFlyFrameFormat* pFormat);
     virtual ~SwFlyDrawContact() override;
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 464661358f9e..08c590a81024 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -415,8 +415,7 @@ private:
     // Update charts of given table.
     void UpdateCharts_( const SwTable& rTable, SwViewShell const & rVSh ) const;
 
-    static bool SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
-                                sal_uInt16 nMode );
+    static bool SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry );
 
     // CharTimer calls this method.
     void DoUpdateAllCharts();
@@ -783,8 +782,7 @@ public:
         {   return static_cast<SwFrameFormat*>(FindFormatByName( static_cast<SwFormatsBase&>(*mpFrameFormatTable), rName )); }
 
     SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom,
-                           bool bBroadcast = false,
-                           bool bAuto = true );
+                           bool bBroadcast = false );
     void       DelCharFormat(size_t nFormat, bool bBroadcast = false);
     void       DelCharFormat(SwCharFormat* pFormat, bool bBroadcast = false);
     SwCharFormat* FindCharFormatByName( const OUString& rName ) const
@@ -798,8 +796,7 @@ public:
     SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable; }
     SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName,
                                   SwTextFormatColl *pDerivedFrom,
-                                  bool bBroadcast = false,
-                                  bool bAuto = true );
+                                  bool bBroadcast = false);
     SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName,
                                                SwTextFormatColl *pDerivedFrom,
                                                bool bBroadcast = false);
@@ -1513,10 +1510,8 @@ public:
     void SetContainsMSVBasic( bool bFlag )  { mbContains_MSVBasic = bFlag; }
 
     // Interface for the list of Ruby - texts/attributes
-    static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
-                        sal_uInt16 nMode );
-    void SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
-                        sal_uInt16 nMode );
+    static sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList );
+    void SetRubyList( const SwPaM& rPam, const SwRubyList& rList );
 
     void ReadLayoutCache( SvStream& rStream );
     void WriteLayoutCache( SvStream& rStream );
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 3932c5af033b..39618a8f0b4a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -340,7 +340,7 @@ public:
 
     long BeginDrag( const Point *pPt, bool bProp );
     long Drag     ( const Point *pPt, bool bProp );
-    void EndDrag  ( const Point *pPt );
+    void EndDrag  ();
     void BreakDrag();
 
     /// Methods for status line.
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index adf94d7b4948..4e7cca5fa0ee 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -270,9 +270,7 @@ public:
     SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
                                 SwTableFormat* pTableFormat,
                                 SwTableLineFormat* pLineFormat,
-                                SwTableBoxFormat* pBoxFormat,
-                                SwTextFormatColl* pTextColl
-                                /*, SwUndo... pUndo*/ );
+                                SwTableBoxFormat* pBoxFormat );
 
     /// Create regular text from what was table.
     bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
@@ -298,7 +296,7 @@ public:
                                 bool bCalcNewSize = false );
     /// Two Tables that are following one another are merged.
     bool MergeTable( const SwNodeIndex& rPos, bool bWithPrev = true,
-                    sal_uInt16 nMode = 0, SwHistory* pHistory = nullptr );
+                    sal_uInt16 nMode = 0 );
 
     /// Insert a new SwSection.
     SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx,
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index dae0a1591a3e..def58efd718b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -823,7 +823,7 @@ void SwShellTableCursor::FillRects()
             }
 
             pEndFrame = pFrame;
-            pFrame = pFrame->GetNextCellLeaf( MAKEPAGE_NONE );
+            pFrame = pFrame->GetNextCellLeaf();
         }
     }
     if (pEndFrame)
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d140bc6dc402..6b008513020e 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -854,11 +854,9 @@ SwFormat *SwDoc::MakeFrameFormat_(const OUString &rFormatName,
     return dynamic_cast<SwFormat*>(pFrameFormat);
 }
 
-// #i40550# - add parameter <bAuto> - not relevant
 SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName,
                                SwCharFormat *pDerivedFrom,
-                               bool bBroadcast,
-                               bool )
+                               bool bBroadcast )
 {
     SwCharFormat *pFormat = new SwCharFormat( GetAttrPool(), rFormatName, pDerivedFrom );
     mpCharFormatTable->push_back( pFormat );
@@ -883,18 +881,17 @@ SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName,
 
 SwFormat *SwDoc::MakeCharFormat_(const OUString &rFormatName,
                             SwFormat *pDerivedFrom,
-                            bool bBroadcast, bool bAuto)
+                            bool bBroadcast, bool /*bAuto*/)
 {
     SwCharFormat *pCharFormat = dynamic_cast<SwCharFormat*>(pDerivedFrom);
-    pCharFormat = MakeCharFormat( rFormatName, pCharFormat, bBroadcast, bAuto );
+    pCharFormat = MakeCharFormat( rFormatName, pCharFormat, bBroadcast );
     return dynamic_cast<SwFormat*>(pCharFormat);
 }
 
 /// Create the FormatCollections
 SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName,
                                      SwTextFormatColl *pDerivedFrom,
-                                     bool bBroadcast,
-                                     bool )
+                                     bool bBroadcast)
 {
     SwTextFormatColl *pFormatColl = new SwTextFormatColl( GetAttrPool(), rFormatName,
                                                 pDerivedFrom );
@@ -918,10 +915,10 @@ SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName,
 
 SwFormat *SwDoc::MakeTextFormatColl_(const OUString &rFormatName,
                             SwFormat *pDerivedFrom,
-                            bool bBroadcast, bool bAuto)
+                            bool bBroadcast, bool /*bAuto*/)
 {
     SwTextFormatColl *pTextFormatColl = dynamic_cast<SwTextFormatColl*>(pDerivedFrom);
-    pTextFormatColl = MakeTextFormatColl( rFormatName, pTextFormatColl, bBroadcast, bAuto );
+    pTextFormatColl = MakeTextFormatColl( rFormatName, pTextFormatColl, bBroadcast );
     return dynamic_cast<SwFormat*>(pTextFormatColl);
 }
 
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 82bbe01a6c1a..efa8d1592150 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -46,8 +46,7 @@ using namespace ::com::sun::star::i18n;
  *   - String - the orig text
  *   - SwFormatRuby - the ruby attribute
  */
-sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
-                            sal_uInt16 nMode )
+sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList )
 {
     const SwPaM *_pStartCursor = rPam.GetNext(),
                 *_pStartCursor2 = _pStartCursor;
@@ -67,7 +66,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
                     aPam.SetMark();
                     *aPam.GetMark() = *pEnd;
                 }
-                if( SelectNextRubyChars( aPam, *pNew, nMode ))
+                if( SelectNextRubyChars( aPam, *pNew ))
                 {
                     rList.push_back(std::move(pNew));
                     aPam.DeleteMark();
@@ -91,8 +90,7 @@ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList,
     return rList.size();
 }
 
-void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
-                            sal_uInt16 nMode )
+void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList )
 {
     GetIDocumentUndoRedo().StartUndo( SwUndoId::SETRUBYATTR, nullptr );
     std::set<sal_uInt16> aDelArr;
@@ -119,7 +117,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
                     aPam.SetMark();
                     *aPam.GetMark() = *pEnd;
                 }
-                if( SelectNextRubyChars( aPam, aCheckEntry, nMode ))
+                if( SelectNextRubyChars( aPam, aCheckEntry ))
                 {
                     const SwRubyListEntry* pEntry = rList[ nListEntry++ ].get();
                     if( aCheckEntry.GetRubyAttr() != pEntry->GetRubyAttr() )
@@ -178,7 +176,7 @@ void SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
     GetIDocumentUndoRedo().EndUndo( SwUndoId::SETRUBYATTR, nullptr );
 }
 
-bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt16 )
+bool SwDoc::SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry )
 {
     // Point must be the startposition, Mark is optional the end position
     SwPosition* pPos = rPam.GetPoint();
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 10c90fddd03a..9a1bdbd8eea2 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1249,8 +1249,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     getIDocumentState().SetEnableSetModified(false);
 
     SwTableNode* pTableNd = GetNodes().TextToTable(
-            rTableNodes, pTableFormat, pLineFormat, pBoxFormat,
-            getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
+            rTableNodes, pTableFormat, pLineFormat, pBoxFormat );
 
     SwTable& rNdTable = pTableNd->GetTable();
     rNdTable.RegisterToFormat(*pTableFormat);
@@ -1363,8 +1362,7 @@ lcl_SetTableBoxWidths2(SwTable & rTable, size_t const nMaxBoxes,
 SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
                                     SwTableFormat* pTableFormat,
                                     SwTableLineFormat* pLineFormat,
-                                    SwTableBoxFormat* pBoxFormat,
-                                    SwTextFormatColl* /*pTextColl*/  /*, SwUndo... pUndo*/  )
+                                    SwTableBoxFormat* pBoxFormat  )
 {
     if( rTableNodes.empty() )
         return nullptr;
@@ -3533,7 +3531,7 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode
 
     // The actual merge
     SwNodeIndex aIdx( bWithPrev ? *pTableNd : *pDelTableNd );
-    bool bRet = rNds.MergeTable( aIdx, !bWithPrev, nMode, pHistory );
+    bool bRet = rNds.MergeTable( aIdx, !bWithPrev, nMode );
 
     if( pHistory )
     {
@@ -3552,7 +3550,7 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode
 }
 
 bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev,
-                            sal_uInt16 nMode, SwHistory* )
+                            sal_uInt16 nMode )
 {
     SwTableNode* pDelTableNd = rPos.GetNode().GetTableNode();
     OSL_ENSURE( pDelTableNd, "Where did the TableNode go?" );
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b989c1fad694..9bb337506f90 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -460,7 +460,7 @@ void SwContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
 }
 
 
-SwFlyDrawContact::SwFlyDrawContact( SwFlyFrameFormat *pToRegisterIn, SdrModel * )
+SwFlyDrawContact::SwFlyDrawContact( SwFlyFrameFormat *pToRegisterIn )
     : SwContact( pToRegisterIn )
     , mpMasterObj(new SwFlyDrawObj)
 {
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index e6724c228c7b..1790ae8eabe3 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -564,7 +564,6 @@ SwFieldType* SwDBNextSetFieldType::Copy() const
 
 SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
                                    const OUString& rCond,
-                                   const OUString& ,
                                    const SwDBData& rDBData) :
     SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(true)
 {}
@@ -577,7 +576,7 @@ OUString SwDBNextSetField::Expand() const
 SwField* SwDBNextSetField::Copy() const
 {
     SwDBNextSetField *pTmp = new SwDBNextSetField(static_cast<SwDBNextSetFieldType*>(GetTyp()),
-                                         aCond, OUString(), GetDBData());
+                                         aCond, GetDBData());
     pTmp->SetSubType(GetSubType());
     pTmp->bCondValid = bCondValid;
     return pTmp;
@@ -750,7 +749,7 @@ SwDBNameFieldType::SwDBNameFieldType(SwDoc* pDocument)
     pDoc = pDocument;
 }
 
-OUString SwDBNameFieldType::Expand(sal_uLong ) const
+OUString SwDBNameFieldType::Expand() const
 {
     const SwDBData aData = pDoc->GetDBData();
     return aData.sDataSource + "." + aData.sCommand;
@@ -771,7 +770,7 @@ SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData)
 OUString SwDBNameField::Expand() const
 {
     if(0 ==(GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE))
-        return static_cast<SwDBNameFieldType*>(GetTyp())->Expand(GetFormat());
+        return static_cast<SwDBNameFieldType*>(GetTyp())->Expand();
     return OUString();
 }
 
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 05218530c5fd..06963f3b1b50 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -729,7 +729,7 @@ long SwFEShell::Drag( const Point *pPt, bool )
     return 0;
 }
 
-void SwFEShell::EndDrag( const Point * )
+void SwFEShell::EndDrag()
 {
     OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" );
     SdrView *pView = Imp()->GetDrawView();
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index a3bb649b2aa2..199a7725198f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -360,7 +360,7 @@ public:
     SwLayoutFrame *GetNextLeaf   ( MakePageType eMakePage );
     SwLayoutFrame *GetNextFootnoteLeaf( MakePageType eMakePage );
     SwLayoutFrame *GetNextSctLeaf( MakePageType eMakePage );
-    SwLayoutFrame *GetNextCellLeaf( MakePageType eMakePage );
+    SwLayoutFrame *GetNextCellLeaf();
     SwLayoutFrame *GetPrevLeaf   ( MakePageType eMakeFootnote );
     SwLayoutFrame *GetPrevFootnoteLeaf( MakePageType eMakeFootnote );
     SwLayoutFrame *GetPrevSctLeaf( MakePageType eMakeFootnote );
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 907b8e3d98cf..709230a70dea 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -57,7 +57,7 @@ class SwFootnoteBossFrame: public SwLayoutFrame
 
     SwFootnoteContFrame *MakeFootnoteCont();
     SwFootnoteFrame     *FindFirstFootnote();
-    SwNeighbourAdjust NeighbourhoodAdjustment_( const SwFrame* pFrame ) const;
+    SwNeighbourAdjust NeighbourhoodAdjustment_() const;
 
 protected:
     void          InsertFootnote( SwFootnoteFrame * );
@@ -118,8 +118,8 @@ public:
                       SwTextFootnote *pAttr );
 
     // should AdjustNeighbourhood be called (or Grow/Shrink)?
-    SwNeighbourAdjust NeighbourhoodAdjustment( const SwFrame* pFrame ) const
-        { return IsPageFrame() ? SwNeighbourAdjust::OnlyAdjust : NeighbourhoodAdjustment_( pFrame ); }
+    SwNeighbourAdjust NeighbourhoodAdjustment() const
+        { return IsPageFrame() ? SwNeighbourAdjust::OnlyAdjust : NeighbourhoodAdjustment_(); }
 };
 
 inline const SwLayoutFrame *SwFootnoteBossFrame::FindBodyCont() const
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 412d3a775fe1..bee1c85121c0 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2856,9 +2856,8 @@ SwFlyFrameFormat::~SwFlyFrameFormat()
 
 SwFlyDrawContact* SwFlyFrameFormat::GetOrCreateContact()
 {
-    IDocumentDrawModelAccess& rIDDMA = getIDocumentDrawModelAccess();
     if(!m_pContact)
-        m_pContact.reset(new SwFlyDrawContact(this, rIDDMA.GetOrCreateDrawModel()));
+        m_pContact.reset(new SwFlyDrawContact(this));
     return m_pContact.get();
 }
 
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 3c9b36198788..56886e4a95c7 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1617,7 +1617,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/)
         // Finally, we are able to split table rows. Therefore, bDontMoveMe
         // can be set to false:
         if( bDontMoveMe && IsInTab() &&
-            nullptr != GetNextCellLeaf( MAKEPAGE_NONE ) )
+            nullptr != GetNextCellLeaf() )
             bDontMoveMe = false;
 
         if ( bDontMoveMe && aRectFnSet.GetHeight(Frame()) >
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 27b32f64cb92..718048d383ba 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -132,7 +132,7 @@ class SwImplProtocol
     void Record_( const SwFrame* pFrame, PROT nFunction, DbgAction nAct, void* pParam );
     bool NewStream();
     void CheckLine( OString& rLine );
-    static void SectFunc( OStringBuffer& rOut, const SwFrame* pFrame, DbgAction nAct, void* pParam );
+    static void SectFunc( OStringBuffer& rOut, DbgAction nAct, void* pParam );
 public:
     SwImplProtocol();
     ~SwImplProtocol();
@@ -602,7 +602,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n
         case PROT::FileInit: FileInit();
                             aOut.append("Initialize");
                             break;
-        case PROT::Section:  SectFunc(aOut, pFrame, nAct, pParam);
+        case PROT::Section:  SectFunc(aOut, nAct, pParam);
                             break;
         case PROT::Cut:      bTmp = true;
                             SAL_FALLTHROUGH;
@@ -664,7 +664,7 @@ void SwImplProtocol::Record_( const SwFrame* pFrame, PROT nFunction, DbgAction n
 }
 
 /// Handle the output of the SectionFrames.
-void SwImplProtocol::SectFunc(OStringBuffer &rOut, const SwFrame* , DbgAction nAct, void* pParam)
+void SwImplProtocol::SectFunc(OStringBuffer &rOut, DbgAction nAct, void* pParam)
 {
     bool bTmp = false;
     switch( nAct )
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index da6fb6b918a6..ad814db67680 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1298,7 +1298,7 @@ bool SwFrame::IsMoveable( const SwLayoutFrame* _pLayoutFrame ) const
                   _pLayoutFrame->IsInFootnote() )
         {
             if ( _pLayoutFrame->IsInTab() && !IsTabFrame() &&
-                 ( !IsContentFrame() || !const_cast<SwFrame*>(this)->GetNextCellLeaf( MAKEPAGE_NONE ) ) )
+                 ( !IsContentFrame() || !const_cast<SwFrame*>(this)->GetNextCellLeaf() ) )
             {
                 bRetVal = false;
             }
@@ -1425,7 +1425,7 @@ void SwFrame::SetDirFlags( bool bVert )
     }
 }
 
-SwLayoutFrame* SwFrame::GetNextCellLeaf( MakePageType )
+SwLayoutFrame* SwFrame::GetNextCellLeaf()
 {
     SwFrame* pTmpFrame = this;
     while (pTmpFrame && !pTmpFrame->IsCellFrame())
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index d80c03a054e1..af40bd647651 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -789,7 +789,7 @@ SwLayoutFrame *SwFrame::GetLeaf( MakePageType eMakePage, bool bFwd )
     }
 
     if ( bInTab && ( !IsTabFrame() || GetUpper()->IsCellFrame() ) ) // TABLE IN TABLE
-        return bFwd ? GetNextCellLeaf( eMakePage ) : GetPrevCellLeaf( eMakePage );
+        return bFwd ? GetNextCellLeaf() : GetPrevCellLeaf( eMakePage );
 
     if ( bInSct )
         return bFwd ? GetNextSctLeaf( eMakePage ) : GetPrevSctLeaf( eMakePage );
@@ -1826,7 +1826,7 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways )
             ( !m_rThis.IsTabFrame() ||
                 ( m_rThis.GetUpper()->IsInTab() &&
                   m_rThis.GetUpper()->FindTabFrame()->IsFwdMoveAllowed() ) ) &&
-             nullptr != const_cast<SwFrame&>(m_rThis).GetNextCellLeaf( MAKEPAGE_NONE ) )
+             nullptr != const_cast<SwFrame&>(m_rThis).GetNextCellLeaf() )
         {
             bNoFwd = false;
         }
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 9f0cdbf04c10..14790e03eed2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -335,7 +335,7 @@ SwTwips SwFootnoteContFrame::GrowFrame( SwTwips nDist, bool bTst, bool )
          nReal = 0;
     if ( nGrow > 0 )
     {
-        SwNeighbourAdjust nAdjust = pBoss->NeighbourhoodAdjustment( this );
+        SwNeighbourAdjust nAdjust = pBoss->NeighbourhoodAdjustment();
         if( SwNeighbourAdjust::OnlyAdjust == nAdjust )
             nReal = AdjustNeighbourhood( nGrow, bTst );
         else
@@ -2492,7 +2492,7 @@ SwTwips SwFootnoteBossFrame::GetVarSpace() const
  * @see Grow()
  * @see Shrink()
  */
-SwNeighbourAdjust SwFootnoteBossFrame::NeighbourhoodAdjustment_( const SwFrame* ) const
+SwNeighbourAdjust SwFootnoteBossFrame::NeighbourhoodAdjustment_() const
 {
     SwNeighbourAdjust nRet = SwNeighbourAdjust::OnlyAdjust;
     if( GetUpper() && !GetUpper()->IsPageBodyFrame() )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index a8ef49dfd3de..e8b74a653468 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -463,7 +463,7 @@ Size SwFrame::ChgSize( const Size& aNewSize )
         {
             if ( GetUpper()->IsFootnoteBossFrame() && HasFixSize() &&
                  SwNeighbourAdjust::GrowShrink !=
-                 static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment( this ) )
+                 static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment() )
             {
                 (maFrame.*fnRect->fnSetHeight)( nNew );
                 SwTwips nReal = static_cast<SwLayoutFrame*>(this)->AdjustNeighbourhood(nDiff);
@@ -1078,7 +1078,7 @@ void SwLayoutFrame::Paste( SwFrame* pParent, SwFrame* pSibling)
         // AdjustNeighbourhood is now also called in columns which are not
         // placed inside a frame
         SwNeighbourAdjust nAdjust = GetUpper()->IsFootnoteBossFrame() ?
-                static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment( this )
+                static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment()
                 : SwNeighbourAdjust::GrowShrink;
         SwTwips nGrow = (Frame().*fnRect->fnGetHeight)();
         if( SwNeighbourAdjust::OnlyAdjust == nAdjust )
@@ -1117,7 +1117,7 @@ void SwLayoutFrame::Cut()
     {
         if( pUp->IsFootnoteBossFrame() )
         {
-            SwNeighbourAdjust nAdjust= static_cast<SwFootnoteBossFrame*>(pUp)->NeighbourhoodAdjustment( this );
+            SwNeighbourAdjust nAdjust= static_cast<SwFootnoteBossFrame*>(pUp)->NeighbourhoodAdjustment();
             if( SwNeighbourAdjust::OnlyAdjust == nAdjust )
                 AdjustNeighbourhood( -nShrink );
             else
@@ -2243,7 +2243,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
         if ( GetUpper() )
         {   // AdjustNeighbourhood now only for the columns (but not in frames)
             SwNeighbourAdjust nAdjust = GetUpper()->IsFootnoteBossFrame() ?
-                static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment( this )
+                static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment()
                 : SwNeighbourAdjust::GrowShrink;
             if( SwNeighbourAdjust::OnlyAdjust == nAdjust )
                 nReal = AdjustNeighbourhood( nReal, bTst );
@@ -2421,7 +2421,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
     }
 
     SwNeighbourAdjust nAdjust = GetUpper() && GetUpper()->IsFootnoteBossFrame() ?
-                   static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment( this )
+                   static_cast<SwFootnoteBossFrame*>(GetUpper())->NeighbourhoodAdjustment()
                    : SwNeighbourAdjust::GrowShrink;
 
     // AdjustNeighbourhood also in columns (but not in frames)
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index cf1fe6bb276f..a4e061050f98 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -445,7 +445,7 @@ void SwTaggedPDFHelper::BeginTag( vcl::PDFWriter::StructElement eType, const OUS
              ( rFrame.IsFlowFrame() && !SwFlowFrame::CastFlowFrame(&rFrame)->IsFollow() && SwFlowFrame::CastFlowFrame(&rFrame)->HasFollow() ) ||
              ( rFrame.IsTextFrame() && rFrame.GetDrawObjs() ) ||
              ( rFrame.IsRowFrame() && rFrame.IsInSplitTableRow() ) ||
-             ( rFrame.IsCellFrame() && const_cast<SwFrame&>(rFrame).GetNextCellLeaf( MAKEPAGE_NONE ) ) )
+             ( rFrame.IsCellFrame() && const_cast<SwFrame&>(rFrame).GetNextCellLeaf() ) )
         {
             const void* pKey = lcl_GetKeyFromFrame( rFrame );
 
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 615c430521bd..91d3c1090d06 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -262,7 +262,7 @@ WidowsAndOrphans::WidowsAndOrphans( SwTextFrame *pNewFrame, const SwTwips nRst,
         {
             // For compatibility reasons, we disable Keep/Widows/Orphans
             // inside splittable row frames:
-            if ( m_pFrame->GetNextCellLeaf( MAKEPAGE_NONE ) || m_pFrame->IsInFollowFlowRow() )
+            if ( m_pFrame->GetNextCellLeaf() || m_pFrame->IsInFollowFlowRow() )
             {
                 const SwFrame* pTmpFrame = m_pFrame->GetUpper();
                 while ( !pTmpFrame->IsRowFrame() )
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 878941fc22dd..90b75e4f3af3 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1640,7 +1640,7 @@ void SAL_CALL SwXTextField::attach(
             aData.nCommandType = m_pImpl->m_pProps->nSHORT1;
             SwFieldType* pFieldType = pDoc->getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::DbNextSet);
             pField = new SwDBNextSetField(static_cast<SwDBNextSetFieldType*>(pFieldType),
-                    m_pImpl->m_pProps->sPar3, OUString(), aData);
+                    m_pImpl->m_pProps->sPar3, aData);
         }
 #endif
         break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a66e835c8083..fd6f05de89b3 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2539,7 +2539,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBNext( WW8FieldDesc*, OUString& )
 #if HAVE_FEATURE_DBCONNECTIVITY
     SwDBNextSetFieldType aN;
     SwFieldType* pFT = m_rDoc.getIDocumentFieldsAccess().InsertFieldType( aN );
-    SwDBNextSetField aField( static_cast<SwDBNextSetFieldType*>(pFT), OUString(), OUString(),
+    SwDBNextSetField aField( static_cast<SwDBNextSetFieldType*>(pFT), OUString(),
                             SwDBData() );       // Datenbank: Nichts
     m_rDoc.getIDocumentContentOperations().InsertPoolItem( *m_pPaM, SwFormatField( aField ) );
 #endif
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 52c509096c6c..a96b74d61b6a 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1266,7 +1266,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
             aDBFormatData.aLocale = LanguageTag( rSh.GetCurLang() ).getLocale();
             SwDBNextSetField aNxtDBField( static_cast<SwDBNextSetFieldType*>(rSh.
                                             GetFieldType( 0, SwFieldIds::DbNextSet )),
-                                        "1", "", aDBData );
+                                        "1", aDBData );
 
             bool bSetCursor = true;
             const size_t nCols = aColArr.size();
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index e16e3ac21b36..4a291cdd6e0b 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1106,7 +1106,7 @@ bool SwFieldMgr::InsertField(
                 {
                     SwDBNextSetFieldType* pTyp = static_cast<SwDBNextSetFieldType*>(pCurShell->GetFieldType(
                         0, SwFieldIds::DbNextSet) );
-                    pField = new SwDBNextSetField(pTyp, sPar1, rData.m_sPar2, aDBData);
+                    pField = new SwDBNextSetField(pTyp, sPar1, aDBData);
                     bExp = true;
                     break;
                 }
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index e2d23c2483af..17b53047a784 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -528,7 +528,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
 
     SwRubyList aList;
 
-    const sal_uInt16 nCount = SwDoc::FillRubyList( *rSh.GetCursor(), aList, 0 );
+    const sal_uInt16 nCount = SwDoc::FillRubyList( *rSh.GetCursor(), aList );
     Sequence< Sequence< PropertyValue > > aRet(nCount);
     Sequence< PropertyValue >* pRet = aRet.getArray();
     OUString aString;
@@ -621,7 +621,7 @@ void SAL_CALL SwXTextView::setRubyList(
         aList.insert(aList.begin() + nPos, std::move(pEntry));
     }
     SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
-    pDoc->SetRubyList( *rSh.GetCursor(), aList, 0 );
+    pDoc->SetRubyList( *rSh.GetCursor(), aList );
 }
 
 SfxObjectShellLock SwXTextView::BuildTmpSelectionDoc()
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index c133444ccc58..cf06aa055749 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -718,10 +718,10 @@ IMPL_LINK( SwWrtShell, ExecFlyMac, const SwFlyFrameFormat*, pFlyFormat, void )
     }
 }
 
-long SwWrtShell::UpdateLayoutFrame(const Point *pPt, bool )
+long SwWrtShell::UpdateLayoutFrame(const Point *, bool )
 {
         // still a dummy
-    SwFEShell::EndDrag( pPt );
+    SwFEShell::EndDrag();
     m_fnDrag = &SwWrtShell::BeginFrameDrag;
     return 1;
 }