Kaydet (Commit) 9d4d7272 authored tarafından Caolán McNamara's avatar Caolán McNamara

force users of ReadByteStringLine to explictly denote encoding

üst d3bda969
...@@ -132,13 +132,13 @@ EditPaM ImpEditEngine::ReadText( SvStream& rInput, EditSelection aSel ) ...@@ -132,13 +132,13 @@ EditPaM ImpEditEngine::ReadText( SvStream& rInput, EditSelection aSel )
EditPaM aPaM = aSel.Max(); EditPaM aPaM = aSel.Max();
XubString aTmpStr, aStr; XubString aTmpStr, aStr;
sal_Bool bDone = rInput.ReadByteStringLine( aTmpStr ); sal_Bool bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet() );
while ( bDone ) while ( bDone )
{ {
aTmpStr.Erase( MAXCHARSINPARA ); aTmpStr.Erase( MAXCHARSINPARA );
aPaM = ImpInsertText( EditSelection( aPaM, aPaM ), aTmpStr ); aPaM = ImpInsertText( EditSelection( aPaM, aPaM ), aTmpStr );
aPaM = ImpInsertParaBreak( aPaM ); aPaM = ImpInsertParaBreak( aPaM );
bDone = rInput.ReadByteStringLine( aTmpStr ); bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet() );
} }
return aPaM; return aPaM;
} }
......
...@@ -384,7 +384,6 @@ public: ...@@ -384,7 +384,6 @@ public:
sal_Bool WriteLines( const ByteString& rStr ); sal_Bool WriteLines( const ByteString& rStr );
sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); sal_Bool ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet );
sal_Bool ReadByteStringLine( String& rStr ) { return ReadByteStringLine( rStr, GetStreamCharSet()); }
sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet ); sal_Bool WriteByteStringLine( const String& rStr, rtl_TextEncoding eDestCharSet );
sal_Bool WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } sal_Bool WriteByteStringLine( const String& rStr ) { return WriteByteStringLine( rStr, GetStreamCharSet()); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment