summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-01-14 10:32:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-16 10:21:55 +0000
commita8742cecc157a28f293107013d6b35ce8a342382 (patch)
tree29d243bd3e1636db49a6c3507476e4ca23cf79a3 /tools
parent4abfd463edd482389d83d75fe223a4a26aed7cb1 (diff)
convert some old-school ByteStrings
Diffstat (limited to 'tools')
-rw-r--r--tools/source/stream/stream.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index fea6025e5263..08559ad1c874 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -629,11 +629,9 @@ void SvStream::ResetError()
sal_Bool SvStream::ReadByteStringLine( String& rStr, rtl_TextEncoding eSrcCharSet )
{
- sal_Bool bRet;
- ByteString aStr;
-
- bRet = ReadLine(aStr);
- rStr = UniString( aStr, eSrcCharSet );
+ rtl::OString aStr;
+ sal_Bool bRet = ReadLine(aStr);
+ rStr = rtl::OStringToOUString(aStr, eSrcCharSet);
return bRet;
}