diff options
32 files changed, 155 insertions, 155 deletions
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<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US); - aHelpFile = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aHelpFile = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(rStrm, aComment, RTL_TEXTENCODING_ASCII_US ); - write_lenPrefixed_uInt8s_FromOUString(rStrm, aHelpFile, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(rStrm, RTL_TEXTENCODING_ASCII_US); - aDfltProp = read_lenPrefixed_uInt8s_ToOUString(rStrm, + aDfltProp = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(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<sal_uInt16>(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(r, *aData.pOUString, RTL_TEXTENCODING_ASCII_US); } else { - write_lenPrefixed_uInt8s_FromOUString(r, rtl::OUString(), RTL_TEXTENCODING_ASCII_US); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>( 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<sal_uInt16>(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<sal_uInt16>(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<sal_uInt16>(rStrm, maName, RTL_TEXTENCODING_ASCII_US); rStrm << (sal_uInt32)nUserData; if( pInfo.Is() ) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index 8435e66d923f..e6ca9a513e10 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -1131,10 +1131,10 @@ void BinTextObject::StoreData( SvStream& rOStream ) const // Convert CH_FEATURE to CH_FEATURE_OLD aText.SearchAndReplaceAll( cFeatureConverted, CH_FEATURE_OLD ); - write_lenPrefixed_uInt8s_FromOString(rOStream, aText); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, aText); // StyleName and Family... - write_lenPrefixed_uInt8s_FromOUString(rOStream, pC->GetStyle(), eEncoding); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, pC->GetStyle(), eEncoding); rOStream << (sal_uInt16)pC->GetFamily(); // Paragraph attributes ... @@ -1226,7 +1226,7 @@ void BinTextObject::CreateData( SvStream& rIStream ) ContentInfo* pC = CreateAndInsertContent(); // The Text... - ByteString aByteString = read_lenPrefixed_uInt8s_ToOString(rIStream); + ByteString aByteString = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStream); pC->GetText() = rtl::OStringToOUString(aByteString, eSrcEncoding); // StyleName and Family... diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index afeb0046730d..365d5f3ba910 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -228,13 +228,13 @@ sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) { - write_lenPrefixed_uInt8s_FromOString(rStm, r); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) { - r = read_lenPrefixed_uInt8s_ToOString(rStm); + r = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); return rStm; } @@ -343,13 +343,13 @@ sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, SvStream& operator << (SvStream & rStm, const SvString & r ) { - write_lenPrefixed_uInt8s_FromOString(rStm, r); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, r); return rStm; } SvStream& operator >> (SvStream & rStm, SvString & r ) { - r = read_lenPrefixed_uInt8s_ToOString(rStm); + r = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index e8e6542eb1b0..8766f105a201 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -66,9 +66,9 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> aAttrList; // browser rStm.ReadUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); - aHelpFileName = read_lenPrefixed_uInt8s_ToOString(rStm); - aSlotIdFile = read_lenPrefixed_uInt8s_ToOString(rStm); - aModulePrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + aHelpFileName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); + aSlotIdFile = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); + aModulePrefix = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); // read compiler data sal_uInt16 nCmpLen; @@ -91,9 +91,9 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm << aAttrList; // browser rStm.WriteUniOrByteString( aIdlFileName, rStm.GetStreamCharSet() ); - write_lenPrefixed_uInt8s_FromOString(rStm, aHelpFileName); - write_lenPrefixed_uInt8s_FromOString(rStm, aSlotIdFile); - write_lenPrefixed_uInt8s_FromOString(rStm, aModulePrefix); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aHelpFileName); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aSlotIdFile); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aModulePrefix); // write compiler data sal_uInt16 nCmpLen = 0; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 798acbc1e180..9388843dc7cf 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -55,7 +55,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aAutomation; - if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); if( nMask & 0x04 ) { SvMetaClass * p; @@ -75,7 +75,7 @@ void SvClassElement::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aAutomation; - if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix); if( nMask & 0x04 ) rStm << xClass; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index f2488aa0498b..1063baa6ccc0 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1780,7 +1780,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) OSL_FAIL( "wrong format" ); return; } - if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x01 ) aEnumValue = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); } void SvMetaEnumValue::Save( SvPersistStream & rStm ) @@ -1793,7 +1793,7 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) // write data rStm << nMask; - if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); + if( nMask & 0x01 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aEnumValue); } sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, @@ -1837,7 +1837,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) return; } if( nMask & 0x01 ) rStm >> aEnumValueList; - if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString(rStm); + if( nMask & 0x02 ) aPrefix = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStm); } void SvMetaTypeEnum::Save( SvPersistStream & rStm ) @@ -1852,7 +1852,7 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) // write data rStm << nMask; if( nMask & 0x01 ) rStm << aEnumValueList; - if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString(rStm, aPrefix); + if( nMask & 0x02 ) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStm, aPrefix); } void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 61b8355826f8..c938a1796c6b 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -799,7 +799,7 @@ sal_Bool ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersion // --- from 680/dr25 on: store strings as UTF-8 if (nVer >= AUTOFORMAT_ID_680DR25) { - aName = read_lenPrefixed_uInt8s_ToOUString(rStream, + aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStream, RTL_TEXTENCODING_UTF8); } else @@ -869,7 +869,7 @@ sal_Bool ScAutoFormatData::Save(SvStream& rStream) sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, aName, RTL_TEXTENCODING_UTF8); rStream << nStrResId; rStream << ( b = bIncludeFont ); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 55714612b2df..0e4129845e29 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -267,24 +267,24 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) sal_uInt16 nTemp16; - rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aDesignName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eMode = (HtmlPublishMode)nTemp16; rIn >> rDesign.m_bContentPage; rIn >> rDesign.m_bNotes; rIn >> rDesign.m_nResolution; - rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aCompression = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); rIn >> nTemp16; rDesign.m_eFormat = (PublishingFormat)nTemp16; - rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aAuthor = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aEMail = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aWWW = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aMisc = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bDownload; rIn >> rDesign.m_bCreated; // not used @@ -300,9 +300,9 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn >> nTemp16; rDesign.m_eScript = (PublishingScript)nTemp16; - rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); - rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString(rIn, + rDesign.m_aCGI = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); rIn >> rDesign.m_bAutoSlide; @@ -323,23 +323,23 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) SdIOCompat aIO(rOut, STREAM_WRITE, 0); // Name - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aDesignName, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eMode; rOut << rDesign.m_bContentPage; rOut << rDesign.m_bNotes; rOut << rDesign.m_nResolution; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCompression, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCompression, RTL_TEXTENCODING_UTF8); rOut << (sal_uInt16)rDesign.m_eFormat; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aAuthor, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aEMail, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aEMail, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aWWW, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aWWW, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aMisc, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aMisc, RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bDownload; rOut << rDesign.m_bCreated; // not used @@ -354,9 +354,9 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut << rDesign.m_bUseColor; rOut << (sal_uInt16)rDesign.m_eScript; - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aURL, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aURL, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rDesign.m_aCGI, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCGI, RTL_TEXTENCODING_UTF8); rOut << rDesign.m_bAutoSlide; diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 49c7bd3cdcc6..6fdf5fb84e26 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3303,7 +3303,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) rStream >> nBytes; if( nBytes == 0x04034b50 ) { - ByteString aTmp = read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); if ( aTmp.CompareTo( "ContentURL=", 11 ) == COMPARE_EQUAL ) { aTmp.Erase( 0, 11 ); @@ -3375,7 +3375,7 @@ String UCBStorage::CreateLinkFile( const String& rName ) // store it as key/value pair String aLink = String::CreateFromAscii("ContentURL="); aLink += aURL; - write_lenPrefixed_uInt8s_FromOUString(*pStream, aLink, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(*pStream, aLink, RTL_TEXTENCODING_UTF8); pStream->Flush(); // move the stream to its desired location diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 31ef07e8a06e..245596e7fa8e 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -80,7 +80,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn readUnicodeString(rStream, _aURL, false); // "Read" SfxWallpaperItem's string member _aFilter. - read_lenPrefixed_uInt8s_ToOString(rStream); + read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); } } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 852e16d32487..0414185896ba 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1768,7 +1768,7 @@ void SvNumberformat::ConvertLanguage( SvNumberFormatter& rConverter, void SvNumberformat::LoadString( SvStream& rStream, String& rStr ) { CharSet eStream = rStream.GetStreamCharSet(); - ByteString aStr = read_lenPrefixed_uInt8s_ToOString(rStream); + ByteString aStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); sal_Char cStream = NfCurrencyEntry::GetEuroSymbol( eStream ); if ( aStr.Search( cStream ) == STRING_NOTFOUND ) { // simple conversion to unicode diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index db3e8728f8d2..eec9b4f241d7 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1134,7 +1134,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) if( bLink ) { - rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); + rtl::OUString aLink = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, RTL_TEXTENCODING_UTF8); rGraphicObj.SetLink(aLink); } else @@ -1153,7 +1153,7 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; if( bLink ) - write_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); return rOStm; } diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index bb720f6838e7..d4199e2539e4 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -104,16 +104,16 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const const rtl::OString aRelURL = rtl::OUStringToOString( URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); - write_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, aRelURL); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aAltText, eEncoding); rOStm << bActive; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aTarget, eEncoding); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aTarget, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); WriteIMapObject( rOStm ); aEventList.Write( rOStm ); // V4 - write_lenPrefixed_uInt8s_FromOUString(rOStm, aName, eEncoding); // V5 + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aName, eEncoding); // V5 delete pCompat; } @@ -134,10 +134,10 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) rIStm.SeekRel( 2 ); rIStm >> nReadVersion; rIStm >> nTextEncoding; - aURL = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); - aAltText = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); + aAltText = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); rIStm >> bActive; - aTarget = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aTarget = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); // URL absolut machen aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ); @@ -152,7 +152,7 @@ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) // ab Version 5 kann ein Objektname vorhanden sein if ( nReadVersion >= 0x0005 ) - aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); + aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, nTextEncoding); } delete pCompat; @@ -1123,10 +1123,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const // MagicCode schreiben rOStm << IMAPMAGIC; rOStm << GetVersion(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); //dummy rOStm << nCount; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aImageName, eEncoding); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aImageName, eEncoding); pCompat = new IMapCompat( rOStm, STREAM_WRITE ); @@ -1165,10 +1165,10 @@ void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) // Version ueberlesen wir rIStm.SeekRel( 2 ); - aName = read_lenPrefixed_uInt8s_ToOUString(rIStm, osl_getThreadTextEncoding()); - read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy + aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, osl_getThreadTextEncoding()); + read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // Dummy rIStm >> nCount; - read_lenPrefixed_uInt8s_ToOString(rIStm); // Dummy + read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // Dummy pCompat = new IMapCompat( rIStm, STREAM_READ ); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 9b7cfe2739e6..2170c1f218f1 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -132,12 +132,12 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) { - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aThemeName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aUIName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, (rEntry.aURL.GetMainURL( INetURLObject::NO_DECODE )), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rEntry.aImportName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, rtl::OString()); return rOut; } @@ -145,11 +145,11 @@ SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ) SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ) { - rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - read_lenPrefixed_uInt8s_ToOString(rIn); + rEntry.aThemeName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aUIName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + rEntry.aImportName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); + read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIn); return rIn; } diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index ddf56cbd7c01..9bfa16ba489a 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -168,7 +168,7 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const String aURLWithoutDestDir = String(aURL.GetMainURL( INetURLObject::NO_DECODE )); aURLWithoutDestDir.SearchAndReplace(rDestDir, String()); - write_lenPrefixed_uInt8s_FromOUString(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -185,7 +185,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) else rIn >> aThumbMtf; - rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + rtl::OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); aURL = INetURLObject(aTmpStr); } @@ -293,8 +293,8 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const SgaObject::WriteData( rOut, rDestDir ); char aDummy[ 10 ]; rOut.Write( aDummy, 10 ); - write_lenPrefixed_uInt8s_FromOString(rOut, rtl::OString()); //dummy - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOut, rtl::OString()); //dummy + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -304,10 +304,10 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); rIn.SeekRel( 10 ); // 16, 16, 32, 16 - read_lenPrefixed_uInt8s_ToOString(rIn); //dummy + read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIn); //dummy if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); } // ------------------ @@ -374,7 +374,7 @@ void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); rOut << (sal_uInt16) eSoundType; - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -390,7 +390,7 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16; if( rReadVersion >= 6 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); } } @@ -581,7 +581,7 @@ sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& r void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - write_lenPrefixed_uInt8s_FromOUString(rOut, aTitle, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } // ------------------------------------------------------------------------ @@ -591,7 +591,7 @@ void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) - aTitle = read_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); + aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 4a34a85ee611..9ce8d48d00e2 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -733,7 +733,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa { sal_uInt32 nThemeId = 0; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(*pIStm); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pIStm); aThemeName = rtl::OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // Charakterkonvertierung durchfuehren @@ -1354,7 +1354,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; - write_lenPrefixed_uInt8s_FromOUString(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, GetRealName(), RTL_TEXTENCODING_UTF8); rOStm << nCount << (sal_uInt16) osl_getThreadTextEncoding(); for( sal_uInt32 i = 0; i < nCount; i++ ) @@ -1394,7 +1394,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const aPath.SearchAndReplace(m_aDestDir, String()); rOStm << bRel; - write_lenPrefixed_uInt8s_FromOUString(rOStm, aPath, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, aPath, RTL_TEXTENCODING_UTF8); rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind; } @@ -1434,7 +1434,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) aImportName = rtl::OUString(); rIStm >> nVersion; - rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString(rIStm); + rtl::OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> nCount; if( nVersion >= 0x0004 ) @@ -1474,7 +1474,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) sal_uInt16 nTemp; rIStm >> bRel; - rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString(rIStm); + rtl::OString aTempFileName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> pObj->nOffset; rIStm >> nTemp; pObj->eObjKind = (SgaObjKind) nTemp; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index be2d325aef8f..4ecbd2abe185 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -486,7 +486,7 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) ); // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, sNumFmtString, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, sNumFmtString, RTL_TEXTENCODING_UTF8); rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; @@ -861,7 +861,7 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream ) const sal_Bool b; rStream << nVal; // --- from 680/dr25 on: store strings as UTF-8 - write_lenPrefixed_uInt8s_FromOUString(rStream, aName, + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, aName, RTL_TEXTENCODING_UTF8 ); rStream << nStrResId; rStream << ( b = bInclFont ); diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index 7c88b9c3aa7a..0c3468082b36 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -80,16 +80,16 @@ public: friend SvStream& operator<< ( SvStream& rStrm, const INetMessageHeader& rHdr) { - write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aName); - write_lenPrefixed_uInt8s_FromOString(rStrm, rHdr.m_aValue); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, rHdr.m_aName); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, rHdr.m_aValue); return rStrm; } friend SvStream& operator>> ( SvStream& rStrm, INetMessageHeader& rHdr) { - rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString(rStrm); - rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString(rStrm); + rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm); + rHdr.m_aValue = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm); return rStrm; } }; diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 4d316708b152..2270effbd074 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -566,7 +566,7 @@ TOOLS_DLLPUBLIC rtl::OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rS //Attempt to read a pascal-style length (of type prefix) prefixed sequence of //8bit units to an OString, returned rtl::OString's length is number of units //successfully read. -template<typename prefix=sal_uInt16> rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) +template<typename prefix> rtl::OString read_lenPrefixed_uInt8s_ToOString(SvStream& rStrm) { prefix nLen = 0; rStrm >> nLen; @@ -575,7 +575,7 @@ template<typename prefix=sal_uInt16> rtl::OString read_lenPrefixed_uInt8s_ToOStr //Attempt to read a pascal-style length (of type prefix) prefixed sequence of //8bit units to an OUString -template<typename prefix=sal_uInt16> rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, +template<typename prefix> rtl::OUString read_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm, rtl_TextEncoding eEnc) { return rtl::OStringToOUString(read_lenPrefixed_uInt8s_ToOString<prefix>(rStrm), eEnc); @@ -584,7 +584,7 @@ template<typename prefix=sal_uInt16> rtl::OUString read_lenPrefixed_uInt8s_ToOUS //Attempt to write a pascal-style length (of type prefix) prefixed sequence of //8bit units from an OString, returned value is number of bytes written (including //byte-count of prefix) -template<typename prefix=sal_uInt16> sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, +template<typename prefix> sal_Size write_lenPrefixed_uInt8s_FromOString(SvStream& rStrm, const rtl::OString &rStr) { SAL_WARN_IF(rStr.getLength() > std::numeric_limits<prefix>::max(), @@ -605,7 +605,7 @@ template<typename prefix=sal_uInt16> sal_Size write_lenPrefixed_uInt8s_FromOStri //Attempt to write a pascal-style length (of type prefix) prefixed sequence of //8bit units from an OUString, returned value is number of bytes written (including //byte-count of prefix) -template<typename prefix=sal_uInt16> sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, +template<typename prefix> sal_Size write_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm, const rtl::OUString &rStr, rtl_TextEncoding eEnc) { return write_lenPrefixed_uInt8s_FromOString<prefix>(rStrm, rtl::OUStringToOString(rStr, eEnc)); diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index a49d382ef158..45bd0cb02a14 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -137,7 +137,7 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { rStrm << static_cast<sal_uInt32>(m_nDocSize); - write_lenPrefixed_uInt8s_FromOUString(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, m_aDocName, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = m_aHeaderList.size(); rStrm << static_cast<sal_uInt32>(n); @@ -163,7 +163,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm) // Copy. rStrm >> nTemp; m_nDocSize = nTemp; - m_aDocName = read_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_UTF8); + m_aDocName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm, RTL_TEXTENCODING_UTF8); sal_uIntPtr i, n = 0; rStrm >> nTemp; @@ -1161,7 +1161,7 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) rStrm << static_cast<sal_uInt32>(m_nIndex[i]); - write_lenPrefixed_uInt8s_FromOString(rStrm, m_aBoundary); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, m_aBoundary); rStrm << static_cast<sal_uInt32>(aChildren.size()); return rStrm; @@ -1181,7 +1181,7 @@ SvStream& INetMIMEMessage::operator>> (SvStream& rStrm) m_nIndex[i] = nTemp; } - m_aBoundary = read_lenPrefixed_uInt8s_ToOString(rStrm); + m_aBoundary = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm); rStrm >> nTemp; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index aab11a6ffc51..2a5cd4a79927 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1517,7 +1517,7 @@ SvStream& SvStream::ReadUniOrByteString( UniString& rStr, rtl_TextEncoding eSrcC return *this; } - rStr = read_lenPrefixed_uInt8s_ToOUString(*this, eSrcCharSet); + rStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(*this, eSrcCharSet); return *this; } @@ -1551,7 +1551,7 @@ SvStream& SvStream::WriteUniOrByteString( const UniString& rStr, rtl_TextEncodin return *this; } - write_lenPrefixed_uInt8s_FromOUString(*this, rStr, eDestCharSet); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(*this, rStr, eDestCharSet); return *this; } diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 636df96a6c66..28eca90b9d59 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -824,7 +824,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt rOStm << nDummy32; // unbenutzt - write_lenPrefixed_uInt8s_FromOString(rOStm, rtl::OString()); // dummy + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, rtl::OString()); // dummy rOStm << nRest; // Anzahl der Strukturen, die noch _folgen_ } } @@ -888,7 +888,7 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt rIStm >> nTmp32; // unbenutzt - read_lenPrefixed_uInt8s_ToOString(rIStm); // unbenutzt + read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); // unbenutzt rIStm >> nTmp16; // Rest zu lesen rAnimation.Insert( aAnimBmp ); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 738a5907172b..2026cebf3c3e 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -1327,7 +1327,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_uInt8* pData; sal_Int32 nFollowingActionCount; - rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + rtl::OString aComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> nValue >> nDataSize; if( nDataSize ) @@ -2412,7 +2412,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, rOStm.SeekRel( 4 ); // write data - write_lenPrefixed_uInt8s_FromOString(rOStm, pA->GetComment()); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, pA->GetComment()); rOStm << pA->GetValue() << nDataSize; if( nDataSize ) diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 8d3ef576690e..2415500a905a 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -334,8 +334,8 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) rIStream.Seek( nFirstPos + sizeof( ImplOldJobSetupData ) + 4 + sizeof( Impl364JobSetupData ) + pJobData->mnDriverDataLen ); while( rIStream.Tell() < nFirstPos + nLen ) { - String aKey = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - String aValue = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + String aKey = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); + String aValue = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) ) { if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) ) @@ -406,23 +406,23 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >::const_iterator it; for( it = pJobData->maValueMap.begin(); it != pJobData->maValueMap.end(); ++it ) { - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->first, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, it->second, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->first, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, it->second, RTL_TEXTENCODING_UTF8); } - write_lenPrefixed_uInt8s_FromOString(rOStream, "COMPAT_DUPLEX_MODE"); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "COMPAT_DUPLEX_MODE"); switch( pJobData->meDuplexMode ) { case DUPLEX_UNKNOWN: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_UNKNOWN"); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_UNKNOWN"); break; case DUPLEX_OFF: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_OFF"); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_OFF"); break; case DUPLEX_SHORTEDGE: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_SHORTEDGE"); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_SHORTEDGE"); break; case DUPLEX_LONGEDGE: - write_lenPrefixed_uInt8s_FromOString(rOStream, "DUPLEX_LONGEDGE"); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStream, "DUPLEX_LONGEDGE"); break; } nLen = sal::static_int_cast<sal_uInt16>(rOStream.Tell() - nPos); diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 2fd96e835910..74881f6fdc58 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -4198,7 +4198,7 @@ sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - write_lenPrefixed_uInt8s_FromOString(rOStm, maComment); + write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, maComment); rOStm << mnValue << mnDataSize; if ( mnDataSize ) @@ -4210,7 +4210,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - maComment = read_lenPrefixed_uInt8s_ToOString(rIStm); + maComment = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rIStm); rIStm >> mnValue >> mnDataSize; delete[] mpData; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 9cede2527aaa..e25aa3a92882 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -280,10 +280,10 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) { VersionCompat aCompat( rOStream, STREAM_WRITE, 1 ); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); rOStream << rInfo.mnStatus; rOStream << rInfo.mnJobs; @@ -296,10 +296,10 @@ SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); - rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maPrinterName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maDriver = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maLocation = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); + rInfo.maComment = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStream, RTL_TEXTENCODING_UTF8); rIStream >> rInfo.mnStatus; rIStream >> rInfo.mnJobs; diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx index 16b08c4de17a..4f333cd1c5c0 100644 --- a/vcl/source/gdi/rendergraphic.cxx +++ b/vcl/source/gdi/rendergraphic.cxx @@ -194,7 +194,7 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rIStm, STREAM_READ ); sal_uInt32 nGraphicDataLength = 0; - rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_ASCII_US); + rtl::OUString aGraphicDataMimeType = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIStm, RTL_TEXTENCODING_ASCII_US); rIStm >> nGraphicDataLength; rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength ); @@ -214,7 +214,7 @@ void RenderGraphic::ImplGetDefaults() const ::VersionCompat aVCompat( rOStm, STREAM_WRITE, 1 ); const sal_uInt32 nGraphicDataLength = rRenderGraphic.GetGraphicDataLength(); - write_lenPrefixed_uInt8s_FromOUString(rOStm, rRenderGraphic.GetGraphicDataMimeType(), + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US); rOStm << nGraphicDataLength; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 44ca911f6987..32fd0f3be061 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -160,10 +160,10 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& ImplDevFontAttributes aDFA; for(;;) { - aFontFileURL = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aFontFileURL = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(aCacheFile, RTL_TEXTENCODING_UTF8); if( !aFontFileURL.Len() ) break; - aDFA.maName = read_lenPrefixed_uInt8s_ToOUString(aCacheFile, RTL_TEXTENCODING_UTF8); + aDFA.maName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(aCacheFile, RTL_TEXTENCODING_UTF8); short n; aCacheFile >> n; aDFA.meWeight = static_cast<FontWeight>(n); @@ -195,8 +195,8 @@ ImplFontAttrCache::~ImplFontAttrCache() { const String rFontFileURL( (*aIter).first ); const ImplDevFontAttributes& rDFA( (*aIter).second ); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rFontFileURL, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rDFA.maName, RTL_TEXTENCODING_UTF8); aCacheFile << static_cast<short>(rDFA.meWeight); aCacheFile << static_cast<short>(rDFA.meItalic); @@ -205,7 +205,7 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile << static_cast<short>(rDFA.meFamily); aCacheFile << static_cast<short>(rDFA.mbSymbolFlag != false); - write_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); + write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(aCacheFile, rDFA.maStyleName, RTL_TEXTENCODING_UTF8); ++aIter; } |