From 4abfd463edd482389d83d75fe223a4a26aed7cb1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 13 Jan 2012 23:24:50 +0000 Subject: force users of WriteByteStringLine to explictly denote encoding --- editeng/source/editeng/impedit4.cxx | 2 +- tools/inc/tools/stream.hxx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 54deb88c3f94..f76b0ca914c5 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -270,7 +270,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel ) nEndPos = aSel.Max().GetIndex(); } XubString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); - rOutput.WriteByteStringLine( aTmpStr ); + rOutput.WriteByteStringLine( aTmpStr, rOutput.GetStreamCharSet() ); } return rOutput.GetError(); diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 0205d2c81fd5..e96f3e14f022 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -385,7 +385,6 @@ public: sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); - sal_Bool WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } /// Switch to no endian swapping and write 0xfeff sal_Bool StartWritingUnicodeText(); -- cgit v1.2.3