AttributeOutputBase::RunText: String -> OUString

Change-Id: I413f0c4a270c5246dc87c5ff4f7042bc16330ed7

7 files changed, 9 insertions, 10 deletions

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index baad6ac8b117..25ee2a0db8f9 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -176,7 +176,7 @@ public:
     virtual void WritePostitFieldEnd() {};
 
     /// Output text (inside a run).
-    virtual void RunText( const String& rText, rtl_TextEncoding eCharSet ) = 0;
+    virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet ) = 0;
 
     /// Output text (without markup).
     virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9957ff4a470d..d7697ca0d749 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1133,18 +1133,17 @@ static void impl_WriteRunText( FSHelperPtr pSerializer, sal_Int32 nTextToken,
     pSerializer->endElementNS( XML_w, nTextToken );
 }
 
-void DocxAttributeOutput::RunText( const String& rText, rtl_TextEncoding /*eCharSet*/ )
+void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCharSet*/ )
 {
     if( m_closeHyperlinkInThisRun )
     {
         m_closeHyperlinkInPreviousRun = true;
         m_closeHyperlinkInThisRun = false;
     }
-    OUString aText( rText );
 
     // one text can be split into more <w:t>blah</w:t>'s by line breaks etc.
-    const sal_Unicode *pBegin = aText.getStr();
-    const sal_Unicode *pEnd = pBegin + aText.getLength();
+    const sal_Unicode *pBegin = rText.getStr();
+    const sal_Unicode *pEnd = pBegin + rText.getLength();
 
     // the text run is usually XML_t, with the exception of the deleted text
     sal_Int32 nTextToken = XML_t;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 06f12fa11c1b..83913a6e745e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -127,7 +127,7 @@ public:
     virtual void WritePostitFieldEnd();
 
     /// Output text (inside a run).
-    virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
+    virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
 
     /// Output text (without markup).
     virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9890f0b1aa6e..bb88c284d453 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -415,7 +415,7 @@ void RtfAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/
     m_aRun->append(m_aStyles.makeStringAndClear());
 }
 
-void RtfAttributeOutput::RunText( const String& rText, rtl_TextEncoding /*eCharSet*/ )
+void RtfAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCharSet*/ )
 {
     SAL_INFO("sw.rtf", OSL_THIS_FUNC << ", rText: " << rText);
     RawText( rText, 0, m_rExport.eCurrentEncoding );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index b13be123af36..ec5002fbc752 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -73,7 +73,7 @@ public:
     virtual void WritePostitFieldEnd() SAL_OVERRIDE;
 
     /// Output text (inside a run).
-    virtual void RunText( const String& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
+    virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet = RTL_TEXTENCODING_UTF8 );
 
     // Access to (anyway) private buffers, used by the sdr exporter
     OStringBuffer& RunText();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index e0d9140f1014..fb0f24d2c0d1 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -988,7 +988,7 @@ void WW8AttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
     m_rWW8Export.pO->clear();
 }
 
-void WW8AttributeOutput::RunText( const String& rText, rtl_TextEncoding eCharSet )
+void WW8AttributeOutput::RunText( const OUString& rText, rtl_TextEncoding eCharSet )
 {
     RawText( rText, m_rWW8Export.bWrtWW8, eCharSet );
 }
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 4c64635c62db..d471101277d2 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -60,7 +60,7 @@ public:
     virtual void EndRunProperties( const SwRedlineData* pRedlineData );
 
     /// Output text.
-    virtual void RunText( const String& rText, rtl_TextEncoding eCharSet );
+    virtual void RunText( const OUString& rText, rtl_TextEncoding eCharSet );
 
     /// Output text (without markup).
     virtual void RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet );