diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:29:33 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-21 10:29:33 +0000 |
| commit | fffae28952f20fed693df4de8b8645cf0aedabfa (patch) | |
| tree | 401f5ce0e113adc69199f43b79ff542f012d1d3c /svtools/source | |
| parent | 6fd747bf0e1f8374d52e26e823d2186275d5e8fb (diff) | |
bah, need to tweak for pre c++0x
This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b.
Diffstat (limited to 'svtools/source')
| -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 e2a340a8291b..41f0af0839cd 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.WriteUniOrByteString( _rString, m_rStorage.GetStreamCharSet() ); + m_rStorage.WriteByteString( _rString ); } }; @@ -418,7 +418,7 @@ namespace svt while ( nChildren-- ) { String sURL; - m_rStorage.ReadUniOrByteString( sURL, m_rStorage.GetStreamCharSet() ); + m_rStorage.ReadByteString( sURL ); 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->ReadUniOrByteString( sURL, m_pCacheStream->GetStreamCharSet() ); + m_pCacheStream->ReadByteString( sURL ); // #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 c8158d19b52a..aac712644d95 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.ReadUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rIStm.ReadUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rIStm.ReadByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rIStm.ReadByteString( 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.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); - rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); + rOStm.WriteByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); + rOStm.WriteByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); rOStm << nSig1 << nSig2; const sal_uInt32 nLastPos = rOStm.Tell(); |