loplugin:checkunusedparams in sw(part3)

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

16 files changed, 48 insertions, 54 deletions

diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 33193704242f..67e571142e05 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -91,9 +91,9 @@ public:
     SwDoc* GetDoc() const { return m_pDoc; }
     //void  SetDoc( SwDoc * pNewDoc);
     sal_uLong StartPutBlock( const OUString& rShort, const OUString& rPackageName );
-    sal_uLong PutBlock( SwPaM& rPaM, const OUString& rLong );
+    sal_uLong PutBlock();
     sal_uLong GetBlockText( const OUString& rShort, OUString& rText );
-    sal_uLong PutBlockText( const OUString& rShort, const OUString& rName, const OUString& rText, const OUString& rPackageName );
+    sal_uLong PutBlockText( const OUString& rShort, const OUString& rText, const OUString& rPackageName );
     void MakeBlockText( const OUString& rText );
 
 };
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index f293b879cf58..b8482dce92b4 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -137,7 +137,7 @@ protected:
     void LockJoin()   { m_bLockJoin = true;  }
     void UnlockJoin() { m_bLockJoin = false; }
 
-    bool CheckMoveFwd( bool& rbMakePage, bool bKeep, bool bMovedBwd, bool bIgnoreMyOwnKeepValue = false );
+    bool CheckMoveFwd( bool& rbMakePage, bool bKeep, bool bIgnoreMyOwnKeepValue = false );
     bool MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways = false );
     bool MoveBwd( bool &rbReformat );
     virtual bool ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool bHead, bool &rReformat )=0;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 199a7725198f..5e72455c35e8 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -361,10 +361,10 @@ public:
     SwLayoutFrame *GetNextFootnoteLeaf( MakePageType eMakePage );
     SwLayoutFrame *GetNextSctLeaf( MakePageType eMakePage );
     SwLayoutFrame *GetNextCellLeaf();
-    SwLayoutFrame *GetPrevLeaf   ( MakePageType eMakeFootnote );
+    SwLayoutFrame *GetPrevLeaf   ();
     SwLayoutFrame *GetPrevFootnoteLeaf( MakePageType eMakeFootnote );
-    SwLayoutFrame *GetPrevSctLeaf( MakePageType eMakeFootnote );
-    SwLayoutFrame *GetPrevCellLeaf( MakePageType eMakeFootnote );
+    SwLayoutFrame *GetPrevSctLeaf();
+    SwLayoutFrame *GetPrevCellLeaf();
     const SwLayoutFrame *GetLeaf ( MakePageType eMakePage, bool bFwd,
                                  const SwFrame *pAnch ) const;
 
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 862aafef5da5..fd9ac92aa556 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -99,7 +99,7 @@ public:
     void CollectEndnote( SwFootnoteFrame* pFootnote );
     bool HasEndnotes() const;
 
-    void LoopControl( SwPageFrame* pPage, sal_uInt8 nLoop );
+    void LoopControl( SwPageFrame* pPage );
     void EndLoopControl();
     void LoopingLouieLight( const SwDoc& rDoc, const SwTextFrame& rFrame );
 
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index ad814db67680..eded8b3def6d 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1435,7 +1435,7 @@ SwLayoutFrame* SwFrame::GetNextCellLeaf()
     return pTmpFrame ? static_cast<SwCellFrame*>(pTmpFrame)->GetFollowCell() : nullptr;
 }
 
-SwLayoutFrame* SwFrame::GetPrevCellLeaf( MakePageType )
+SwLayoutFrame* SwFrame::GetPrevCellLeaf()
 {
     SwFrame* pTmpFrame = this;
     while ( !pTmpFrame->IsCellFrame() )
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index af40bd647651..5724da1b87a9 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -789,12 +789,12 @@ SwLayoutFrame *SwFrame::GetLeaf( MakePageType eMakePage, bool bFwd )
     }
 
     if ( bInTab && ( !IsTabFrame() || GetUpper()->IsCellFrame() ) ) // TABLE IN TABLE
-        return bFwd ? GetNextCellLeaf() : GetPrevCellLeaf( eMakePage );
+        return bFwd ? GetNextCellLeaf() : GetPrevCellLeaf();
 
     if ( bInSct )
-        return bFwd ? GetNextSctLeaf( eMakePage ) : GetPrevSctLeaf( eMakePage );
+        return bFwd ? GetNextSctLeaf( eMakePage ) : GetPrevSctLeaf();
 
-    return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf( eMakePage );
+    return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf();
 }
 
 bool SwFrame::WrongPageDesc( SwPageFrame* pNew )
@@ -1004,7 +1004,7 @@ SwLayoutFrame *SwFrame::GetNextLeaf( MakePageType eMakePage )
 }
 
 /// Returns the previous layout leaf where we can move the frame.
-SwLayoutFrame *SwFrame::GetPrevLeaf( MakePageType )
+SwLayoutFrame *SwFrame::GetPrevLeaf()
 {
     OSL_ENSURE( !IsInFootnote(), "GetPrevLeaf(), don't call me for Footnote." );
 
@@ -1712,7 +1712,7 @@ SwTwips SwFlowFrame::CalcAddLowerSpaceAsLastInTableCell(
 }
 
 /// Moves the Frame forward if it seems necessary regarding the current conditions and attributes.
-bool SwFlowFrame::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool, bool bIgnoreMyOwnKeepValue )
+bool SwFlowFrame::CheckMoveFwd( bool& rbMakePage, bool bKeep, bool bIgnoreMyOwnKeepValue )
 {
     const SwFrame* pNxt = m_rThis.GetIndNext();
 
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index aa84e25c5cd8..827b13cf58e8 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -581,7 +581,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
                         }
                     }
                     if( bNoLoop )
-                        rLayoutAccess.GetLayouter()->LoopControl( pPage, LOOP_PAGE );
+                        rLayoutAccess.GetLayouter()->LoopControl( pPage );
                 }
 
                 unlockPositionOfObjects( pPage );
@@ -634,7 +634,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
                     pPage = static_cast<SwPageFrame*>(pPage->GetNext());
                 }
                 if( bNoLoop )
-                    rLayoutAccess.GetLayouter()->LoopControl( pPage, LOOP_PAGE );
+                    rLayoutAccess.GetLayouter()->LoopControl( pPage );
             }
             CheckIdleEnd();
         }
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 947bd6b264c1..66f816661e97 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -110,7 +110,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream )
                 nOffset = COMPLETE_STRING;
             aIo.CloseFlagRec();
             Insert( SW_LAYCACHE_IO_REC_PARA, nIndex, (sal_Int32)nOffset );
-            aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA );
+            aIo.CloseRec();
             break;
         }
         case SW_LAYCACHE_IO_REC_TABLE:
@@ -120,7 +120,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream )
                            .ReadUInt32( nOffset );
             Insert( SW_LAYCACHE_IO_REC_TABLE, nIndex, (sal_Int32)nOffset );
             aIo.CloseFlagRec();
-            aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE );
+            aIo.CloseRec();
             break;
         case SW_LAYCACHE_IO_REC_FLY:
         {
@@ -132,7 +132,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream )
             aIo.GetStream().ReadUInt16( nPgNum ).ReadUInt32( nIndex )
                    .ReadInt32( nX ).ReadInt32( nY ).ReadInt32( nW ).ReadInt32( nH );
             m_FlyCache.push_back(SwFlyCache( nPgNum, nIndex, nX, nY, nW, nH ));
-            aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY );
+            aIo.CloseRec();
             break;
         }
         default:
@@ -140,7 +140,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream )
             break;
         }
     }
-    aIo.CloseRec( SW_LAYCACHE_IO_REC_PAGES );
+    aIo.CloseRec();
 
     return !aIo.HasError();
 }
@@ -198,7 +198,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                                 aIo.GetStream().WriteUInt32( static_cast<SwTextFrame*>(pTmp)->GetOfst() );
                             aIo.CloseFlagRec();
                             /*  Close Paragraph Record */
-                            aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA );
+                            aIo.CloseRec();
                         }
                     }
                     else if( pTmp->IsTabFrame() )
@@ -238,7 +238,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                                                .WriteUInt32( nOfst );
                                 aIo.CloseFlagRec();
                                 /* Close Table Record  */
-                                aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE );
+                                aIo.CloseRec();
                             }
                             // If the table has a follow on the next page,
                             // we know already the row number and store this
@@ -301,7 +301,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
                                                .WriteInt32( rRct.Width() )
                                                .WriteInt32( rRct.Height() );
                                 /* Close Fly Record  */
-                                aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY );
+                                aIo.CloseRec();
                             }
                         }
                     }
@@ -309,7 +309,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
             }
             pPage = static_cast<SwPageFrame*>(pPage->GetNext());
         }
-        aIo.CloseRec( SW_LAYCACHE_IO_REC_PAGES );
+        aIo.CloseRec();
     }
 }
 
@@ -1083,7 +1083,7 @@ bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType )
 }
 
 // Close record
-bool SwLayCacheIoImpl::CloseRec( sal_uInt8 )
+bool SwLayCacheIoImpl::CloseRec()
 {
     bool bRes = true;
     OSL_ENSURE( !aRecords.empty(), "CloseRec: no levels" );
@@ -1158,7 +1158,7 @@ void SwLayCacheIoImpl::SkipRec()
     sal_uInt8 c = Peek();
     OpenRec( c );
     pStream->Seek( aRecords.back().size );
-    CloseRec( c );
+    CloseRec();
 }
 
 sal_uInt8 SwLayCacheIoImpl::OpenFlagRec()
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index b71c9bc228d9..51218c35bfbd 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -167,9 +167,9 @@ public:
     /// Open a record of type "nType"
     bool OpenRec( sal_uInt8 nType );
 
-    /// Close a record of type "nType". This skips any unread data that
+    /// Close a record. This skips any unread data that
     /// remains in the record.
-    bool CloseRec( sal_uInt8 nType );
+    bool CloseRec();
 
     /// Return the number of bytes contained in the current record that
     /// haven't been read by now.
diff --git a/sw/source/core/layout/layouter.cxx b/sw/source/core/layout/layouter.cxx
index cfa4d8cb80f8..6dc0c80d3c10 100644
--- a/sw/source/core/layout/layouter.cxx
+++ b/sw/source/core/layout/layouter.cxx
@@ -246,7 +246,7 @@ void SwLayouter::InsertEndnotes( SwSectionFrame* pSect )
     mpEndnoter->InsertEndnotes();
 }
 
-void SwLayouter::LoopControl( SwPageFrame* pPage, sal_uInt8 )
+void SwLayouter::LoopControl( SwPageFrame* pPage )
 {
     OSL_ENSURE( mpLooping, "Looping: Lost control" );
     mpLooping->Control( pPage );
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 074978d2f4f9..7dd2e43a976c 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1647,7 +1647,7 @@ SwLayoutFrame *SwFrame::GetNextSctLeaf( MakePageType eMakePage )
 }
 
 /// Returns the preceding layout sheet where the frame can be moved into
-SwLayoutFrame *SwFrame::GetPrevSctLeaf( MakePageType )
+SwLayoutFrame *SwFrame::GetPrevSctLeaf()
 {
     PROTOCOL_ENTER( this, PROT::Leaf, DbgAction::PrevSect, GetUpper()->FindSctFrame() )
 
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 4d62e42840c2..147f517914bb 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1876,7 +1876,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext)
         const bool bMoveable = IsMoveable();
         if (bMoveable &&
             !(bMovedFwd && bEmulateTableKeep) )
-            if ( CheckMoveFwd( bMakePage, bKeep && KEEPTAB, bMovedBwd, bEmulateTableKeep ) )
+            if ( CheckMoveFwd( bMakePage, bKeep && KEEPTAB, bEmulateTableKeep ) )
             {
                 bMovedFwd = true;
                 m_bCalcLowers = true;
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 7c91e9deff01..a4e669327098 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -49,7 +49,7 @@ private:
     SwXMLBlockListImport & rLocalRef;
 
 public:
-    SwXMLBlockListContext( SwXMLBlockListImport& rImport, sal_Int32 Element,
+    SwXMLBlockListContext( SwXMLBlockListImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
@@ -59,7 +59,7 @@ public:
 class SwXMLBlockContext : public SvXMLImportContext
 {
 public:
-    SwXMLBlockContext( SwXMLBlockListImport& rImport, sal_Int32 Element,
+    SwXMLBlockContext( SwXMLBlockListImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 };
 
@@ -69,7 +69,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport, sal_Int32 Element,
+    SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
@@ -82,7 +82,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport, sal_Int32 Element,
+    SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport,
         const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
@@ -95,7 +95,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport, sal_Int32 Element,
+    SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport,
                 const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
@@ -109,7 +109,7 @@ private:
     SwXMLTextBlockImport & rLocalRef;
 
 public:
-    SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport, sal_Int32 Element,
+    SwXMLTextBlockParContext( SwXMLTextBlockImport & rImport,
             const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList );
 
     virtual void SAL_CALL characters( const OUString & aChars ) override;
@@ -171,7 +171,6 @@ sal_Int32 SwXMLBlockListTokenHandler::getTokenDirect( const char *pTag, sal_Int3
 
 SwXMLBlockListContext::SwXMLBlockListContext(
     SwXMLBlockListImport& rImport,
-    sal_Int32 /*Element*/,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) :
     SvXMLImportContext( rImport ),
     rLocalRef( rImport )
@@ -185,14 +184,13 @@ SwXMLBlockListContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if ( Element == SwXMLBlockListToken::BLOCK )
-        return new SwXMLBlockContext( rLocalRef, Element, xAttrList );
+        return new SwXMLBlockContext( rLocalRef, xAttrList );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLBlockContext::SwXMLBlockContext(
     SwXMLBlockListImport& rImport,
-    sal_Int32 /*Element*/,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) :
     SvXMLImportContext( rImport )
 {
@@ -221,7 +219,6 @@ SwXMLBlockContext::SwXMLBlockContext(
 
 SwXMLTextBlockDocumentContext::SwXMLTextBlockDocumentContext(
     SwXMLTextBlockImport& rImport,
-    sal_Int32 /*Element*/,
     const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
     SvXMLImportContext( rImport ),
     rLocalRef(rImport)
@@ -233,14 +230,13 @@ SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if ( Element == SwXMLTextBlockToken::OFFICE_BODY )
-        return new SwXMLTextBlockBodyContext( rLocalRef, Element, xAttrList );
+        return new SwXMLTextBlockBodyContext( rLocalRef, xAttrList );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLTextBlockTextContext::SwXMLTextBlockTextContext(
     SwXMLTextBlockImport& rImport,
-    sal_Int32 /*Element*/,
     const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList */) :
     SvXMLImportContext ( rImport ),
     rLocalRef( rImport )
@@ -252,14 +248,13 @@ SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if ( Element == SwXMLTextBlockToken::TEXT_P )
-        return new SwXMLTextBlockParContext( rLocalRef, Element, xAttrList );
+        return new SwXMLTextBlockParContext( rLocalRef, xAttrList );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext(
     SwXMLTextBlockImport& rImport,
-    sal_Int32 /*Element*/,
     const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
     SvXMLImportContext( rImport ),
     rLocalRef(rImport)
@@ -271,16 +266,15 @@ SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if( Element == SwXMLTextBlockToken::OFFICE_TEXT )
-        return new SwXMLTextBlockTextContext( rLocalRef, Element, xAttrList );
+        return new SwXMLTextBlockTextContext( rLocalRef, xAttrList );
     else if( Element == SwXMLTextBlockToken::TEXT_P )
-        return new SwXMLTextBlockParContext( rLocalRef, Element, xAttrList );
+        return new SwXMLTextBlockParContext( rLocalRef, xAttrList );
     else
         return new SvXMLImportContext( rLocalRef );
 }
 
 SwXMLTextBlockParContext::SwXMLTextBlockParContext(
     SwXMLTextBlockImport& rImport,
-    sal_Int32 /*Element*/,
     const uno::Reference< xml::sax::XFastAttributeList > & /*xAttrList*/ ) :
     SvXMLImportContext( rImport ),
     rLocalRef( rImport )
@@ -321,7 +315,7 @@ SvXMLImportContext* SwXMLBlockListImport::CreateFastContext( sal_Int32 Element,
     const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
 {
     if( Element == SwXMLBlockListToken::BLOCK_LIST )
-        return new SwXMLBlockListContext( *this, Element, xAttrList );
+        return new SwXMLBlockListContext( *this, xAttrList );
     else
         return SvXMLImport::CreateFastContext( Element, xAttrList );
 }
@@ -346,7 +340,7 @@ SvXMLImportContext* SwXMLTextBlockImport::CreateFastContext( sal_Int32 Element,
 {
     if( Element == SwXMLTextBlockToken::OFFICE_DOCUMENT ||
         Element == SwXMLTextBlockToken::OFFICE_DOCUMENT_CONTENT )
-        return new SwXMLTextBlockDocumentContext( *this, Element, xAttrList );
+        return new SwXMLTextBlockDocumentContext( *this, xAttrList );
     else
         return SvXMLImport::CreateFastContext( Element, xAttrList );
 }
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 2a361c5eb8b6..231fe15e9ded 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -316,7 +316,7 @@ sal_uLong SwXMLTextBlocks::BeginPutDoc( const OUString& rShort, const OUString&
     return StartPutBlock (rShort, aPackageName);
 }
 
-sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
+sal_uLong SwXMLTextBlocks::PutBlock()
 {
     sal_uLong nRes = 0; // dead variable, this always returns 0
     SwXmlFlags nCommitFlags = nFlags;
@@ -395,7 +395,7 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
 sal_uLong SwXMLTextBlocks::PutDoc()
 {
     SwPaM* pPaM = MakePaM();
-    sal_uLong nErr = PutBlock(*pPaM, m_aLong);
+    sal_uLong nErr = PutBlock();
     delete pPaM;
     return nErr;
 }
@@ -557,7 +557,7 @@ sal_uLong SwXMLTextBlocks::PutText( const OUString& rShort, const OUString& rNam
     SetIsTextOnly( m_aShort, true );
     aPackageName = GeneratePackageName( rShort );
     ClearDoc();
-    nRes = PutBlockText( rShort, rName, rText, aPackageName );
+    nRes = PutBlockText( rShort, rText, aPackageName );
     return nRes;
 }
 
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index efe97fc3d02d..157608397612 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -335,7 +335,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText
     return n;
 }
 
-sal_uLong SwXMLTextBlocks::PutBlockText( const OUString& rShort, const OUString& ,
+sal_uLong SwXMLTextBlocks::PutBlockText( const OUString& rShort,
                                          const OUString& rText,  const OUString& rPackageName )
 {
     GetIndex ( rShort );
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index a4e061050f98..369924a4a1e7 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -336,7 +336,7 @@ bool SwTaggedPDFHelper::CheckReopenTag()
         if ( ( rFrame.IsPageFrame() && static_cast<const SwPageFrame&>(rFrame).GetPrev() ) ||
              ( rFrame.IsFlowFrame() && SwFlowFrame::CastFlowFrame(&rFrame)->IsFollow() ) ||
              ( rFrame.IsRowFrame() && rFrame.IsInFollowFlowRow() ) ||
-             ( rFrame.IsCellFrame() && const_cast<SwFrame&>(rFrame).GetPrevCellLeaf( MAKEPAGE_NONE ) ) )
+             ( rFrame.IsCellFrame() && const_cast<SwFrame&>(rFrame).GetPrevCellLeaf() ) )
         {
             pKeyFrame = &rFrame;
         }