summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-21 10:30:10 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-21 10:30:10 +0000
commit6708977331c933b3483b9fe5f66d981b51fd8d49 (patch)
tree150a2ad7ed1b49df70ee7c814edf60d5147c043d /svl
parentfffae28952f20fed693df4de8b8645cf0aedabfa (diff)
needs more work first
This reverts commit 92f396733ebc518bcb7a9eae2dd3169d333b82b9.
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/cntwall.cxx3
-rw-r--r--svl/source/numbers/zformat.cxx3
2 files changed, 4 insertions, 2 deletions
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 31ef07e8a06e..f81bd487d48a 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -80,7 +80,8 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn
readUnicodeString(rStream, _aURL, false);
// "Read" SfxWallpaperItem's string member _aFilter.
- read_lenPrefixed_uInt8s_ToOString(rStream);
+ ByteString aDummy;
+ rStream.ReadByteString(aDummy);
}
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 424aaa0204ce..a85491e4f30d 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1768,7 +1768,8 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter,
void SvNumberformat::LoadString( SvStream& rStream, String& rStr )
{
CharSet eStream = rStream.GetStreamCharSet();
- ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream);
+ ByteString aStr;
+ rStream.ReadByteString( aStr );
sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream );
if ( aStr.Search( cStream ) == STRING_NOTFOUND )
{ // simple conversion to unicode