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 /basic/source/classes/sbxmod.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 'basic/source/classes/sbxmod.cxx')
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 07194fafc966..975ecc20a0a2 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2002,7 +2002,7 @@ sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer ) // Get the source string String aTmp; - rStrm.ReadByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.ReadUniOrByteString( aTmp, osl_getThreadTextEncoding() ); aOUSource = aTmp; return sal_True; } @@ -2014,7 +2014,7 @@ sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const // Write the source string String aTmp = aOUSource; - rStrm.WriteByteString( aTmp, osl_getThreadTextEncoding() ); + rStrm.WriteUniOrByteString( aTmp, osl_getThreadTextEncoding() ); return sal_True; } |