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 /idl | |
| 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 'idl')
| -rw-r--r-- | idl/source/objects/module.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 4fd5c78f7f6f..e8e6542eb1b0 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -65,7 +65,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aTypeList; rStm >> aAttrList; // browser - rStm.ReadByteString( aIdlFileName ); + rStm.ReadUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); @@ -90,7 +90,7 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aTypeList; rStm << aAttrList; // browser - rStm.WriteByteString( aIdlFileName ); + rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); @@ -368,9 +368,9 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, { rOutStm << SvHash_module()->GetName().GetBuffer() << endl << '\"'; - rOutStm.WriteByteString( aBeginName.GetHexName() ); + rOutStm.WriteUniOrByteString( aBeginName.GetHexName(), rOutStm.GetStreamCharSet() ); rOutStm << '\"' << endl << '\"'; - rOutStm.WriteByteString( aEndName.GetHexName() ); + rOutStm.WriteUniOrByteString( aEndName.GetHexName(), rOutStm.GetStreamCharSet() ); rOutStm << '\"' << endl; SvMetaExtern::WriteSvIdl( rBase, rOutStm, nTab ); } |