sw/inc/swtable.hxx                              |    6 +++---
 sw/inc/viewsh.hxx                               |    2 +-
 sw/source/core/doc/docdraw.cxx                  |    2 +-
 sw/source/core/inc/UndoDraw.hxx                 |    2 +-
 sw/source/core/inc/txtfrm.hxx                   |    2 +-
 sw/source/core/inc/unobookmark.hxx              |    6 ++----
 sw/source/core/layout/layact.cxx                |    2 +-
 sw/source/core/table/swnewtable.cxx             |    2 +-
 sw/source/core/text/inftxt.cxx                  |    2 +-
 sw/source/core/text/inftxt.hxx                  |    2 +-
 sw/source/core/text/porexp.cxx                  |    2 +-
 sw/source/core/text/porfld.cxx                  |    1 -
 sw/source/core/text/porfld.hxx                  |    4 +---
 sw/source/core/text/txtfld.cxx                  |    3 +--
 sw/source/core/txtnode/txtedt.cxx               |    4 +---
 sw/source/core/undo/undraw.cxx                  |    2 +-
 sw/source/core/unocore/unobkm.cxx               |   24 +++++++++++-------------
 sw/source/core/unocore/unotext.cxx              |    5 ++---
 sw/source/core/view/pagepreviewlayout.cxx       |    2 +-
 sw/source/core/view/viewsh.cxx                  |    4 ++--
 sw/source/filter/html/htmlcss1.cxx              |    7 ++-----
 sw/source/filter/html/htmlctxt.cxx              |   10 +++++-----
 sw/source/filter/html/htmlflywriter.cxx         |    8 +++-----
 sw/source/filter/html/htmlgrin.cxx              |    9 +++------
 sw/source/filter/html/htmlnumreader.cxx         |    3 +--
 sw/source/filter/html/htmlplug.cxx              |    8 ++++----
 sw/source/filter/html/htmlsect.cxx              |    6 +++---
 sw/source/filter/html/htmltab.cxx               |    5 ++---
 sw/source/filter/html/swhtml.cxx                |    2 +-
 sw/source/filter/html/swhtml.hxx                |   11 ++++-------
 sw/source/filter/xml/XMLRedlineImportHelper.cxx |    4 +---
 sw/source/filter/xml/XMLRedlineImportHelper.hxx |   10 ++--------
 sw/source/filter/xml/xmlexpit.cxx               |   17 ++---------------
 sw/source/filter/xml/xmlexpit.hxx               |    9 ---------
 sw/source/filter/xml/xmltbli.cxx                |    7 ++-----
 sw/source/filter/xml/xmltbli.hxx                |    3 +--
 sw/source/filter/xml/xmltexti.cxx               |    5 ++---
 37 files changed, 72 insertions(+), 131 deletions(-)

New commits:
commit ea8c12b8cc03ed259389ac267edd459844634767
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date:   Mon May 8 11:32:12 2017 +0200

    loplugin:checkunusedparams in sw(part4)
    
    Change-Id: Ia264c192ac02a07bba67a66196899d13b19f83f0
    Reviewed-on: https://gerrit.libreoffice.org/37386
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index e2508ec117ac..4e33cdf3b7c2 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -166,7 +166,7 @@ private:
     bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* );
     bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
     bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged,
-                   SwTableBox*, SwUndoTableMerge* );
+                   SwUndoTableMerge* );
     bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
     SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
     void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt );
@@ -241,8 +241,8 @@ public:
 #ifdef DBG_UTIL
         m_bDontChangeModel = true;
 #endif
-        return m_bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo 
) :
-                           OldMerge( pDoc, rBoxes, pMergeBox, pUndo );
+        return m_bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pUndo ) :
+                             OldMerge( pDoc, rBoxes, pMergeBox, pUndo );
     }
     bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt,
                    bool bSameHeight )
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index c1d62f9a64f7..17fe5f6f2c9f 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -169,7 +169,7 @@ class SW_DLLPUBLIC SwViewShell : public 
sw::Ring<SwViewShell>
     SAL_DLLPRIVATE void PaintDesktop(vcl::RenderContext& rRenderContext, const 
SwRect&);  // Collect values for painting of desktop
                                                         // and calling.
     // PaintDesktop split. This pars is also used by PreviewPage.
-    SAL_DLLPRIVATE void PaintDesktop_(vcl::RenderContext& rRenderContext, 
const SwRegionRects &rRegion);
+    SAL_DLLPRIVATE void PaintDesktop_(const SwRegionRects &rRegion);
 
     SAL_DLLPRIVATE bool CheckInvalidForPaint( const SwRect & );  // Direct 
Paint or rather
                                                                     // trigger 
an action.
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 28be9b0d92d1..fb0ed0fed7d9 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -461,7 +461,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
                         pObj->SetUserCall( nullptr );
 
                         if( pUndo )
-                            pUndo->AddObj( i, pFormat, rMark );
+                            pUndo->AddObj( pFormat, rMark );
                         else
                             DelFrameFormat( pFormat );
                     }
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 05a46a45e540..5b2c023f5a17 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -127,7 +127,7 @@ public:
     virtual void UndoImpl( ::sw::UndoRedoContext & ) override;
     virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
 
-    void AddObj( sal_uInt16 nPos, SwDrawFrameFormat*, const SdrMark& );
+    void AddObj( SwDrawFrameFormat*, const SdrMark& );
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 660a91a8fa00..66d694d59dba 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -216,7 +216,7 @@ public:
     SwRect AutoSpell_( const SwContentNode*, sal_Int32 );
 
     /// Is called by FormatSpelling()
-    SwRect SmartTagScan( SwContentNode* , sal_Int32 );
+    SwRect SmartTagScan();
 
     /// Is called by CollectAutoCmplWords()
     void CollectAutoCmplWrds( SwContentNode* , sal_Int32 );
diff --git a/sw/source/core/inc/unobookmark.hxx 
b/sw/source/core/inc/unobookmark.hxx
index 5b13c57b66c2..064f6c5a1dea 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -71,8 +71,7 @@ protected:
 
     virtual ~SwXBookmark() override;
 
-    /// @param pDoc and pMark != 0, but not & because of ImplInheritanceHelper
-    SwXBookmark(::sw::mark::IMark *const pMark, SwDoc *const pDoc);
+    SwXBookmark(SwDoc *const pDoc);
 
     /// descriptor
     SwXBookmark();
@@ -186,8 +185,7 @@ private:
 
 protected:
 
-    SwXFieldmark(bool isReplacementObject,
-            ::sw::mark::IMark* pBkm, SwDoc* pDoc = nullptr);
+    SwXFieldmark(bool isReplacementObject, SwDoc* pDoc = nullptr);
 
 public:
 
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 827b13cf58e8..db136d963873 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1925,7 +1925,7 @@ bool SwLayIdle::DoIdleJob_( const SwContentFrame *pCnt, 
IdleJobType eJob )
             case SMART_TAGS :
             {
                 try {
-                    const SwRect aRepaint( 
const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pCnt))->SmartTagScan( 
pContentNode, nTextPos ) );
+                    const SwRect aRepaint( 
const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pCnt))->SmartTagScan() 
);
                     bPageValid = bPageValid && !pTextNode->IsSmartTagDirty();
                     if ( aRepaint.HasArea() )
                         pImp->GetShell()->InvalidateWindows( aRepaint );
diff --git a/sw/source/core/table/swnewtable.cxx 
b/sw/source/core/table/swnewtable.cxx
index 71cb71dc4217..f484a65c200c 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -84,7 +84,7 @@ the undo object to notify, maybe empty
 */
 
 bool SwTable::NewMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
-     const SwSelBoxes& rMerged, SwTableBox*, SwUndoTableMerge* pUndo )
+     const SwSelBoxes& rMerged, SwUndoTableMerge* pUndo )
 {
     if( pUndo )
         pUndo->SetSelBoxes( rBoxes );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 7ad17f21ab11..2dbe5940fb15 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1004,7 +1004,7 @@ void SwTextPaintInfo::DrawRedArrow( const SwLinePortion 
&rPor ) const
     }
 }
 
-void SwTextPaintInfo::DrawPostIts( const SwLinePortion&, bool bScript ) const
+void SwTextPaintInfo::DrawPostIts( bool bScript ) const
 {
     if( OnWin() && m_pOpt->IsPostIts() )
     {
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 9950d417c39e..4b3bf68d238a 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -414,7 +414,7 @@ public:
     void DrawTab( const SwLinePortion &rPor ) const;
     void DrawLineBreak( const SwLinePortion &rPor ) const;
     void DrawRedArrow( const SwLinePortion &rPor ) const;
-    void DrawPostIts( const SwLinePortion &rPor, bool bScript ) const;
+    void DrawPostIts( bool bScript ) const;
     void DrawBackground( const SwLinePortion &rPor ) const;
     void DrawViewOpt( const SwLinePortion &rPor, const sal_uInt16 nWhich ) 
const;
     void DrawBackBrush( const SwLinePortion &rPor ) const;
diff --git a/sw/source/core/text/porexp.cxx b/sw/source/core/text/porexp.cxx
index 0107991d97d9..17e4b7306995 100644
--- a/sw/source/core/text/porexp.cxx
+++ b/sw/source/core/text/porexp.cxx
@@ -214,7 +214,7 @@ SwPostItsPortion::SwPostItsPortion( bool bScrpt )
 void SwPostItsPortion::Paint( const SwTextPaintInfo &rInf ) const
 {
     if( rInf.OnWin() && Width() )
-        rInf.DrawPostIts( *this, IsScript() );
+        rInf.DrawPostIts( IsScript() );
 }
 
 sal_uInt16 SwPostItsPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 9ec460439543..0e7b5e97c1eb 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -753,7 +753,6 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,
 #define GRFNUM_SECURE 10
 
 SwGrfNumPortion::SwGrfNumPortion(
-        SwFrame*,
         const OUString& rGraphicFollowedBy,
         const SvxBrushItem* pGrfBrush,
         const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 3f229e330482..88146081d247 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -26,7 +26,6 @@
 class SwFont;
 class SvxBrushItem;
 class SwFormatVertOrient;
-class SwFrame;
 
 class SwFieldPortion : public SwExpandPortion
 {
@@ -167,8 +166,7 @@ class SwGrfNumPortion : public SwNumberPortion
     SwTwips         nGrfHeight;
     sal_Int16       eOrient;
 public:
-    SwGrfNumPortion( SwFrame *pFrame,
-                     const OUString& rGraphicFollowedBy,
+    SwGrfNumPortion( const OUString& rGraphicFollowedBy,
                      const SvxBrushItem* pGrfBrush,
                      const SwFormatVertOrient* pGrfOrient,
                      const Size& rGrfSize,
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 15be6de18b68..faa5fa153ae3 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -478,8 +478,7 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( 
SwTextFormatInfo &rInf ) con
 
         if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )
         {
-            pRet = new SwGrfNumPortion( 
const_cast<SwTextFrame*>(GetTextFrame()),
-                                        pTextNd->GetLabelFollowedBy(),
+            pRet = new SwGrfNumPortion( pTextNd->GetLabelFollowedBy(),
                                         rNumFormat.GetBrush(),
                                         rNumFormat.GetGraphicOrientation(),
                                         rNumFormat.GetGraphicSize(),
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index 55a0664b30d5..8bf9f294ab8d 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1440,11 +1440,9 @@ SwRect SwTextFrame::AutoSpell_( const SwContentNode* 
pActNode, sal_Int32 nActPos
     recognized words are stored into a list that is used later for drawing
     the underline.
 
-    @param pActNode ???
-    @param nActPos ???
     @return SwRect Repaint area
 */
-SwRect SwTextFrame::SmartTagScan( SwContentNode* /*pActNode*/, sal_Int32 
/*nActPos*/ )
+SwRect SwTextFrame::SmartTagScan()
 {
     SwRect aRet;
     SwTextNode *pNode = GetTextNode();
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index f76e6bfd883b..7419163ef948 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -554,7 +554,7 @@ void SwUndoDrawDelete::RedoImpl(::sw::UndoRedoContext & 
rContext)
     }
 }
 
-void SwUndoDrawDelete::AddObj( sal_uInt16 , SwDrawFrameFormat* pFormat,
+void SwUndoDrawDelete::AddObj( SwDrawFrameFormat* pFormat,
                                 const SdrMark& rMark )
 {
     SwUndoGroupObjImpl& rSave = *( pObjArr + pMarkLst->GetMarkCount() );
diff --git a/sw/source/core/unocore/unobkm.cxx 
b/sw/source/core/unocore/unobkm.cxx
index a7a62f713ce6..f55770676715 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -52,9 +52,9 @@ public:
     ::comphelper::OInterfaceContainerHelper2  m_EventListeners;
     SwDoc *                     m_pDoc;
     ::sw::mark::IMark *         m_pRegisteredBookmark;
-    OUString             m_sMarkName;
+    OUString                    m_sMarkName;
 
-    Impl(   SwDoc *const pDoc, ::sw::mark::IMark *const /*pBookmark*/)
+    Impl( SwDoc *const pDoc )
         : SwClient()
         , m_EventListeners(m_Mutex)
         , m_pDoc(pDoc)
@@ -124,15 +124,13 @@ const ::sw::mark::IMark* SwXBookmark::GetBookmark() const
     return m_pImpl->m_pRegisteredBookmark;
 }
 
-SwXBookmark::SwXBookmark(
-    ::sw::mark::IMark *const pBkmk,
-    SwDoc *const pDoc)
-    : m_pImpl( new SwXBookmark::Impl(pDoc, pBkmk) )
+SwXBookmark::SwXBookmark(SwDoc *const pDoc)
+    : m_pImpl( new SwXBookmark::Impl(pDoc) )
 {
 }
 
 SwXBookmark::SwXBookmark()
-    : m_pImpl( new SwXBookmark::Impl(nullptr, nullptr) )
+    : m_pImpl( new SwXBookmark::Impl(nullptr) )
 {
 }
 
@@ -160,7 +158,7 @@ uno::Reference<text::XTextContent> 
SwXBookmark::CreateXBookmark(
             "<SwXBookmark::GetObject(..)>"
             "SwXBookmark requested for non-bookmark mark and non-annotation 
mark.");
         SwXBookmark *const pXBookmark =
-            (pBookmark) ? new SwXBookmark(pBookmark, &rDoc) : new SwXBookmark;
+            pBookmark ? new SwXBookmark(&rDoc) : new SwXBookmark;
         xBookmark.set(pXBookmark);
         pXBookmark->m_pImpl->registerInMark(*pXBookmark, pMarkBase);
     }
@@ -451,8 +449,8 @@ SwXBookmark::removeVetoableChangeListener(
     OSL_FAIL("SwXBookmark::removeVetoableChangeListener(): not implemented");
 }
 
-SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, 
SwDoc* pDc)
-    : SwXFieldmark_Base(pBkm, pDc)
+SwXFieldmark::SwXFieldmark(bool _isReplacementObject, SwDoc* pDc)
+    : SwXFieldmark_Base(pDc)
     , isReplacementObject(_isReplacementObject)
 { }
 
@@ -584,11 +582,11 @@ SwXFieldmark::CreateXFieldmark(SwDoc & rDoc, 
::sw::mark::IMark *const pMark,
         // FIXME: These belong in XTextFieldsSupplier
         SwXFieldmark* pXBkmk = nullptr;
         if (dynamic_cast< ::sw::mark::TextFieldmark* >(pMark))
-            pXBkmk = new SwXFieldmark(false, pMark, &rDoc);
+            pXBkmk = new SwXFieldmark(false, &rDoc);
         else if (dynamic_cast< ::sw::mark::CheckboxFieldmark* >(pMark))
-            pXBkmk = new SwXFieldmark(true, pMark, &rDoc);
+            pXBkmk = new SwXFieldmark(true, &rDoc);
         else
-            pXBkmk = new SwXFieldmark(isReplacementObject, nullptr, &rDoc);
+            pXBkmk = new SwXFieldmark(isReplacementObject, &rDoc);
 
         xMark.set(pXBkmk);
         pXBkmk->registerInMark(*pXBkmk, pMarkBase);
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index a22f2e874822..1fd184b1db6d 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2554,8 +2554,7 @@ public:
 
     bool                        m_bIsHeader;
 
-    Impl(   SwXHeadFootText & /*rThis*/,
-            SwFrameFormat & rHeadFootFormat, const bool bIsHeader)
+    Impl( SwFrameFormat & rHeadFootFormat, const bool bIsHeader)
         : SwClient(& rHeadFootFormat)
         , m_bIsHeader(bIsHeader)
     {
@@ -2610,7 +2609,7 @@ SwXHeadFootText::CreateXHeadFootText(
 SwXHeadFootText::SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool 
bIsHeader)
     : SwXText(rHeadFootFormat.GetDoc(),
             (bIsHeader) ? CursorType::Header : CursorType::Footer)
-    , m_pImpl( new SwXHeadFootText::Impl(*this, rHeadFootFormat, bIsHeader) )
+    , m_pImpl( new SwXHeadFootText::Impl(rHeadFootFormat, bIsHeader) )
 {
 }
 
diff --git a/sw/source/core/view/pagepreviewlayout.cxx 
b/sw/source/core/view/pagepreviewlayout.cxx
index fc023046a74b..272ce8955a6c 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1053,7 +1053,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const tools:
             }
         }
         // paint preview background rectangles
-        mrParentViewShell.PaintDesktop_(rRenderContext, aPreviewBackgrdRegion);
+        mrParentViewShell.PaintDesktop_(aPreviewBackgrdRegion);
     }
 
     // prepare data for paint of pages
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 52d625644324..616bcbd1aa7f 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1523,11 +1523,11 @@ void SwViewShell::PaintDesktop(vcl::RenderContext& 
rRenderContext, const SwRect
         }
     }
     if ( !aRegion.empty() )
-        PaintDesktop_(rRenderContext, aRegion);
+        PaintDesktop_(aRegion);
 }
 
 // PaintDesktop is split in two, this part is also used by PreviewPage
-void SwViewShell::PaintDesktop_(vcl::RenderContext& /*rRenderContext*/, const 
SwRegionRects &rRegion)
+void SwViewShell::PaintDesktop_(const SwRegionRects &rRegion)
 {
     // OD 2004-04-23 #116347#
     GetOut()->Push( PushFlags::FILLCOLOR|PushFlags::LINECOLOR );
diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index d486ffb3c45f..f059050717ac 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1932,8 +1932,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString 
&rStyle,
     return bRet;
 }
 
-void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
-                                           const SvxCSS1PropertyInfo 
&rPropInfo,
+void SwHTMLParser::SetAnchorAndAdjustment( const SvxCSS1PropertyInfo 
&rPropInfo,
                                            SfxItemSet &rFrameItemSet )
 {
     SwFormatAnchor aAnchor;
@@ -2037,8 +2036,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const 
SfxItemSet & /*rItemSet*/,
     rFrameItemSet.Put( SwFormatSurround( eSurround ) );
 }
 
-void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
-                               SvxCSS1PropertyInfo &rPropInfo,
+void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
                                SfxItemSet &rFrameItemSet,
                                SwTwips nDfltWidth, sal_uInt8 nDfltPrcWidth )
 {
@@ -2079,7 +2077,6 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
 }
 
 void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
-                                   SvxCSS1PropertyInfo & /*rPropInfo*/,
                                    HtmlFrameFormatFlags nFlags,
                                    SfxItemSet &rFrameItemSet )
 {
diff --git a/sw/source/filter/html/htmlctxt.cxx 
b/sw/source/filter/html/htmlctxt.cxx
index f528368230b5..423f2b670155 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -412,14 +412,14 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
         if( !IsNewDoc() )
             Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
-        SetAnchorAndAdjustment( text::VertOrientation::NONE, 
text::HoriOrientation::NONE, rItemSet, rPropInfo,
+        SetAnchorAndAdjustment( text::VertOrientation::NONE, 
text::HoriOrientation::NONE, rPropInfo,
                                 aFrameItemSet );
 
-        SetVarSize( rItemSet, rPropInfo, aFrameItemSet );
+        SetVarSize( rPropInfo, aFrameItemSet );
 
         SetSpace( Size(0,0), rItemSet, rPropInfo, aFrameItemSet );
 
-        SetFrameFormatAttrs( rItemSet, rPropInfo,
+        SetFrameFormatAttrs( rItemSet,
                         
HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Padding|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
                         aFrameItemSet );
 
@@ -447,12 +447,12 @@ bool SwHTMLParser::CreateContainer( const OUString& 
rClass,
             Reader::ResetFrameFormatAttrs( *pFrameItemSet );
 
         SetAnchorAndAdjustment( text::VertOrientation::NONE, 
text::HoriOrientation::NONE,
-                                rItemSet, rPropInfo, *pFrameItemSet );
+                                rPropInfo, *pFrameItemSet );
         Size aDummy(0,0);
         SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
                     *pFrameItemSet );
         SetSpace( aDummy, rItemSet, rPropInfo, *pFrameItemSet );
-        SetFrameFormatAttrs( rItemSet, rPropInfo, 
HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
+        SetFrameFormatAttrs( rItemSet, 
HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
                         *pFrameItemSet );
 
         bRet = true;
diff --git a/sw/source/filter/html/htmlflywriter.cxx 
b/sw/source/filter/html/htmlflywriter.cxx
index 751f89c3cfb5..3cd38830f0aa 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -134,8 +134,7 @@ static Writer& OutHTML_FrameFormatAsMulticol( Writer& rWrt, 
const SwFrameFormat&
 static Writer& OutHTML_FrameFormatAsSpacer( Writer& rWrt, const SwFrameFormat& 
rFormat );
 static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
                                           const SwFrameFormat& rFrameFormat, 
bool bSpan );
-static Writer& OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& 
rFormat,
-                                      bool bInCntnr );
+static Writer& OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& 
rFormat );
 
 static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& 
rFormat,
                                       bool bInCntnr );
@@ -501,7 +500,7 @@ void SwHTMLWriter::OutFrameFormat( AllHtmlFlags nMode, 
const SwFrameFormat& rFra
                     static_cast<const SwDrawFrameFormat &>(rFrameFormat), 
*pSdrObject );
         break;
     case HtmlOut::GraphicFrame:
-        OutHTML_FrameFormatAsImage( *this, rFrameFormat, pCntnrStr != nullptr 
);
+        OutHTML_FrameFormatAsImage( *this, rFrameFormat );
         break;
     }
 
@@ -1710,8 +1709,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& 
rWrt,
     return rWrt;
 }
 
-static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& 
rFrameFormat,
-                                       bool /*bInCntnr*/ )
+static Writer & OutHTML_FrameFormatAsImage( Writer& rWrt, const SwFrameFormat& 
rFrameFormat )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 1ee611cfd9f5..8e6ef04b7c65 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -146,11 +146,8 @@ void SwHTMLParser::ConnectImageMaps()
     }
 }
 
-/*  */
-
 void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                            sal_Int16 eHoriOri,
-                                           const SfxItemSet &rCSS1ItemSet,
                                            const SvxCSS1PropertyInfo 
&rCSS1PropInfo,
                                            SfxItemSet& rFrameItemSet )
 {
@@ -167,7 +164,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 
eVertOri,
     else if( SwCSS1Parser::MayBePositioned( rCSS1PropInfo, true ) )
     {
         // If the alignment can be set via CSS1 options we use them.
-        SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrameItemSet );
+        SetAnchorAndAdjustment( rCSS1PropInfo, rFrameItemSet );
     }
     else
     {
@@ -535,12 +532,12 @@ IMAGE_SETEVENT:
         aFrameSet.Put( aBoxItem );
     }
 
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet 
);
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, aFrameSet );
 
     SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrameSet );
 
     // set other CSS1 attributes
-    SetFrameFormatAttrs( aItemSet, aPropInfo, HtmlFrameFormatFlags::Box, 
aFrameSet );
+    SetFrameFormatAttrs( aItemSet, HtmlFrameFormatFlags::Box, aFrameSet );
 
     Size aTwipSz( bPrcWidth ? 0 : nWidth, bPrcHeight ? 0 : nHeight );
     if( (aTwipSz.Width() || aTwipSz.Height()) && 
Application::GetDefaultDevice() )
diff --git a/sw/source/filter/html/htmlnumreader.cxx 
b/sw/source/filter/html/htmlnumreader.cxx
index 66109b02cab7..d4d4895521e3 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -549,8 +549,7 @@ void SwHTMLParser::NewNumBulListItem( HtmlTokenId nToken )
     ShowStatline();
 }
 
-void SwHTMLParser::EndNumBulListItem( HtmlTokenId nToken, bool bSetColl,
-                                      bool /*bLastPara*/ )
+void SwHTMLParser::EndNumBulListItem( HtmlTokenId nToken, bool bSetColl )
 {
     // Create a new paragraph
     if( nToken == HtmlTokenId::NONE && m_pPam->GetPoint()->nContent.GetIndex() 
)
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index 3e5b9de50293..adc048cb3b67 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -439,7 +439,7 @@ void SwHTMLParser::InsertEmbed()
     // den Anker setzen
     if( !bHidden )
     {
-        SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, 
aFrameSet );
+        SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, aFrameSet );
     }
     else
     {
@@ -610,7 +610,7 @@ void SwHTMLParser::NewObject()
         Reader::ResetFrameFormatAttrs( rFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet 
);
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, rFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
@@ -744,7 +744,7 @@ void SwHTMLParser::InsertApplet()
         Reader::ResetFrameFormatAttrs( rFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet 
);
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, rFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
@@ -927,7 +927,7 @@ void SwHTMLParser::InsertFloatingFrame()
         Reader::ResetFrameFormatAttrs( aFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet 
);
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aPropInfo, aFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index 3d18e2c40e88..b1151ca37313 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -617,19 +617,19 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss 
)
         if( !IsNewDoc() )
             Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
-        SetAnchorAndAdjustment( text::VertOrientation::NONE, 
text::HoriOrientation::NONE, aItemSet, aPropInfo,
+        SetAnchorAndAdjustment( text::VertOrientation::NONE, 
text::HoriOrientation::NONE, aPropInfo,
                                 aFrameItemSet );
 
         // The width is either the WIDTH attribute's value or contained
         // in some style option.
-        SetVarSize( aItemSet, aPropInfo, aFrameItemSet, nTwipWidth, nPrcWidth 
);
+        SetVarSize( aPropInfo, aFrameItemSet, nTwipWidth, nPrcWidth );
 
         SetSpace( Size(0,0), aItemSet, aPropInfo, aFrameItemSet );
 
         // Set some other frame attributes. If the background is set, its
         // it will be cleared here. That for, it won't be set at the section,
         // too.
-        SetFrameFormatAttrs( aItemSet, aPropInfo,
+        SetFrameFormatAttrs( aItemSet,
                         
HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Padding|HtmlFrameFormatFlags::Direction,
                         aFrameItemSet );
 
diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index b319109f3b26..35b8f59e981f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -495,7 +495,7 @@ class HTMLTable
     // Setting the border with the help of guidelines of the Parent-Table
     void InheritBorders( const HTMLTable *pParent,
                          sal_uInt16 nRow, sal_uInt16 nCol,
-                         sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
+                         sal_uInt16 nRowSpan,
                          bool bFirstPara, bool bLastPara );
 
     // Inherit the left and the right border of the surrounding table
@@ -1789,7 +1789,7 @@ SwTableBox *HTMLTable::MakeTableBox( SwTableLine *pUpper,
 
 void HTMLTable::InheritBorders( const HTMLTable *pParent,
                                 sal_uInt16 nRow, sal_uInt16 nCol,
-                                sal_uInt16 nRowSpan, sal_uInt16 /*nColSpan*/,
+                                sal_uInt16 nRowSpan,
                                 bool bFirstPara, bool bLastPara )
 {
     OSL_ENSURE( m_nRows>0 && m_nCols>0 && m_nCurrentRow==m_nRows,
@@ -1924,7 +1924,6 @@ void HTMLTable::SetBorders()
                     {
                         pTable->InheritBorders( this, i, j,
                                                 pCell->GetRowSpan(),
-                                                pCell->GetColSpan(),
                                                 bFirstPara,
                                                 nullptr==pCnts->Next() );
                         pTable->SetBorders();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 4ecd85550174..96b8dc578475 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1709,7 +1709,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
     case HtmlTokenId::UNORDERLIST_OFF:
         if( m_nOpenParaToken != HtmlTokenId::NONE )
             EndPara();
-        EndNumBulListItem( HtmlTokenId::NONE, true, GetNumInfo().GetDepth()==1 
);
+        EndNumBulListItem( HtmlTokenId::NONE, true );
         EndNumBulList( nToken );
         break;
 
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index b23528a9732e..a1ef95e54d8c 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -613,8 +613,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     void NewNumBulList( HtmlTokenId nToken );
     void EndNumBulList( HtmlTokenId nToken = HtmlTokenId::NONE );
     void NewNumBulListItem( HtmlTokenId nToken );
-    void EndNumBulListItem( HtmlTokenId nToken, bool bSetColl,
-                            bool bLastPara=false );
+    void EndNumBulListItem( HtmlTokenId nToken, bool bSetColl);
 
     // definitions lists <DL> with <DD>, <DT>
     void NewDefList();
@@ -663,18 +662,16 @@ private:
     // in Attrset (htmlgrin.cxx)
     void SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                  sal_Int16 eHoriOri,
-                                 const SfxItemSet &rItemSet,
                                  const SvxCSS1PropertyInfo &rPropInfo,
                                  SfxItemSet& rFrameSet );
     void SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                  sal_Int16 eHoriOri,
                                  SfxItemSet& rFrameSet,
                                  bool bDontAppend=false );
-    void SetAnchorAndAdjustment( const SfxItemSet &rItemSet,
-                                 const SvxCSS1PropertyInfo &rPropInfo,
+    void SetAnchorAndAdjustment( const SvxCSS1PropertyInfo &rPropInfo,
                                  SfxItemSet &rFrameItemSet );
 
-    static void SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo 
&rPropInfo,
+    static void SetFrameFormatAttrs( SfxItemSet &rItemSet,
                          HtmlFrameFormatFlags nFlags, SfxItemSet 
&rFrameItemSet );
 
     // create frames and register auto bound frames
@@ -686,7 +683,7 @@ private:
                      bool bPrcWidth, bool bPrcHeight,
                      SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet );
-    static void SetVarSize( SfxItemSet &rItemSet, SvxCSS1PropertyInfo 
&rPropInfo,
+    static void SetVarSize( SvxCSS1PropertyInfo &rPropInfo,
                      SfxItemSet& rFlyItemSet, SwTwips nDfltWidth=MINLAY,
                      sal_uInt8 nDltPrcWidth=0 );
     static void SetSpace( const Size& rPixSpace, SfxItemSet &rItemSet,
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index b7e89103214d..0b4059161d82 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -528,9 +528,7 @@ void XMLRedlineImportHelper::SetCursor(
 }
 
 void XMLRedlineImportHelper::AdjustStartNodeCursor(
-    const OUString& rId,        /// ID used in RedlineAdd() call
-    bool /*bStart*/,
-    Reference<XTextRange> & /*rRange*/)
+    const OUString& rId)        /// ID used in RedlineAdd() call
 {
     // this method will modify the document directly -> lock SolarMutex
     SolarMutexGuard aGuard;
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 4a30e46b3b55..1010af2a847e 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -98,15 +98,9 @@ public:
      * Adjust the start (end) position for a redline that begins in a
      * start node. It takes the cursor positions _inside_ the redlined
      * element (e.g. section or table).
-     *
-     * We will do sanity checking of the given text range: It will
-     * only be considered valid if it points to the next text node
-     * after the position given in a previous SetCursor */
+     */
     void AdjustStartNodeCursor(
-         const OUString& rId,        // ID used in RedlineAdd() call
-        bool bStart,
-        // XTextRange _inside_ a table/section
-        css::uno::Reference<css::text::XTextRange> & rRange);
+         const OUString& rId);        // ID used in RedlineAdd() call
 
     // set redline mode: show changes
     void SetShowChanges( bool bShowChanges );
diff --git a/sw/source/filter/xml/xmlexpit.cxx 
b/sw/source/filter/xml/xmlexpit.cxx
index acd99833b6b1..b4a4ec33c02d 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -93,14 +93,13 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& 
rExport,
                 else
                 {
                     exportXML( rExport, rAttrList, *pItem, rEntry, 
rUnitConverter,
-                                  rNamespaceMap, nFlags, &rSet );
+                                  rNamespaceMap, &rSet );
                 }
             }
         }
         else
         {
-            handleNoItem( rAttrList, rEntry, rUnitConverter, rNamespaceMap,
-                          rSet );
+            OSL_FAIL( "no item not handled in xml export" );
         }
         nIndex++;
     }
@@ -112,7 +111,6 @@ void SvXMLExportItemMapper::exportXML( const SvXMLExport& 
rExport,
                                  const SvXMLItemMapEntry& rEntry,
                                  const SvXMLUnitConverter& rUnitConverter,
                                  const SvXMLNamespaceMap& rNamespaceMap,
-                                 SvXmlExportFlags /*nFlags*/,
                                  const SfxItemSet *pSet ) const
 {
     if( 0 != (rEntry.nMemberId & MID_SW_FLAG_SPECIAL_ITEM_EXPORT) )
@@ -327,17 +325,6 @@ void SvXMLExportItemMapper::handleSpecialItem( 
SvXMLAttributeList& /*rAttrList*/
 }
 
 /** this method is called for every item that has the
-    MID_SW_FLAG_NO_ITEM_EXPORT flag set */
-void SvXMLExportItemMapper::handleNoItem( SvXMLAttributeList& /*rAttrList*/,
-                               const SvXMLItemMapEntry& /*rEntry*/,
-                               const SvXMLUnitConverter& /*rUnitConverter*/,
-                               const SvXMLNamespaceMap& /*rNamespaceMap*/,
-                               const SfxItemSet& /*rSet*/ )
-{
-    OSL_FAIL( "no item not handled in xml export" );
-}
-
-/** this method is called for every item that has the
     MID_SW_FLAG_ELEMENT_EXPORT flag set */
 void SvXMLExportItemMapper::handleElementItem(
                         SvXMLExport& /*rExport*/,
diff --git a/sw/source/filter/xml/xmlexpit.hxx 
b/sw/source/filter/xml/xmlexpit.hxx
index df68321a3cb8..21be616c0145 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -52,7 +52,6 @@ protected:
                     const SvXMLItemMapEntry &rEntry,
                     const SvXMLUnitConverter& rUnitConverter,
                     const SvXMLNamespaceMap& rNamespaceMap,
-                    SvXmlExportFlags nFlags,
                     const SfxItemSet *pSet ) const;
 
     void exportElementItems(  SvXMLExport& rExport,
@@ -84,14 +83,6 @@ public:
                                     const SfxItemSet *pSet ) const;
 
     /** this method is called for every item that has the
-        MID_SW_FLAG_NO_ITEM_EXPORT flag set */
-    static void handleNoItem( SvXMLAttributeList& rAttrList,
-                               const SvXMLItemMapEntry& rEntry,
-                               const SvXMLUnitConverter& rUnitConverter,
-                               const SvXMLNamespaceMap& rNamespaceMap,
-                               const SfxItemSet& rSet );
-
-    /** this method is called for every item that has the
         MID_SW_FLAG_ELEMENT_EXPORT flag set */
     virtual void handleElementItem( SvXMLExport& rExport,
                                     const SvXMLItemMapEntry& rEntry,
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 6ca6d37eb38d..e7c70c98162d 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1952,8 +1952,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine 
*pUpper,
 
 SwTableBox *SwXMLTableContext::MakeTableBox(
         SwTableLine *pUpper, const SwXMLTableCell_Impl *pCell,
-        sal_uInt32 /*nTopRow*/, sal_uInt32 nLeftCol, sal_uInt32 /*nBottomRow*/,
-        sal_uInt32 nRightCol )
+        sal_uInt32 nLeftCol, sal_uInt32 nRightCol )
 {
     //FIXME: here would be a great place to handle XmlId for cell
     SwTableBox *pBox;
@@ -2267,9 +2266,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox 
*pUpper,
                     // is a content box
                     nSplitCol = nCol + 1UL;
 
-                    pBox = MakeTableBox( pLine, pCell,
-                                         nTopRow, nStartCol,
-                                         nBottomRow, nSplitCol );
+                    pBox = MakeTableBox( pLine, pCell, nStartCol, nSplitCol );
 
                     if ( 1 != nBoxRowSpan )
                         pBox->setRowSpan( nBoxRowSpan );
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index f5dc04e26737..e81cd2b84688 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -95,8 +95,7 @@ class SwXMLTableContext : public XMLTextTableContext
                              SwTableLine *pUpper );
     SwTableBox *MakeTableBox( SwTableLine *pUpper,
                               const SwXMLTableCell_Impl *pStartNode,
-                              sal_uInt32 nTopRow, sal_uInt32 nLeftCol,
-                              sal_uInt32 nBottomRow, sal_uInt32 nRightCol );
+                              sal_uInt32 nLeftCol, sal_uInt32 nRightCol );
     SwTableBox *MakeTableBox( SwTableLine *pUpper,
                               sal_uInt32 nTopRow, sal_uInt32 nLeftCol,
                               sal_uInt32 nBottomRow, sal_uInt32 nRightCol );
diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index f49d42a0d4a5..b33e5aec5c8f 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -1001,13 +1001,12 @@ void SwXMLTextImportHelper::RedlineSetCursor(
 }
 
 void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
-    bool bStart)
+    bool /*bStart*/)
 {
     OUString rId = GetOpenRedlineId();
     if ((nullptr != pRedlineHelper) && !rId.isEmpty())
     {
-        uno::Reference<XTextRange> xTextRange( GetCursor()->getStart() );
-        pRedlineHelper->AdjustStartNodeCursor(rId, bStart, xTextRange );
+        pRedlineHelper->AdjustStartNodeCursor(rId);
         ResetOpenRedlineId();
     }
     // else: ignore redline (wasn't added before, or no open redline ID
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to