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 /basic/source/sbx/sbxbase.cxx | |
| parent | 6fd747bf0e1f8374d52e26e823d2186275d5e8fb (diff) | |
bah, need to tweak for pre c++0x
This reverts commit d00fc0e293852cfc019ffaffa65bee327397677b.
Diffstat (limited to 'basic/source/sbx/sbxbase.cxx')
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 7ab2d6c15b37..711efdcb5afc 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -383,18 +383,15 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { aParams.Remove( 0, aParams.Count() ); sal_uInt16 nParam; - aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); - aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aComment, RTL_TEXTENCODING_ASCII_US ); + rStrm.ReadByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); rStrm >> nHelpId >> nParam; while( nParam-- ) { XubString aName; sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, - RTL_TEXTENCODING_ASCII_US); + rStrm.ReadByteString( aName, RTL_TEXTENCODING_ASCII_US ); rStrm >> nType >> nFlags; if( nVer > 1 ) rStrm >> nUserData; @@ -407,16 +404,13 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, - RTL_TEXTENCODING_ASCII_US ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, - RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( aComment, RTL_TEXTENCODING_ASCII_US ); + rStrm.WriteByteString( aHelpFile, RTL_TEXTENCODING_ASCII_US ); rStrm << nHelpId << aParams.Count(); for( sal_uInt16 i = 0; i < aParams.Count(); i++ ) { SbxParamInfo* p = aParams.GetObject( i ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, - RTL_TEXTENCODING_ASCII_US); + rStrm.WriteByteString( p->aName, RTL_TEXTENCODING_ASCII_US ); rStrm << (sal_uInt16) p->eType << (sal_uInt16) p->nFlags << (sal_uInt32) p->nUserData; |