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 /vcl/source/gdi/metaact.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 'vcl/source/gdi/metaact.cxx')
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 9961705cbb6c..2fd96e835910 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1259,7 +1259,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; @@ -1278,7 +1278,7 @@ void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; @@ -1408,7 +1408,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maStartPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnIndex; rOStm << mnLen; rOStm << nAryLen; @@ -1435,7 +1435,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) COMPAT( rIStm ); rIStm >> maStartPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnIndex; rIStm >> mnLen; rIStm >> nAryLen; @@ -1555,7 +1555,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnWidth; rOStm << mnIndex; rOStm << mnLen; @@ -1575,7 +1575,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maPt; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnWidth; rIStm >> mnIndex; rIStm >> mnLen; @@ -1650,7 +1650,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maRect; - rOStm.WriteByteString( maStr, pData->meActualCharSet ); + rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); rOStm << mnStyle; sal_uInt16 i, nLen = maStr.Len(); // version 2 @@ -1668,7 +1668,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); rIStm >> maRect; - rIStm.ReadByteString( maStr, pData->meActualCharSet ); + rIStm.ReadUniOrByteString( maStr, pData->meActualCharSet ); rIStm >> mnStyle; if ( aCompat.GetVersion() >= 2 ) // Version 2 |