From 16a2e903356520c90a9bf91c47265f79be12e74a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 17 Jan 2014 08:48:50 +0200 Subject: remove SvStream::operator<< methods .. and convert the last few places still using those methods. Change-Id: Id2cd8f9c0dd281df43af439d4fef65881f34a6fd Reviewed-on: https://gerrit.libreoffice.org/7495 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- basic/source/sbx/sbxbase.cxx | 6 +++--- basic/source/sbx/sbxcoll.cxx | 2 +- basic/source/sbx/sbxobj.cxx | 8 ++++---- basic/source/sbx/sbxvalue.cxx | 8 ++++---- basic/source/sbx/sbxvar.cxx | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'basic') diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 05b84b2bdb1b..376da5467ae3 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -391,14 +391,14 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, RTL_TEXTENCODING_ASCII_US ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, RTL_TEXTENCODING_ASCII_US); rStrm.WriteUInt32( nHelpId ).WriteUInt16( static_cast(aParams.size()) ); for(SbxParams::const_iterator i = aParams.begin(); i != aParams.end(); ++i) { - write_lenPrefixed_uInt8s_FromOUString(rStrm, i->aName, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, i->aName, RTL_TEXTENCODING_ASCII_US); rStrm.WriteUInt16( (sal_uInt16) i->eType ) .WriteUInt16( (sal_uInt16) i->nFlags ) diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index d92b0f3f9d1a..741735b32186 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -314,7 +314,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const sal_Bool bRes = SbxCollection::StoreData( rStrm ); if( bRes ) { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, RTL_TEXTENCODING_ASCII_US); rStrm.WriteUChar( bAddRemoveOk ); } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 5a0750f2161e..4b6c7dbcff5e 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -676,8 +676,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const { aDfltProp = pDfltProp->GetName(); } - write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm.WriteUInt32( (sal_uInt32) 0L ); if( !StorePrivateData( rStrm ) ) @@ -876,7 +876,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) { aLine += " !! Not a Method !!"; } - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // Output also the object at object-methods if ( pVar->GetValues_Impl().eType == SbxOBJECT && @@ -915,7 +915,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) { aLine += " !! Not a Property !!"; } - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // output also the object at object properties if ( pVar->GetValues_Impl().eType == SbxOBJECT && diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 019834fa35eb..3cdaeb588e20 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1568,12 +1568,12 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxDATE: // #49935: Save as double, otherwise an error during the read in ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE ); - write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); ((SbxValue*)this)->aData.eType = (SbxDataType)nType; break; case SbxSINGLE: case SbxDOUBLE: - write_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); break; case SbxSALUINT64: case SbxSALINT64: @@ -1590,11 +1590,11 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSTRING: if( aData.pOUString ) { - write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); } else { - write_lenPrefixed_uInt8s_FromOUString(r, OUString(), RTL_TEXTENCODING_ASCII_US); + write_uInt16_lenPrefixed_uInt8s_FromOUString(r, OUString(), RTL_TEXTENCODING_ASCII_US); } break; case SbxERROR: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index d20ab4a1bc56..d621d662706f 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -644,7 +644,7 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const { return sal_False; } - write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, + write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, maName, RTL_TEXTENCODING_ASCII_US); rStrm.WriteUInt32( (sal_uInt32)nUserData ); if( pInfo.Is() ) -- cgit