diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:45:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 13:44:52 +0000 |
| commit | 5c24789ca33d7b2b0c39626208cf0708fb470d95 (patch) | |
| tree | a58015a4f6cafb9d567ca24831a442a4e976d972 /svl/source/items | |
| parent | c4f0efc2378cebc3b581bc949da70a2b2f149961 (diff) | |
disentangle Read/WriteByteString OUString variants
The ones which use a definite 8-bit encoding read/write pascal-style
strings with a 16bit length prefix.
The ones which use a definite 16-bit encoding read/write pascal-style
UTF-16 strings with a 32bit length prefix, i.e. not ByteStrings at all
The "I dunno" ones might be UTF-16 strings or 8-bit strings, depending
on the charset. Rename to ReadUniOrByteString like the other
similar horrors to flag this misery
Diffstat (limited to 'svl/source/items')
| -rw-r--r-- | svl/source/items/poolitem.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index e6dab39b6706..8970688be602 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -187,7 +187,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const // static bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) { - rStream.ReadByteString(rString); + rStream.ReadUniOrByteString(rString, rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; } @@ -196,7 +196,7 @@ bool SfxPoolItem::readByteString(SvStream & rStream, UniString & rString) void SfxPoolItem::writeByteString(SvStream & rStream, UniString const & rString) { - rStream.WriteByteString(rString); + rStream.WriteUniOrByteString(rString, rStream.GetStreamCharSet()); } //============================================================================ @@ -204,7 +204,7 @@ void SfxPoolItem::writeByteString(SvStream & rStream, bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, bool bUnicode) { - rStream.ReadByteString(rString, + rStream.ReadUniOrByteString(rString, bUnicode ? RTL_TEXTENCODING_UCS2 : rStream.GetStreamCharSet()); return rStream.GetError() == ERRCODE_NONE; @@ -215,7 +215,7 @@ bool SfxPoolItem::readUnicodeString(SvStream & rStream, UniString & rString, void SfxPoolItem::writeUnicodeString(SvStream & rStream, UniString const & rString) { - rStream.WriteByteString(rString, RTL_TEXTENCODING_UCS2); + rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2); } // ------------------------------------------------------------------------ |