diff options
| -rw-r--r-- | sc/source/filter/dif/difimp.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 2 | ||||
| -rw-r--r-- | tools/inc/tools/stream.hxx | 2 | ||||
| -rw-r--r-- | tools/source/stream/stream.cxx | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 1ccc42b4b54a..19189a19e807 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -452,7 +452,7 @@ bool DifParser::ReadNextLine( String& rStr ) { if( aLookAheadLine.Len() == 0 ) { - return rIn.ReadUniOrByteStringLine( rStr ); + return rIn.ReadUniOrByteStringLine( rStr, rIn.GetStreamCharSet() ); } else { @@ -470,7 +470,7 @@ bool DifParser::LookAhead() bool bValidStructure = false; OSL_ENSURE( aLookAheadLine.Len() == 0, "*DifParser::LookAhead(): LookAhead called twice in a row" ); - rIn.ReadUniOrByteStringLine( aLookAheadLine ); + rIn.ReadUniOrByteStringLine( aLookAheadLine, rIn.GetStreamCharSet() ); pAktBuffer = aLookAheadLine.GetBuffer(); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index f53ded435f8e..a10ab3906e1a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -788,7 +788,7 @@ sal_Bool ScImportExport::Text2Doc( SvStream& rStrm ) rStrm.Seek( nOldPos ); for( ;; ) { - rStrm.ReadUniOrByteStringLine( aLine ); + rStrm.ReadUniOrByteStringLine( aLine, rStrm.GetStreamCharSet() ); if( rStrm.IsEof() ) break; SCCOL nCol = nStartCol; 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; } |