sw: WW8 export: RawText parameter bForceUnicode is obsolete

Change-Id: I7b9543ebb56f99bb1d28c2e7b92818ca37418382

8 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 6d16f55623c0..8d9920d48187 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -192,7 +192,7 @@ public:
     virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) = 0;
 
     /// Output text (without markup).
-    virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) = 0;
+    virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) = 0;
 
     /// Output ruby start.
     virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5211c1be3ba0..18d2ed4d2dee 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2125,7 +2125,7 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh
     impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pEnd, false );
 }
 
-void DocxAttributeOutput::RawText( const OUString& /*rText*/, bool /*bForceUnicode*/, rtl_TextEncoding /*eCharSet*/ )
+void DocxAttributeOutput::RawText(const OUString& /*rText*/, rtl_TextEncoding /*eCharSet*/)
 {
     OSL_TRACE("TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" );
 }
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 61a6b0fcc767..34e9627940ff 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -185,7 +185,7 @@ public:
     virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 ) SAL_OVERRIDE;
 
     /// Output text (without markup).
-    virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
+    virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
 
     /// Output ruby start.
     virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index a09246a7e6ac..6ff487a4bb9b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -398,7 +398,7 @@ void RtfAttributeOutput::EndRunProperties(const SwRedlineData* /*pRedlineData*/)
 void RtfAttributeOutput::RunText(const OUString& rText, rtl_TextEncoding /*eCharSet*/)
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", rText: " << rText);
-    RawText(rText, false, m_rExport.eCurrentEncoding);
+    RawText(rText, m_rExport.eCurrentEncoding);
 }
 
 OStringBuffer& RtfAttributeOutput::RunText()
@@ -406,7 +406,7 @@ OStringBuffer& RtfAttributeOutput::RunText()
     return m_aRunText.getLastBuffer();
 }
 
-void RtfAttributeOutput::RawText(const OUString& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet)
+void RtfAttributeOutput::RawText(const OUString& rText, rtl_TextEncoding eCharSet)
 {
     m_aRunText->append(msfilter::rtfutil::OutString(rText, eCharSet));
 }
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 50be429fb349..74dd37946a86 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -84,7 +84,7 @@ public:
     }
 
     /// Output text (without markup).
-    virtual void RawText(const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
+    virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
 
     /// Output ruby start.
     virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 06542cc39b81..bf7c27ba1aec 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1160,7 +1160,7 @@ void MSWord_SdrAttrIter::OutEEField(const SfxPoolItem& rHt)
         m_rExport.AttrOutput().StartURL( pURL->GetURL(), pURL->GetTargetFrame() );
 
         const OUString &rStr = pURL->GetRepresentation();
-        m_rExport.AttrOutput().RawText( rStr, true, GetNodeCharSet() ); // FIXME kendy: is the 'true' actually correct here?  It was here before, but... ;-)
+        m_rExport.AttrOutput().RawText(rStr, GetNodeCharSet());
 
         m_rExport.AttrOutput().EndURL(false);
         m_rExport.m_nTextTyp = nOldTextTyp;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 698983ee8309..ca94614a0deb 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1064,10 +1064,10 @@ void WW8AttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
 
 void WW8AttributeOutput::RunText( const OUString& rText, rtl_TextEncoding eCharSet )
 {
-    RawText( rText, m_rWW8Export.bWrtWW8, eCharSet );
+    RawText(rText, eCharSet);
 }
 
-void WW8AttributeOutput::RawText(const OUString& rText, bool, rtl_TextEncoding)
+void WW8AttributeOutput::RawText(const OUString& rText, rtl_TextEncoding)
 {
     m_rWW8Export.OutSwString(rText, 0, rText.getLength());
 }
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index ca280b980363..230b41435ae3 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -68,7 +68,7 @@ public:
     virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
 
     /// Output text (without markup).
-    virtual void RawText( const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) SAL_OVERRIDE;
+    virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet) SAL_OVERRIDE;
 
     /// Output ruby start.
     virtual void StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) SAL_OVERRIDE;