From c1d49234e5e8e7faa84f4d118500a138decfb04e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Dec 2011 13:33:58 +0000 Subject: tweak for pre language-defect #77 --- basic/source/sbx/sbxbase.cxx | 12 ++++++------ basic/source/sbx/sbxcoll.cxx | 4 ++-- basic/source/sbx/sbxobj.cxx | 12 ++++++------ basic/source/sbx/sbxvalue.cxx | 14 +++++++------- basic/source/sbx/sbxvar.cxx | 12 ++++++------ 5 files changed, 27 insertions(+), 27 deletions(-) (limited to 'basic') diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 7ab2d6c15b37..9e1baf39f0ef 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -383,9 +383,9 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { aParams.Remove( 0, aParams.Count() ); sal_uInt16 nParam; - aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aComment = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); - aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> nHelpId >> nParam; while( nParam-- ) @@ -393,7 +393,7 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) XubString aName; sal_uInt16 nType, nFlags; sal_uInt32 nUserData = 0; - aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> nType >> nFlags; if( nVer > 1 ) @@ -407,15 +407,15 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, + write_lenPrefixed_uInt8s_FromOUString(rStrm, aComment, RTL_TEXTENCODING_ASCII_US ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, + write_lenPrefixed_uInt8s_FromOUString(rStrm, 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, + write_lenPrefixed_uInt8s_FromOUString(rStrm, p->aName, RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt16) p->eType << (sal_uInt16) p->nFlags diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 97573876064c..0e3f911fb5b0 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -279,7 +279,7 @@ sal_Bool SbxStdCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool bRes = SbxCollection::LoadData( rStrm, nVer ); if( bRes ) { - aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aElemClass = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); rStrm >> bAddRemoveOk; } @@ -291,7 +291,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const sal_Bool bRes = SbxCollection::StoreData( rStrm ); if( bRes ) { - write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, + write_lenPrefixed_uInt8s_FromOUString(rStrm, aElemClass, RTL_TEXTENCODING_ASCII_US); rStrm << bAddRemoveOk; } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 0c98fca20049..fd919d6f11da 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -591,9 +591,9 @@ sal_Bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer ) aData.pObj = this; sal_uInt32 nSize; XubString aDfltProp; - aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aClassName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); - aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm >> nSize; @@ -622,8 +622,8 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const XubString aDfltProp; if( pDfltProp ) aDfltProp = pDfltProp->GetName(); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US); sal_uIntPtr nPos = rStrm.Tell(); rStrm << (sal_uInt32) 0L; if( !StorePrivateData( rStrm ) ) @@ -799,7 +799,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs2; if( !pVar->IsA( TYPE(SbxMethod) ) ) aLine.AppendAscii( " !! Not a Method !!" ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); // Output also the object at object-methods if ( pVar->GetValues_Impl().eType == SbxOBJECT && @@ -832,7 +832,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) aLine += aAttrs3; if( !pVar->IsA( TYPE(SbxProperty) ) ) aLine.AppendAscii( " !! Not a Property !!" ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aLine, RTL_TEXTENCODING_ASCII_US); + write_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 692959aa9c18..7f00eccb3a51 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1479,7 +1479,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSINGLE: { // Floats as ASCII - XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; @@ -1495,7 +1495,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxDOUBLE: { // Floats as ASCII - XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + XubString aVal = read_lenPrefixed_uInt8s_ToOUString(r, RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK ) @@ -1524,7 +1524,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) } case SbxSTRING: { - rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, + rtl::OUString aVal = read_lenPrefixed_uInt8s_ToOUString(r, RTL_TEXTENCODING_ASCII_US); if( aVal.getLength() ) aData.pOUString = new ::rtl::OUString( aVal ); @@ -1621,12 +1621,12 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxDATE: // #49935: Save as double, elsewise 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_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_lenPrefixed_uInt8s_FromOUString(r, GetCoreString(), RTL_TEXTENCODING_ASCII_US); break; case SbxSALUINT64: case SbxSALINT64: @@ -1643,11 +1643,11 @@ sal_Bool SbxValue::StoreData( SvStream& r ) const case SbxSTRING: if( aData.pOUString ) { - write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); } else { - write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); } break; case SbxERROR: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 6ca253355603..386c8d3473c4 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -445,7 +445,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { if( !SbxValue::LoadData( rStrm, nVer ) ) return sal_False; - maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; @@ -455,7 +455,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) { rStrm.SeekRel( -1L ); rStrm >> nType; - maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, + maName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); sal_uInt32 nTemp; rStrm >> nTemp; @@ -479,7 +479,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxSINGLE: { // Floats as ASCII - aTmpString = read_lenPrefixed_uInt8s_ToOUString( + aTmpString = read_lenPrefixed_uInt8s_ToOUString( rStrm, RTL_TEXTENCODING_ASCII_US); double d; SbxDataType t; @@ -495,7 +495,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) case SbxDOUBLE: { // Floats as ASCII - aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aTmpString = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); SbxDataType t; if( ImpScan( aTmpString, aTmp.nDouble, t, NULL ) != SbxERR_OK ) @@ -506,7 +506,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) break; } case SbxSTRING: - aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aVal = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US); break; case SbxEMPTY: @@ -565,7 +565,7 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const bValStore = SbxValue::StoreData( rStrm ); if( !bValStore ) return sal_False; - write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, + write_lenPrefixed_uInt8s_FromOUString(rStrm, maName, RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt32)nUserData; if( pInfo.Is() ) -- cgit