diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-19 22:19:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:10:58 +0000 |
| commit | d00fc0e293852cfc019ffaffa65bee327397677b (patch) | |
| tree | 3b28b98fb451bee33eff7c06a93dbb4063f07554 /sc/source/core/tool/zforauto.cxx | |
| parent | 92f396733ebc518bcb7a9eae2dd3169d333b82b9 (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 'sc/source/core/tool/zforauto.cxx')
| -rw-r--r-- | sc/source/core/tool/zforauto.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 4ebbee3551c0..048c981df3bf 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -61,7 +61,7 @@ ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uLong nFormat, void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) { sal_uInt16 nSysLang, nLang; - rStream.ReadByteString( sFormatstring, eByteStrSet ); + rStream.ReadUniOrByteString( sFormatstring, eByteStrSet ); rStream >> nSysLang >> nLang; eLnge = (LanguageType) nLang; eSysLnge = (LanguageType) nSysLang; @@ -71,7 +71,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, CharSet eByteStrSet ) void ScNumFormatAbbrev::Save( SvStream& rStream, CharSet eByteStrSet ) const { - rStream.WriteByteString( sFormatstring, eByteStrSet ); + rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; } |