diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-09 22:36:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-10 10:09:29 +0000 |
| commit | e2f062ef7fdf80d9189b19cb396814976c73bf78 (patch) | |
| tree | 31a65904ceb5e88c42ea936029e4fecf8d5eb8b2 /tools | |
| parent | b2b318cca726630486dfcad442ba61499c3c7c12 (diff) | |
force users of horrific ReadUniOrByteStringLine to provide the charset
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/stream.hxx | 2 | ||||
| -rw-r--r-- | tools/source/stream/stream.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 52ae39498154..2accc440a1c7 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -416,8 +416,6 @@ public: /// Read a line of Unicode if eSrcCharSet==RTL_TEXTENCODING_UNICODE, /// otherwise read a line of Bytecode and convert from eSrcCharSet sal_Bool ReadUniOrByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet ); - sal_Bool ReadUniOrByteStringLine( String& rStr ) - { return ReadUniOrByteStringLine( rStr, GetStreamCharSet() ); } /// Write a sequence of Unicode characters sal_Bool WriteUnicodeText( const String& rStr ); /// Write a sequence of Unicode characters if eDestCharSet==RTL_TEXTENCODING_UNICODE, diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 1b31103b0e03..0fb9ca0b4ab9 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1041,7 +1041,7 @@ sal_Bool SvStream::ReadCsvLine( String& rStr, sal_Bool bEmbeddedLineBreak, const String& rFieldSeparators, sal_Unicode cFieldQuote, sal_Bool bAllowBackslashEscape) { - ReadUniOrByteStringLine( rStr); + ReadUniOrByteStringLine(rStr, GetStreamCharSet()); if (bEmbeddedLineBreak) { @@ -1096,7 +1096,7 @@ sal_Bool SvStream::ReadCsvLine( String& rStr, sal_Bool bEmbeddedLineBreak, { nLastOffset = rStr.Len(); String aNext; - ReadUniOrByteStringLine( aNext); + ReadUniOrByteStringLine(aNext, GetStreamCharSet()); rStr += sal_Unicode(_LF); rStr += aNext; } |