sw: WW8 export: remove newly unused parameters

Change-Id: I76da4422008c9dad8cf48dd089d644e432007d79

8 files changed, 16 insertions, 18 deletions

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 8d9920d48187..2fb5186b33ea 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -285,7 +285,7 @@ public:
     virtual void EndStyleProperties( bool bParProp ) = 0;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat& rNFormat, const SwFormat& rFormat ) = 0;
+    virtual void OutlineNumbering(sal_uInt8 nLvl) = 0;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 18d2ed4d2dee..989a717a1eb6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5327,7 +5327,7 @@ void lcl_OutlineLevel(sax_fastparser::FSHelperPtr pSerializer, sal_uInt16 nLevel
             FSEND);
 }
 
-void DocxAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat& /*rNFormat*/, const SwFormat& /*rFormat*/ )
+void DocxAttributeOutput::OutlineNumbering(sal_uInt8 const nLvl)
 {
     lcl_OutlineLevel(m_pSerializer, nLvl);
 }
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 34e9627940ff..04d745ec7ac8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -282,7 +282,7 @@ public:
     virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &rNFormat, const SwFormat &rFormat ) SAL_OVERRIDE;
+    virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6ff487a4bb9b..e374a9a0afe6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1065,7 +1065,7 @@ void RtfAttributeOutput::EndStyleProperties(bool /*bParProp*/)
     /* noop */
 }
 
-void RtfAttributeOutput::OutlineNumbering(sal_uInt8 nLvl, const SwNumFormat& /*rNFormat*/, const SwFormat& /*rFormat*/)
+void RtfAttributeOutput::OutlineNumbering(sal_uInt8 nLvl)
 {
     if (nLvl >= WW8ListManager::nMaxLevel)
         nLvl = WW8ListManager::nMaxLevel - 1;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 74dd37946a86..0696486244b9 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -151,7 +151,7 @@ public:
     virtual void EndStyleProperties(bool bParProp) SAL_OVERRIDE;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering(sal_uInt8 nLvl, const SwNumFormat& rNFormat, const SwFormat& rFormat) SAL_OVERRIDE;
+    virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 2c9e1d4a19db..cca6c5bfb68a 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -153,7 +153,7 @@ public:
     WW8_FC GetStartFc() const;
     WW8_FC GetEndFc() const;
 
-    sal_uInt8 *CopyLastSprms(sal_uInt8 &rLen, bool bVer8);
+    sal_uInt8 *CopyLastSprms(sal_uInt8 &rLen);
 };
 
 // class WW8_WrPc collects all piece entries for one piece
@@ -871,7 +871,7 @@ WW8_WrPlcPn::~WW8_WrPlcPn()
 sal_uInt8 *WW8_WrPlcPn::CopyLastSprms(sal_uInt8 &rLen)
 {
     WW8_WrFkp& rF = aFkps.back();
-    return rF.CopyLastSprms(rLen, true/*TODO*/);
+    return rF.CopyLastSprms(rLen);
 }
 
 void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short nVarLen,const sal_uInt8* pSprms)
@@ -1019,7 +1019,7 @@ sal_uInt8 WW8_WrFkp::SearchSameSprm( sal_uInt16 nVarLen, const sal_uInt8* pSprms
     return 0;           // didn't found it
 }
 
-sal_uInt8 *WW8_WrFkp::CopyLastSprms(sal_uInt8 &rLen, bool bVer8)
+sal_uInt8 *WW8_WrFkp::CopyLastSprms(sal_uInt8 &rLen)
 {
     rLen=0;
     sal_uInt8 *pStart=0,*pRet=0;
@@ -1033,7 +1033,7 @@ sal_uInt8 *WW8_WrFkp::CopyLastSprms(sal_uInt8 &rLen, bool bVer8)
 
     const sal_uInt8* p = pFkp + ( (sal_uInt16)nStart << 1 );
 
-    if (!*p && bVer8)
+    if (!*p)
         p++;
 
     if (*p)
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index b86a01aa31b0..b1c652953011 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -669,7 +669,7 @@ sal_uInt8 WW8Export::GetNumId( sal_uInt16 eNumType )
     return nRet;
 }
 
-void WW8AttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &/*TODO*/, const SwFormat &/*TODO*/)
+void WW8AttributeOutput::OutlineNumbering(sal_uInt8 nLvl)
 {
     if ( nLvl >= WW8ListManager::nMaxLevel )
         nLvl = WW8ListManager::nMaxLevel-1;
@@ -735,7 +735,7 @@ void MSWordExportBase::OutputFormat( const SwFormat& rFormat, bool bPapFormat, b
                 // if Write StyleDefinition then write the OutlineRule
                 const SwNumFormat& rNFormat = m_pDoc->GetOutlineNumRule()->Get( static_cast<sal_uInt16>( nLvl ) );
                 if ( m_bStyDef )
-                    AttrOutput().OutlineNumbering( static_cast< sal_uInt8 >( nLvl ), rNFormat, rFormat );
+                    AttrOutput().OutlineNumbering(static_cast<sal_uInt8>(nLvl));
 
                 if ( rNFormat.GetPositionAndSpaceMode() ==
                                            SvxNumberFormat::LABEL_WIDTH_AND_POSITION  &&
@@ -1481,7 +1481,7 @@ bool WW8Export::TransBrush(const Color& rCol, WW8_SHD& rShd)
     {
         rShd.SetFore( 0);
         rShd.SetBack( msfilter::util::TransColToIco( rCol ) );
-        rShd.SetStyle( true, 0 ); // TODO
+        rShd.SetStyle( true, 0 ); // TODO FIXME???
     }
     return !rCol.GetTransparency();
 }
@@ -2425,8 +2425,6 @@ void WW8AttributeOutput::PostitField( const SwField* pField )
 
 bool WW8AttributeOutput::DropdownField( const SwField* pField )
 {
-    bool bExpand = true;
-    // TODO
     const SwDropDownField& rField2 = *static_cast<const SwDropDownField*>(pField);
     uno::Sequence<OUString> aItems =
         rField2.GetItemSequence();
@@ -2434,8 +2432,7 @@ bool WW8AttributeOutput::DropdownField( const SwField* pField )
                        rField2.GetHelp(),
                        rField2.GetToolTip(),
                        rField2.GetSelectedItem(), aItems);
-    bExpand = false;
-    return bExpand;
+    return false;
 }
 
 bool WW8AttributeOutput::PlaceholderField( const SwField* )
@@ -3274,7 +3271,8 @@ void AttributeOutputBase::ParaNumRule( const SwNumRuleItem& rNumRule )
     }
 }
 
-void WW8AttributeOutput::ParaNumRule_Impl( const SwTextNode* /*TODO*/, sal_Int32 nLvl, sal_Int32 nNumId )
+void WW8AttributeOutput::ParaNumRule_Impl(const SwTextNode* /*pTxtNd*/,
+        sal_Int32 const nLvl, sal_Int32 const nNumId)
 {
     // write sprmPIlvl and sprmPIlfo
     SwWW8Writer::InsUInt16( *m_rWW8Export.pO, NS_sprm::LN_PIlvl );
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 230b41435ae3..8a7ef8322be7 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -138,7 +138,7 @@ public:
     virtual void EndStyleProperties( bool bParProp ) SAL_OVERRIDE;
 
     /// Numbering rule and Id.
-    virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFormat &rNFormat, const SwFormat &rFormat ) SAL_OVERRIDE;
+    virtual void OutlineNumbering(sal_uInt8 nLvl) SAL_OVERRIDE;
 
     /// Page break
     /// As a paragraph property - the paragraph should be on the next page.