diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 23:21:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-16 10:21:55 +0000 |
| commit | 9d4d7272507c6a9c7ede239df9243103fce46dbf (patch) | |
| tree | 14cb447b4583c11d946c1086ef90f9829ddfb436 | |
| parent | d3bda969c6a126cfa2742b9adba142cb7f316d56 (diff) | |
force users of ReadByteStringLine to explictly denote encoding
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 | ||||
| -rw-r--r-- | tools/inc/tools/stream.hxx | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 6bdbba6a0471..54deb88c3f94 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -132,13 +132,13 @@ EditPaM ImpEditEngine::ReadText( SvStream& rInput, EditSelection aSel ) EditPaM aPaM = aSel.Max(); XubString aTmpStr, aStr; - sal_Bool bDone = rInput.ReadByteStringLine( aTmpStr ); + sal_Bool bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet() ); while ( bDone ) { aTmpStr.Erase( MAXCHARSINPARA ); aPaM = ImpInsertText( EditSelection( aPaM, aPaM ), aTmpStr ); aPaM = ImpInsertParaBreak( aPaM ); - bDone = rInput.ReadByteStringLine( aTmpStr ); + bDone = rInput.ReadByteStringLine( aTmpStr, rInput.GetStreamCharSet() ); } return aPaM; } diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 4f06610e2f00..0205d2c81fd5 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -384,7 +384,6 @@ public: sal_Bool WriteLines( const ByteString& rStr ); 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 ) { return WriteByteStringLine( rStr, GetStreamCharSet()); } |