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 /svtools | |
| parent | convert ReadByteString/WriteByteString from ByteString to OString (diff) | |
| download | core-5c24789ca33d7b2b0c39626208cf0708fb470d95.tar.gz core-5c24789ca33d7b2b0c39626208cf0708fb470d95.zip | |
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 'svtools')
| -rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 41f0af0839cd..e2a340a8291b 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -292,7 +292,7 @@ namespace svt void operator() ( const String& _rString ) const { - m_rStorage.WriteByteString( _rString ); + m_rStorage.WriteUniOrByteString( _rString, m_rStorage.GetStreamCharSet() ); } }; @@ -418,7 +418,7 @@ namespace svt while ( nChildren-- ) { String sURL; - m_rStorage.ReadByteString( sURL ); + m_rStorage.ReadUniOrByteString( sURL, m_rStorage.GetStreamCharSet() ); sURL = m_xOfficeInstDirs->makeAbsoluteURL( sURL ); INetURLObject aChildURL( sURL ); rChildren.push_back( new TemplateContent( aChildURL ) ); @@ -736,7 +736,7 @@ namespace svt while ( nRootDirectories-- ) { String sURL; - m_pCacheStream->ReadByteString( sURL ); + m_pCacheStream->ReadUniOrByteString( sURL, m_pCacheStream->GetStreamCharSet() ); // #116281# Keep office installtion relocatable. Never store // any direct references to office installation directory. sURL = getOfficeInstDirs()->makeAbsoluteURL( sURL ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index aac712644d95..c8158d19b52a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -96,8 +96,8 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ) rIStm >> rObjDesc.maSize.Height(); rIStm >> rObjDesc.maDragStartPos.X(); rIStm >> rObjDesc.maDragStartPos.Y(); - rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rIStm.ReadByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rIStm.ReadUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rIStm.ReadUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rIStm >> nSig1 >> nSig2; rObjDesc.mnViewAspect = static_cast< sal_uInt16 >( nViewAspect ); @@ -126,8 +126,8 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD rOStm << rObjDesc.maSize.Height(); rOStm << rObjDesc.maDragStartPos.X(); rOStm << rObjDesc.maDragStartPos.Y(); - rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rOStm.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rOStm << nSig1 << nSig2; const sal_uInt32 nLastPos = rOStm.Tell(); |