diff options
165 files changed, 3202 insertions, 3192 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 66d79853c799..2cf81ae6e3b3 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -84,7 +84,7 @@ bool SbiGood( SvStream& r ) sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem ) { sal_uIntPtr nPos = r.Tell(); - r << nSignature << (sal_Int32) 0 << nElem; + r.WriteUInt16( nSignature ).WriteInt32( (sal_Int32) 0 ).WriteUInt16( nElem ); return nPos; } @@ -93,7 +93,7 @@ void SbiCloseRecord( SvStream& r, sal_uIntPtr nOff ) { sal_uIntPtr nPos = r.Tell(); r.Seek( nOff + 2 ); - r << (sal_Int32) ( nPos - nOff - 8 ); + r.WriteInt32( (sal_Int32) ( nPos - nOff - 8 ) ); r.Seek( nPos ); } @@ -258,18 +258,18 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) eCharSet = GetSOStoreTextEncoding( eCharSet ); if ( bLegacy ) { - r << (sal_Int32) B_LEGACYVERSION; + r.WriteInt32( (sal_Int32) B_LEGACYVERSION ); } else { - r << (sal_Int32) B_CURVERSION; + r.WriteInt32( (sal_Int32) B_CURVERSION ); } - r << (sal_Int32) eCharSet - << (sal_Int32) nDimBase - << (sal_Int16) nFlags - << (sal_Int16) 0 - << (sal_Int32) 0 - << (sal_Int32) 0; + r .WriteInt32( (sal_Int32) eCharSet ) + .WriteInt32( (sal_Int32) nDimBase ) + .WriteInt16( (sal_Int16) nFlags ) + .WriteInt16( (sal_Int16) 0 ) + .WriteInt32( (sal_Int32) 0 ) + .WriteInt32( (sal_Int32) 0 ); // Name? if( !aName.isEmpty() && SbiGood( r ) ) @@ -321,7 +321,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) for( i = 0; i < nStrings && SbiGood( r ); i++ ) { - r << (sal_uInt32) pStringOff[ i ]; + r.WriteUInt32( (sal_uInt32) pStringOff[ i ] ); } // Then the String-Block char* pByteStrings = new char[ nStringSize ]; @@ -331,7 +331,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer ) OString aStr(OUStringToOString(OUString(pStrings + nOff), eCharSet)); memcpy( pByteStrings + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) ); } - r << (sal_uInt32) nStringSize; + r.WriteUInt32( (sal_uInt32) nStringSize ); r.Write( pByteStrings, nStringSize ); delete[] pByteStrings; diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 0e60e1b65fd0..84dac3f2c794 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1932,7 +1932,7 @@ sal_Bool StarBASIC::StoreData( SvStream& r ) const { return sal_False; } - r << (sal_uInt16) pModules->Count(); + r.WriteUInt16( (sal_uInt16) pModules->Count() ); for( sal_uInt16 i = 0; i < pModules->Count(); i++ ) { SbModule* p = (SbModule*) pModules->Get( i ); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index a3be564ab57a..9f283d5ce35b 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1722,7 +1722,7 @@ sal_Bool SbModule::StoreData( SvStream& rStrm ) const pImage->aOUSource = aOUSource; pImage->aComment = aComment; pImage->aName = GetName(); - rStrm << (sal_uInt8) 1; + rStrm.WriteUChar( (sal_uInt8) 1 ); // # PCode is saved only for legacy formats only // It should be noted that it probably isn't necessary // It would be better not to store the image ( more flexible with @@ -1739,7 +1739,7 @@ sal_Bool SbModule::StoreData( SvStream& rStrm ) const aImg.aOUSource = aOUSource; aImg.aComment = aComment; aImg.aName = GetName(); - rStrm << (sal_uInt8) 1; + rStrm.WriteUChar( (sal_uInt8) 1 ); return aImg.Save( rStrm ); } } @@ -1862,7 +1862,7 @@ sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer ) pImage->aComment = aComment; pImage->aName = GetName(); - rStrm << (sal_uInt8) 1; + rStrm.WriteUChar( (sal_uInt8) 1 ); if ( nVer ) bRet = pImage->Save( rStrm, B_EXT_IMG_VERSION ); else @@ -2090,11 +2090,11 @@ sal_Bool SbMethod::StoreData( SvStream& rStrm ) const { if( !SbxMethod::StoreData( rStrm ) ) return sal_False; - rStrm << (sal_Int16) nDebugFlags - << (sal_Int16) nLine1 - << (sal_Int16) nLine2 - << (sal_Int16) nStart - << (sal_uInt8) bInvalid; + rStrm.WriteInt16( (sal_Int16) nDebugFlags ) + .WriteInt16( (sal_Int16) nLine1 ) + .WriteInt16( (sal_Int16) nLine2 ) + .WriteInt16( (sal_Int16) nStart ) + .WriteUChar( (sal_uInt8) bInvalid ); return sal_True; } diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 511eb1176986..3e4b9bc79968 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -688,7 +688,7 @@ void SbiStream::ExpandFile() char c = 0; while( nDiff-- ) { - *pStrm << c; + pStrm->WriteChar( c ); } } else diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index bf5ea9624696..294584e5324e 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -993,9 +993,9 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, case SbxBYTE: if( bIsVariant ) { - *pStrm << (sal_uInt16)SbxBYTE; // VarType Id + pStrm->WriteUInt16( (sal_uInt16)SbxBYTE ); // VarType Id } - *pStrm << rVar.GetByte(); + pStrm->WriteUChar( rVar.GetByte() ); break; case SbxEMPTY: @@ -1007,33 +1007,33 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, case SbxUINT: if( bIsVariant ) { - *pStrm << (sal_uInt16)SbxINTEGER; // VarType Id + pStrm->WriteUInt16( (sal_uInt16)SbxINTEGER ); // VarType Id } - *pStrm << rVar.GetInteger(); + pStrm->WriteInt16( rVar.GetInteger() ); break; case SbxLONG: case SbxULONG: if( bIsVariant ) { - *pStrm << (sal_uInt16)SbxLONG; // VarType Id + pStrm->WriteUInt16( (sal_uInt16)SbxLONG ); // VarType Id } - *pStrm << rVar.GetLong(); + pStrm->WriteInt32( rVar.GetLong() ); break; case SbxSALINT64: case SbxSALUINT64: if( bIsVariant ) { - *pStrm << (sal_uInt16)SbxSALINT64; // VarType Id + pStrm->WriteUInt16( (sal_uInt16)SbxSALINT64 ); // VarType Id } - *pStrm << (sal_uInt64)rVar.GetInt64(); + pStrm->WriteUInt64( (sal_uInt64)rVar.GetInt64() ); break; case SbxSINGLE: if( bIsVariant ) { - *pStrm << (sal_uInt16)eType; // VarType Id + pStrm->WriteUInt16( (sal_uInt16)eType ); // VarType Id } - *pStrm << rVar.GetSingle(); + pStrm->WriteFloat( rVar.GetSingle() ); break; case SbxDOUBLE: @@ -1041,7 +1041,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, case SbxDATE: if( bIsVariant ) { - *pStrm << (sal_uInt16)eType; // VarType Id + pStrm->WriteUInt16( (sal_uInt16)eType ); // VarType Id } *pStrm << rVar.GetDouble(); break; @@ -1054,7 +1054,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { if( bIsVariant ) { - *pStrm << (sal_uInt16)SbxSTRING; + pStrm->WriteUInt16( (sal_uInt16)SbxSTRING ); } pStrm->WriteUniOrByteString( rStr, osl_getThreadTextEncoding() ); } @@ -1063,7 +1063,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, // without any length information! without end-identifier! // What does that mean for Unicode?! Choosing conversion to ByteString... OString aByteStr(OUStringToOString(rStr, osl_getThreadTextEncoding())); - *pStrm << (const char*)aByteStr.getStr(); + pStrm->WriteCharPtr( (const char*)aByteStr.getStr() ); } } break; diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx index ded3f2e3e42f..a25e46e24f3b 100644 --- a/basic/source/sbx/sbxarray.cxx +++ b/basic/source/sbx/sbxarray.cxx @@ -565,14 +565,14 @@ sal_Bool SbxArray::StoreData( SvStream& rStrm ) const if( p && !( p->GetFlags() & SBX_DONTSTORE ) ) nElem++; } - rStrm << (sal_uInt16) nElem; + rStrm.WriteUInt16( (sal_uInt16) nElem ); for( n = 0; n < pData->size(); n++ ) { SbxVariableRef* pRef = (*pData)[n]; SbxVariable* p = *pRef; if( p && !( p->GetFlags() & SBX_DONTSTORE ) ) { - rStrm << (sal_uInt16) n; + rStrm.WriteUInt16( (sal_uInt16) n ); if( !p->Store( rStrm ) ) return sal_False; } @@ -830,12 +830,12 @@ sal_Bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxDimArray::StoreData( SvStream& rStrm ) const { - rStrm << (sal_Int16) nDim; + rStrm.WriteInt16( (sal_Int16) nDim ); for( short i = 0; i < nDim; i++ ) { short lb, ub; GetDim( i, lb, ub ); - rStrm << (sal_Int16) lb << (sal_Int16) ub; + rStrm.WriteInt16( (sal_Int16) lb ).WriteInt16( (sal_Int16) ub ); } return SbxArray::StoreData( rStrm ); } diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index cc95d5b29fa8..05b84b2bdb1b 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -273,16 +273,16 @@ sal_Bool SbxBase::Store( SvStream& rStrm ) DBG_CHKTHIS( SbxBase, 0 ); if( !( nFlags & SBX_DONTSTORE ) ) { - rStrm << (sal_uInt32) GetCreator() - << (sal_uInt16) GetSbxId() - << (sal_uInt16) GetFlags() - << (sal_uInt16) GetVersion(); + rStrm.WriteUInt32( (sal_uInt32) GetCreator() ) + .WriteUInt16( (sal_uInt16) GetSbxId() ) + .WriteUInt16( (sal_uInt16) GetFlags() ) + .WriteUInt16( (sal_uInt16) GetVersion() ); sal_uIntPtr nOldPos = rStrm.Tell(); - rStrm << (sal_uInt32) 0L; + rStrm.WriteUInt32( (sal_uInt32) 0L ); sal_Bool bRes = StoreData( rStrm ); sal_uIntPtr nNewPos = rStrm.Tell(); rStrm.Seek( nOldPos ); - rStrm << (sal_uInt32) ( nNewPos - nOldPos ); + rStrm.WriteUInt32( (sal_uInt32) ( nNewPos - nOldPos ) ); rStrm.Seek( nNewPos ); if( rStrm.GetError() != SVSTREAM_OK ) bRes = sal_False; @@ -395,14 +395,14 @@ sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const RTL_TEXTENCODING_ASCII_US ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aHelpFile, RTL_TEXTENCODING_ASCII_US); - rStrm << nHelpId << static_cast<sal_uInt16>(aParams.size()); + rStrm.WriteUInt32( nHelpId ).WriteUInt16( static_cast<sal_uInt16>(aParams.size()) ); for(SbxParams::const_iterator i = aParams.begin(); i != aParams.end(); ++i) { write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, i->aName, RTL_TEXTENCODING_ASCII_US); - rStrm << (sal_uInt16) i->eType - << (sal_uInt16) i->nFlags - << (sal_uInt32) i->nUserData; + rStrm.WriteUInt16( (sal_uInt16) i->eType ) + .WriteUInt16( (sal_uInt16) i->nFlags ) + .WriteUInt32( (sal_uInt32) i->nUserData ); } return sal_True; } diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx index 581d98d2a976..d92b0f3f9d1a 100644 --- a/basic/source/sbx/sbxcoll.cxx +++ b/basic/source/sbx/sbxcoll.cxx @@ -316,7 +316,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const { write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aElemClass, RTL_TEXTENCODING_ASCII_US); - rStrm << bAddRemoveOk; + rStrm.WriteUChar( bAddRemoveOk ); } return bRes; } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 46244abd3be7..5a0750f2161e 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -679,14 +679,14 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const 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; + rStrm.WriteUInt32( (sal_uInt32) 0L ); if( !StorePrivateData( rStrm ) ) { return sal_False; } sal_uIntPtr nNew = rStrm.Tell(); rStrm.Seek( nPos ); - rStrm << (sal_uInt32) ( nNew - nPos ); + rStrm.WriteUInt32( (sal_uInt32) ( nNew - nPos ) ); rStrm.Seek( nNew ); if( !pMethods->Store( rStrm ) ) { @@ -809,7 +809,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) static sal_uInt16 nLevel = 0; if ( nLevel > 10 ) { - rStrm << "<too deep>" << endl; + rStrm.WriteCharPtr( "<too deep>" ) << endl; return; } ++nLevel; @@ -826,38 +826,38 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) // Output the data of the object itself OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US)); - rStrm << "Object( " - << OString::number(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='" - << ( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ) << "', " - << "of class '" << aClassNameStr.getStr() << "', " - << "counts " - << OString::number(GetRefCount()).getStr() - << " refs, "; + rStrm.WriteCharPtr( "Object( " ) + .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(this)).getStr() ).WriteCharPtr( "=='" ) + .WriteCharPtr( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ).WriteCharPtr( "', " ) + .WriteCharPtr( "of class '" ).WriteCharPtr( aClassNameStr.getStr() ).WriteCharPtr( "', " ) + .WriteCharPtr( "counts " ) + .WriteCharPtr( OString::number(GetRefCount()).getStr() ) + .WriteCharPtr( " refs, " ); if ( GetParent() ) { OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US)); - rStrm << "in parent " - << OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr() - << "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ) << "'"; + rStrm.WriteCharPtr( "in parent " ) + .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr() ) + .WriteCharPtr( "=='" ).WriteCharPtr( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ).WriteCharPtr( "'" ); } else { - rStrm << "no parent "; + rStrm.WriteCharPtr( "no parent " ); } - rStrm << " )" << endl; + rStrm.WriteCharPtr( " )" ) << endl; OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US)); - rStrm << aIndentNameStr.getStr() << "{" << endl; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "{" ) << endl; // Flags OUString aAttrs; if( CollectAttrs( this, aAttrs ) ) { OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US)); - rStrm << aIndentNameStr.getStr() << "- Flags: " << aAttrStr.getStr() << endl; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Flags: " ).WriteCharPtr( aAttrStr.getStr() ) << endl; } // Methods - rStrm << aIndentNameStr.getStr() << "- Methods:" << endl; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Methods:" ) << endl; for( sal_uInt16 i = 0; i < pMethods->Count(); i++ ) { SbxVariableRef& r = pMethods->GetRef( i ); @@ -884,7 +884,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) pVar->GetValues_Impl().pObj != this && pVar->GetValues_Impl().pObj != GetParent() ) { - rStrm << " contains "; + rStrm.WriteCharPtr( " contains " ); ((SbxObject*) pVar->GetValues_Impl().pObj)->Dump( rStrm, bFill ); } else @@ -895,7 +895,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) } // Properties - rStrm << aIndentNameStr.getStr() << "- Properties:" << endl; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Properties:" ) << endl; { for( sal_uInt16 i = 0; i < pProps->Count(); i++ ) { @@ -923,7 +923,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) pVar->GetValues_Impl().pObj != this && pVar->GetValues_Impl().pObj != GetParent() ) { - rStrm << " contains "; + rStrm.WriteCharPtr( " contains " ); ((SbxObject*) pVar->GetValues_Impl().pObj)->Dump( rStrm, bFill ); } else @@ -935,7 +935,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) } // Objects - rStrm << aIndentNameStr.getStr() << "- Objects:" << endl; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Objects:" ) << endl; { for( sal_uInt16 i = 0; i < pObjs->Count(); i++ ) { @@ -943,7 +943,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) SbxVariable* pVar = r; if ( pVar ) { - rStrm << aIndentNameStr.getStr() << " - Sub"; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( " - Sub" ); if ( pVar->ISA(SbxObject) ) { ((SbxObject*) pVar)->Dump( rStrm, bFill ); @@ -956,7 +956,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) } } - rStrm << aIndentNameStr.getStr() << "}" << endl << endl; + rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "}" ) << endl << endl; --nLevel; } diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 816cb9bcadfb..019834fa35eb 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -1557,14 +1557,14 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) sal_Bool SbxValue::StoreData( SvStream& r ) const { sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(aData.eType); - r << nType; + r.WriteUInt16( nType ); switch( nType & 0x0FFF ) { case SbxBOOL: case SbxINTEGER: - r << aData.nInteger; break; + r.WriteInt16( aData.nInteger ); break; case SbxLONG: - r << aData.nLong; break; + r.WriteInt32( aData.nLong ); break; case SbxDATE: // #49935: Save as double, otherwise an error during the read in ((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE ); @@ -1578,13 +1578,13 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxSALUINT64: case SbxSALINT64: // see comment in SbxValue::StoreData - r << aData.uInt64; + r.WriteUInt64( aData.uInt64 ); break; case SbxCURRENCY: { sal_Int32 tmpHi = ( (aData.nInt64 >> 32) & 0xFFFFFFFF ); sal_Int32 tmpLo = ( sal_Int32 )aData.nInt64; - r << tmpHi << tmpLo; + r.WriteInt32( tmpHi ).WriteInt32( tmpLo ); break; } case SbxSTRING: @@ -1599,42 +1599,42 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) break; case SbxERROR: case SbxUSHORT: - r << aData.nUShort; break; + r.WriteUInt16( aData.nUShort ); break; case SbxOBJECT: // to save itself as Objectptr does not work! if( aData.pObj ) { if( PTR_CAST(SbxValue,aData.pObj) != this ) { - r << (sal_uInt8) 1; + r.WriteUChar( (sal_uInt8) 1 ); return aData.pObj->Store( r ); } else - r << (sal_uInt8) 2; + r.WriteUChar( (sal_uInt8) 2 ); } else - r << (sal_uInt8) 0; + r.WriteUChar( (sal_uInt8) 0 ); break; case SbxCHAR: { char c = sal::static_int_cast< char >(aData.nChar); - r << c; + r.WriteChar( c ); break; } case SbxBYTE: - r << aData.nByte; break; + r.WriteUChar( aData.nByte ); break; case SbxULONG: - r << aData.nULong; break; + r.WriteUInt32( aData.nULong ); break; case SbxINT: { sal_uInt8 n = SAL_TYPES_SIZEOFINT; - r << n << (sal_Int32)aData.nInt; + r.WriteUChar( n ).WriteInt32( (sal_Int32)aData.nInt ); break; } case SbxUINT: { sal_uInt8 n = SAL_TYPES_SIZEOFINT; - r << n << (sal_uInt32)aData.nUInt; + r.WriteUChar( n ).WriteUInt32( (sal_uInt32)aData.nUInt ); break; } case SbxEMPTY: @@ -1642,7 +1642,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 ) case SbxVOID: break; case SbxDATAOBJECT: - r << aData.nLong; + r.WriteInt32( aData.nLong ); break; // #78919 For backwards compatibility case SbxWSTRING: diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 1ea22a8d3713..d20ab4a1bc56 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -618,7 +618,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer ) sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const { - rStrm << (sal_uInt8) 0xFF; // Marker + rStrm.WriteUChar( (sal_uInt8) 0xFF ); // Marker sal_Bool bValStore; if( this->IsA( TYPE(SbxMethod) ) ) { @@ -646,15 +646,15 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const } write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, maName, RTL_TEXTENCODING_ASCII_US); - rStrm << (sal_uInt32)nUserData; + rStrm.WriteUInt32( (sal_uInt32)nUserData ); if( pInfo.Is() ) { - rStrm << (sal_uInt8) 2; // Version 2: with UserData! + rStrm.WriteUChar( (sal_uInt8) 2 ); // Version 2: with UserData! pInfo->StoreData( rStrm ); } else { - rStrm << (sal_uInt8) 0; + rStrm.WriteUChar( (sal_uInt8) 0 ); } // Save private data only, if it is a SbxVariable if( GetClass() == SbxCLASS_VARIABLE ) @@ -736,19 +736,19 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill ) { OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US)); - rStrm << "Variable( " - << OString::number(reinterpret_cast<sal_Int64>(this)).getStr() << "==" - << aBNameStr.getStr(); + rStrm.WriteCharPtr( "Variable( " ) + .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(this)).getStr() ).WriteCharPtr( "==" ) + .WriteCharPtr( aBNameStr.getStr() ); OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US)); if ( GetParent() ) { - rStrm << " in parent '" << aBParentNameStr.getStr() << "'"; + rStrm.WriteCharPtr( " in parent '" ).WriteCharPtr( aBParentNameStr.getStr() ).WriteCharPtr( "'" ); } else { - rStrm << " no parent"; + rStrm.WriteCharPtr( " no parent" ); } - rStrm << " ) "; + rStrm.WriteCharPtr( " ) " ); // output also the object at object-vars if ( GetValues_Impl().eType == SbxOBJECT && @@ -756,7 +756,7 @@ void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill ) GetValues_Impl().pObj != this && GetValues_Impl().pObj != GetParent() ) { - rStrm << " contains "; + rStrm.WriteCharPtr( " contains " ); ((SbxObject*) GetValues_Impl().pObj)->Dump( rStrm, bFill ); } else diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 018e027a9db0..a90a63e4d4b7 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1206,16 +1206,16 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe memset(aBuffer,0,sizeof(aBuffer)); m_pFileStream->Seek(0L); - (*m_pFileStream) << (sal_uInt8) nDbaseType; // dBase format - (*m_pFileStream) << (sal_uInt8) (aDate.GetYear() % 100); // current date + (*m_pFileStream).WriteUChar( (sal_uInt8) nDbaseType ); // dBase format + (*m_pFileStream).WriteUChar( (sal_uInt8) (aDate.GetYear() % 100) ); // current date - (*m_pFileStream) << (sal_uInt8) aDate.GetMonth(); - (*m_pFileStream) << (sal_uInt8) aDate.GetDay(); - (*m_pFileStream) << (sal_uInt32)0; // number of data records - (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1); // header information, + (*m_pFileStream).WriteUChar( (sal_uInt8) aDate.GetMonth() ); + (*m_pFileStream).WriteUChar( (sal_uInt8) aDate.GetDay() ); + (*m_pFileStream).WriteUInt32( (sal_uInt32)0 ); // number of data records + (*m_pFileStream).WriteUInt16( (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1) ); // header information, // pColumns contains always an additional column - (*m_pFileStream) << (sal_uInt16) 0; // record length will be determined later + (*m_pFileStream).WriteUInt16( (sal_uInt16) 0 ); // record length will be determined later m_pFileStream->Write(aBuffer, 20); sal_uInt16 nRecLength = 1; // Length 1 for deleted flag @@ -1243,7 +1243,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName ); } - (*m_pFileStream) << aCol.getStr(); + (*m_pFileStream).WriteCharPtr( aCol.getStr() ); m_pFileStream->Write(aBuffer, 11 - aCol.getLength()); sal_Int32 nPrecision = 0; @@ -1297,9 +1297,9 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe } } - (*m_pFileStream) << cTyp; + (*m_pFileStream).WriteChar( cTyp ); if ( nDbaseType == VisualFoxPro ) - (*m_pFileStream) << sal_uInt32(nRecLength-1); + (*m_pFileStream).WriteUInt32( sal_uInt32(nRecLength-1) ); else m_pFileStream->Write(aBuffer, 4); @@ -1311,9 +1311,9 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe { throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName); } - (*m_pFileStream) << (sal_uInt8) std::min((unsigned)nPrecision, 255U); // field length + (*m_pFileStream).WriteUChar( (sal_uInt8) std::min((unsigned)nPrecision, 255U) ); // field length nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL); - (*m_pFileStream) << (sal_uInt8)0; // decimals + (*m_pFileStream).WriteUChar( (sal_uInt8)0 ); // decimals break; case 'F': case 'N': @@ -1325,41 +1325,41 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe } if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency will be treated separately { - (*m_pFileStream) << (sal_uInt8)10; // standard length - (*m_pFileStream) << (sal_uInt8)4; + (*m_pFileStream).WriteUChar( (sal_uInt8)10 ); // standard length + (*m_pFileStream).WriteUChar( (sal_uInt8)4 ); nRecLength += 10; } else { sal_Int32 nPrec = SvDbaseConverter::ConvertPrecisionToDbase(nPrecision,nScale); - (*m_pFileStream) << (sal_uInt8)( nPrec); - (*m_pFileStream) << (sal_uInt8)nScale; + (*m_pFileStream).WriteUChar( (sal_uInt8)( nPrec) ); + (*m_pFileStream).WriteUChar( (sal_uInt8)nScale ); nRecLength += (sal_uInt16)nPrec; } break; case 'L': - (*m_pFileStream) << (sal_uInt8)1; - (*m_pFileStream) << (sal_uInt8)0; + (*m_pFileStream).WriteUChar( (sal_uInt8)1 ); + (*m_pFileStream).WriteUChar( (sal_uInt8)0 ); ++nRecLength; break; case 'I': - (*m_pFileStream) << (sal_uInt8)4; - (*m_pFileStream) << (sal_uInt8)0; + (*m_pFileStream).WriteUChar( (sal_uInt8)4 ); + (*m_pFileStream).WriteUChar( (sal_uInt8)0 ); nRecLength += 4; break; case 'Y': case 'B': case 'T': case 'D': - (*m_pFileStream) << (sal_uInt8)8; - (*m_pFileStream) << (sal_uInt8)0; + (*m_pFileStream).WriteUChar( (sal_uInt8)8 ); + (*m_pFileStream).WriteUChar( (sal_uInt8)0 ); nRecLength += 8; break; case 'M': bCreateMemo = sal_True; - (*m_pFileStream) << (sal_uInt8)10; - (*m_pFileStream) << (sal_uInt8)0; + (*m_pFileStream).WriteUChar( (sal_uInt8)10 ); + (*m_pFileStream).WriteUChar( (sal_uInt8)0 ); nRecLength += 10; if ( bBinary ) aBuffer[0] = 0x06; @@ -1371,18 +1371,18 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe aBuffer[0] = 0x00; } - (*m_pFileStream) << (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR; // end of header - (*m_pFileStream) << (char)DBF_EOL; + (*m_pFileStream).WriteUChar( (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR ); // end of header + (*m_pFileStream).WriteChar( (char)DBF_EOL ); m_pFileStream->Seek(10L); - (*m_pFileStream) << nRecLength; // set record length afterwards + (*m_pFileStream).WriteUInt16( nRecLength ); // set record length afterwards if (bCreateMemo) { m_pFileStream->Seek(0L); if (nDbaseType == VisualFoxPro) - (*m_pFileStream) << (sal_uInt8) FoxProMemo; + (*m_pFileStream).WriteUChar( (sal_uInt8) FoxProMemo ); else - (*m_pFileStream) << (sal_uInt8) dBaseIIIMemo; + (*m_pFileStream).WriteUChar( (sal_uInt8) dBaseIIIMemo ); } // if (bCreateMemo) } catch ( const Exception& e ) @@ -1414,7 +1414,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile) m_pMemoStream->SetStreamSize(512); m_pMemoStream->Seek(0L); - (*m_pMemoStream) << sal_uInt32(1); // pointer to the first free block + (*m_pMemoStream).WriteUInt32( sal_uInt32(1) ); // pointer to the first free block m_pMemoStream->Flush(); delete m_pMemoStream; @@ -1526,10 +1526,10 @@ sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Ref } else { - (*m_pFileStream) << (char)DBF_EOL; // write EOL + (*m_pFileStream).WriteChar( (char)DBF_EOL ); // write EOL // raise number of datasets in the header: m_pFileStream->Seek( 4L ); - (*m_pFileStream) << (m_aHeader.db_anz + 1); + (*m_pFileStream).WriteUInt32( m_aHeader.db_anz + 1 ); // if AppendOnly no flush! if (bFlush) @@ -1626,7 +1626,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols) } m_pFileStream->Seek(nFilePos); - (*m_pFileStream) << (sal_uInt8)'*'; // mark the row in the table as deleted + (*m_pFileStream).WriteUChar( (sal_uInt8)'*' ); // mark the row in the table as deleted m_pFileStream->Flush(); return sal_True; } @@ -2081,33 +2081,33 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo const char cEOF = (char) DBF_EOL; nSize++; m_pMemoStream->Write( aStr.getStr(), aStr.getLength() ); - (*m_pMemoStream) << cEOF << cEOF; + (*m_pMemoStream).WriteChar( cEOF ).WriteChar( cEOF ); } break; case MemoFoxPro: case MemodBaseIV: // dBase IV-Memofeld with length { if ( MemodBaseIV == m_aMemoHeader.db_typ ) - (*m_pMemoStream) << (sal_uInt8)0xFF - << (sal_uInt8)0xFF - << (sal_uInt8)0x08; + (*m_pMemoStream).WriteUChar( (sal_uInt8)0xFF ) + .WriteUChar( (sal_uInt8)0xFF ) + .WriteUChar( (sal_uInt8)0x08 ); else - (*m_pMemoStream) << (sal_uInt8)0x00 - << (sal_uInt8)0x00 - << (sal_uInt8)0x00; + (*m_pMemoStream).WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0x00 ); sal_uInt32 nWriteSize = nSize; if (m_aMemoHeader.db_typ == MemoFoxPro) { if ( bBinary ) - (*m_pMemoStream) << (sal_uInt8) 0x00; // Picture + (*m_pMemoStream).WriteUChar( (sal_uInt8) 0x00 ); // Picture else - (*m_pMemoStream) << (sal_uInt8) 0x01; // Memo + (*m_pMemoStream).WriteUChar( (sal_uInt8) 0x01 ); // Memo for (int i = 4; i > 0; nWriteSize >>= 8) nHeader[--i] = (sal_uInt8) (nWriteSize % 256); } else { - (*m_pMemoStream) << (sal_uInt8) 0x00; + (*m_pMemoStream).WriteUChar( (sal_uInt8) 0x00 ); nWriteSize += 8; for (int i = 0; i < 4; nWriteSize >>= 8) nHeader[i++] = (sal_uInt8) (nWriteSize % 256); @@ -2131,7 +2131,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo // Write the new block number m_pMemoStream->Seek(0L); - (*m_pMemoStream) << m_aMemoHeader.db_next; + (*m_pMemoStream).WriteUInt32( m_aMemoHeader.db_next ); m_pMemoStream->Flush(); } return sal_True; diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index e19f935111c5..3341af9dae54 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -680,9 +680,9 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const { const ODbaseIndex& rIndex = rPage.GetIndex(); if (!rIndex.isUnique() || rPage.IsLeaf()) - rStream << (sal_uInt32)aKey.nRecord; // key + rStream.WriteUInt32( (sal_uInt32)aKey.nRecord ); // key else - rStream << (sal_uInt32)0; // key + rStream.WriteUInt32( (sal_uInt32)0 ); // key if (rIndex.getHeader().db_keytype) // double { @@ -793,7 +793,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPagePtr& rPag // ----------------------------------------------------------------------------- SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPagePtr& rPage) { - rStream << rPage.nPagePos; + rStream.WriteUInt32( rPage.nPagePos ); return rStream; } // ----------------------------------------------------------------------------- @@ -862,7 +862,7 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r OSL_UNUSED( nCurrentPos ); nValue = rPage.nCount; - rStream << nValue << rPage.aChild; + rStream.WriteUInt32( nValue ) << rPage.aChild; sal_uInt16 i = 0; for (; i < rPage.nCount; i++) diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index de928de77517..63284a4a9f6c 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -108,11 +108,11 @@ namespace dbaui { SvStream& operator<<( SvStream& _rStr, const OTableRow& _rRow ) { - _rStr << _rRow.m_nPos; + _rStr.WriteInt32( _rRow.m_nPos ); OFieldDescription* pFieldDesc = _rRow.GetActFieldDescr(); if(pFieldDesc) { - _rStr << (sal_Int32)1; + _rStr.WriteInt32( (sal_Int32)1 ); _rStr.WriteUniOrByteString(pFieldDesc->GetName(), _rStr.GetStreamCharSet()); _rStr.WriteUniOrByteString(pFieldDesc->GetDescription(), _rStr.GetStreamCharSet()); _rStr.WriteUniOrByteString(pFieldDesc->GetHelpText(), _rStr.GetStreamCharSet()); @@ -120,28 +120,28 @@ namespace dbaui Any aValue = pFieldDesc->GetControlDefault(); if ( aValue >>= nValue ) { - _rStr << sal_Int32(1); + _rStr.WriteInt32( sal_Int32(1) ); _rStr << nValue; } else { - _rStr << sal_Int32(2); + _rStr.WriteInt32( sal_Int32(2) ); _rStr.WriteUniOrByteString(::comphelper::getString(aValue), _rStr.GetStreamCharSet()); } - _rStr << pFieldDesc->GetType(); + _rStr.WriteInt32( pFieldDesc->GetType() ); - _rStr << pFieldDesc->GetPrecision(); - _rStr << pFieldDesc->GetScale(); - _rStr << pFieldDesc->GetIsNullable(); - _rStr << pFieldDesc->GetFormatKey(); - _rStr << (sal_Int32)pFieldDesc->GetHorJustify(); - _rStr << sal_Int32(pFieldDesc->IsAutoIncrement() ? 1 : 0); - _rStr << sal_Int32(pFieldDesc->IsPrimaryKey() ? 1 : 0); - _rStr << sal_Int32(pFieldDesc->IsCurrency() ? 1 : 0); + _rStr.WriteInt32( pFieldDesc->GetPrecision() ); + _rStr.WriteInt32( pFieldDesc->GetScale() ); + _rStr.WriteInt32( pFieldDesc->GetIsNullable() ); + _rStr.WriteInt32( pFieldDesc->GetFormatKey() ); + _rStr.WriteInt32( (sal_Int32)pFieldDesc->GetHorJustify() ); + _rStr.WriteInt32( sal_Int32(pFieldDesc->IsAutoIncrement() ? 1 : 0) ); + _rStr.WriteInt32( sal_Int32(pFieldDesc->IsPrimaryKey() ? 1 : 0) ); + _rStr.WriteInt32( sal_Int32(pFieldDesc->IsCurrency() ? 1 : 0) ); } else - _rStr << (sal_Int32)0; + _rStr.WriteInt32( (sal_Int32)0 ); return _rStr; } SvStream& operator>>( SvStream& _rStr, OTableRow& _rRow ) diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 3a14971d7dc3..0d520398bac5 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -37,7 +37,7 @@ namespace dbaui ::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = reinterpret_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject); if(pRows) { - (*rxOStm) << (sal_Int32)pRows->size(); // first stream the size + (*rxOStm).WriteInt32( (sal_Int32)pRows->size() ); // first stream the size ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end(); for(;aIter != aEnd;++aIter) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index e85448e2f520..6b4713ba4f72 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -387,17 +387,17 @@ bool EditTextObject::Store( SvStream& rOStream ) const sal_Size nStartPos = rOStream.Tell(); sal_uInt16 nWhich = static_cast<sal_uInt16>(EE_FORMAT_BIN); - rOStream << nWhich; + rOStream.WriteUInt16( nWhich ); sal_uInt32 nStructSz = 0; - rOStream << nStructSz; + rOStream.WriteUInt32( nStructSz ); StoreData( rOStream ); sal_Size nEndPos = rOStream.Tell(); nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz ); rOStream.Seek( nStartPos + sizeof( nWhich ) ); - rOStream << nStructSz; + rOStream.WriteUInt32( nStructSz ); rOStream.Seek( nEndPos ); return rOStream.GetError() ? false : true; @@ -1106,9 +1106,9 @@ public: void EditTextObjectImpl::StoreData( SvStream& rOStream ) const { sal_uInt16 nVer = 602; - rOStream << nVer; + rOStream.WriteUInt16( nVer ); - rOStream << static_cast<sal_Bool>(bOwnerOfPool); + rOStream.WriteUChar( static_cast<sal_Bool>(bOwnerOfPool) ); // First store the pool, later only the Surregate if ( bOwnerOfPool ) @@ -1119,14 +1119,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const // Store Current text encoding ... rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( osl_getThreadTextEncoding() ); - rOStream << (sal_uInt16) eEncoding; + rOStream.WriteUInt16( (sal_uInt16) eEncoding ); // The number of paragraphs ... size_t nParagraphs = aContents.size(); // FIXME: this truncates, check usage of stream and if it can be changed, // i.e. is not persistent, adapt this and reader. sal_uInt16 nParagraphs_Stream = static_cast<sal_uInt16>(nParagraphs); - rOStream << nParagraphs_Stream; + rOStream.WriteUInt16( nParagraphs_Stream ); sal_Unicode nUniChar = CH_FEATURE; char cFeatureConverted = OString(&nUniChar, 1, eEncoding).toChar(); @@ -1223,14 +1223,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const // StyleName and Family... write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rC.GetStyle(), eEncoding); - rOStream << static_cast<sal_uInt16>(rC.GetFamily()); + rOStream.WriteUInt16( static_cast<sal_uInt16>(rC.GetFamily()) ); // Paragraph attributes ... rC.GetParaAttribs().Store( rOStream ); // The number of attributes ... size_t nAttribs = rC.aAttribs.size(); - rOStream << static_cast<sal_uInt16>(nAttribs); + rOStream.WriteUInt16( static_cast<sal_uInt16>(nAttribs) ); // And the individual attributes // Items as Surregate => always 8 bytes per Attribute @@ -1239,36 +1239,36 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const { const XEditAttribute& rX = rC.aAttribs[nAttr]; - rOStream << rX.GetItem()->Which(); + rOStream.WriteUInt16( rX.GetItem()->Which() ); GetPool()->StoreSurrogate(rOStream, rX.GetItem()); - rOStream << rX.GetStart(); - rOStream << rX.GetEnd(); + rOStream.WriteUInt16( rX.GetStart() ); + rOStream.WriteUInt16( rX.GetEnd() ); } } - rOStream << nMetric; + rOStream.WriteUInt16( nMetric ); - rOStream << nUserType; - rOStream << nObjSettings; + rOStream.WriteUInt16( nUserType ); + rOStream.WriteUInt32( nObjSettings ); - rOStream << static_cast<sal_Bool>(bVertical); - rOStream << nScriptType; + rOStream.WriteUChar( static_cast<sal_Bool>(bVertical) ); + rOStream.WriteUInt16( nScriptType ); - rOStream << static_cast<sal_Bool>(bStoreUnicodeStrings); + rOStream.WriteUChar( static_cast<sal_Bool>(bStoreUnicodeStrings) ); if ( bStoreUnicodeStrings ) { for ( size_t nPara = 0; nPara < nParagraphs_Stream; nPara++ ) { const ContentInfo& rC = aContents[nPara]; sal_uInt16 nL = rC.GetText().getLength(); - rOStream << nL; + rOStream.WriteUInt16( nL ); rOStream.Write(rC.GetText().getStr(), nL*sizeof(sal_Unicode)); // StyleSheetName must be Unicode too! // Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed... // If needed, change nL back to sal_uLong and increase version... nL = rC.GetStyle().getLength(); - rOStream << nL; + rOStream.WriteUInt16( nL ); rOStream.Write(rC.GetStyle().getStr(), nL*sizeof(sal_Unicode)); } } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 1f23708e6219..da40d02b7a31 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -39,24 +39,24 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont ) sal_uInt16 nTemp; rStream << rFont.GetColor(); - nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp; + nTemp = (sal_uInt16)rFont.GetFamily(); rStream.WriteUInt16( nTemp ); nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet()); - rStream << nTemp; + rStream.WriteUInt16( nTemp ); - nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp; - nTemp = (sal_uInt16)rFont.GetAlign(); rStream << nTemp; - nTemp = (sal_uInt16)rFont.GetWeight(); rStream << nTemp; - nTemp = (sal_uInt16)rFont.GetUnderline(); rStream << nTemp; - nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream << nTemp; - nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp; + nTemp = (sal_uInt16)rFont.GetPitch(); rStream.WriteUInt16( nTemp ); + nTemp = (sal_uInt16)rFont.GetAlign(); rStream.WriteUInt16( nTemp ); + nTemp = (sal_uInt16)rFont.GetWeight(); rStream.WriteUInt16( nTemp ); + nTemp = (sal_uInt16)rFont.GetUnderline(); rStream.WriteUInt16( nTemp ); + nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp ); + nTemp = (sal_uInt16)rFont.GetItalic(); rStream.WriteUInt16( nTemp ); // UNICODE: rStream << rFont.GetName(); rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet()); - rStream << rFont.IsOutline(); - rStream << rFont.IsShadow(); - rStream << rFont.IsTransparent(); + rStream.WriteUChar( rFont.IsOutline() ); + rStream.WriteUChar( rFont.IsShadow() ); + rStream.WriteUChar( rFont.IsTransparent() ); } // ----------------------------------------------------------------------- @@ -321,7 +321,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE; } - rStrm << nStyle; + rStrm.WriteUInt16( nStyle ); if( nStyle != BS_BMP ) StoreFont( rStrm, aFont ); @@ -351,11 +351,11 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c if ( (nEnd-_nStart) > 0xFF00 ) rStrm.Seek( _nStart ); } - rStrm << static_cast<sal_Int32>(nWidth); - rStrm << nStart; - rStrm << nJustify; - rStrm << OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar(); - rStrm << nScale; + rStrm.WriteInt32( static_cast<sal_Int32>(nWidth) ); + rStrm.WriteUInt16( nStart ); + rStrm.WriteUChar( nJustify ); + rStrm.WriteChar( OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar() ); + rStrm.WriteUInt16( nScale ); // UNICODE: rStrm << aPrevText; rStrm.WriteUniOrByteString(aPrevText, rStrm.GetStreamCharSet()); diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index bf8f6499b2ba..11c079b542c5 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -429,9 +429,9 @@ void SvxDateField::Load( SvPersistStream & rStm ) void SvxDateField::Save( SvPersistStream & rStm ) { - rStm << nFixDate; - rStm << (sal_uInt16)eType; - rStm << (sal_uInt16)eFormat; + rStm.WriteUInt32( nFixDate ); + rStm.WriteUInt16( (sal_uInt16)eType ); + rStm.WriteUInt16( (sal_uInt16)eFormat ); } // ----------------------------------------------------------------------- @@ -555,7 +555,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const static void write_unicode( SvPersistStream & rStm, const OUString& rString ) { sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength()); - rStm << nL; + rStm.WriteUInt16( nL ); //endian specific?, yipes! rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) ); } @@ -591,7 +591,7 @@ void SvxURLField::Load( SvPersistStream & rStm ) void SvxURLField::Save( SvPersistStream & rStm ) { - rStm << (sal_uInt16)eFormat; + rStm.WriteUInt16( (sal_uInt16)eFormat ); write_unicode( rStm, aURL ); write_unicode( rStm, aRepresentation ); @@ -810,8 +810,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm ) void SvxExtTimeField::Save( SvPersistStream & rStm ) { rStm.WriteInt64(m_nFixTime); - rStm << (sal_uInt16) eType; - rStm << (sal_uInt16) eFormat; + rStm.WriteUInt16( (sal_uInt16) eType ); + rStm.WriteUInt16( (sal_uInt16) eFormat ); } //---------------------------------------------------------------------------- @@ -958,8 +958,8 @@ void SvxExtFileField::Save( SvPersistStream & rStm ) // UNICODE: rStm << aFile; rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet()); - rStm << (sal_uInt16) eType; - rStm << (sal_uInt16) eFormat; + rStm.WriteUInt16( (sal_uInt16) eType ); + rStm.WriteUInt16( (sal_uInt16) eFormat ); } //---------------------------------------------------------------------------- @@ -1114,8 +1114,8 @@ void SvxAuthorField::Save( SvPersistStream & rStm ) write_unicode( rStm, aFirstName ); write_unicode( rStm, aShortName ); - rStm << (sal_uInt16) eType; - rStm << (sal_uInt16) eFormat; + rStm.WriteUInt16( (sal_uInt16) eType ); + rStm.WriteUInt16( (sal_uInt16) eFormat ); } //---------------------------------------------------------------------------- diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 020488cb9846..b48f8d3cb053 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -106,13 +106,13 @@ namespace /// Store a border line to a stream. SvStream& StoreBorderLine(SvStream &stream, const SvxBorderLine &l, sal_uInt16 version) { - stream << l.GetColor() - << l.GetOutWidth() - << l.GetInWidth() - << l.GetDistance(); + stream << l.GetColor(); + stream.WriteUInt16( l.GetOutWidth() ) + .WriteUInt16( l.GetInWidth() ) + .WriteUInt16( l.GetDistance() ); if (version >= BORDER_LINE_WITH_STYLE_VERSION) - stream << static_cast<sal_uInt16>(l.GetBorderLineStyle()); + stream.WriteUInt16( static_cast<sal_uInt16>(l.GetBorderLineStyle()) ); return stream; } @@ -167,7 +167,7 @@ SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << GetValue(); + rStrm.WriteUChar( GetValue() ); return rStrm; } @@ -370,8 +370,8 @@ SfxItemPresentation SvxSizeItem::GetPresentation SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { //#fdo39428 SvStream no longer supports operator<<(long) - rStrm << sal::static_int_cast<sal_Int32>(aSize.Width()); - rStrm << sal::static_int_cast<sal_Int32>(aSize.Height()); + rStrm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Width()) ); + rStrm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Height()) ); return rStrm; } @@ -675,38 +675,38 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con sal_uInt16 nMargin = 0; if( nLeftMargin > 0 ) nMargin = sal_uInt16( nLeftMargin ); - rStrm << nMargin; - rStrm << nPropLeftMargin; + rStrm.WriteUInt16( nMargin ); + rStrm.WriteUInt16( nPropLeftMargin ); if( nRightMargin > 0 ) nMargin = sal_uInt16( nRightMargin ); else nMargin = 0; - rStrm << nMargin; - rStrm << nPropRightMargin; - rStrm << nFirstLineOfst; - rStrm << nPropFirstLineOfst; + rStrm.WriteUInt16( nMargin ); + rStrm.WriteUInt16( nPropRightMargin ); + rStrm.WriteInt16( nFirstLineOfst ); + rStrm.WriteUInt16( nPropFirstLineOfst ); if( nTxtLeft > 0 ) nMargin = sal_uInt16( nTxtLeft ); else nMargin = 0; - rStrm << nMargin; + rStrm.WriteUInt16( nMargin ); if( nItemVersion >= LRSPACE_AUTOFIRST_VERSION ) { sal_Int8 nAutoFirst = bAutoFirst ? 1 : 0; if( nItemVersion >= LRSPACE_NEGATIVE_VERSION && ( nLeftMargin < 0 || nRightMargin < 0 || nTxtLeft < 0 ) ) nAutoFirst |= 0x80; - rStrm << nAutoFirst; + rStrm.WriteSChar( nAutoFirst ); // From 6.0 onwards, do not write Magic numbers... DBG_ASSERT( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_50, "Change File format SvxLRSpaceItem!" ); - rStrm << (sal_uInt32) BULLETLR_MARKER; - rStrm << nSaveFI; + rStrm.WriteUInt32( (sal_uInt32) BULLETLR_MARKER ); + rStrm.WriteInt16( nSaveFI ); if( 0x80 & nAutoFirst ) { - rStrm << static_cast<sal_Int32>(nLeftMargin); - rStrm << static_cast<sal_Int32>(nRightMargin); + rStrm.WriteInt32( static_cast<sal_Int32>(nLeftMargin) ); + rStrm.WriteInt32( static_cast<sal_Int32>(nRightMargin) ); } } @@ -1002,10 +1002,10 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << GetUpper() - << GetPropUpper() - << GetLower() - << GetPropLower(); + rStrm.WriteUInt16( GetUpper() ) + .WriteUInt16( GetPropUpper() ) + .WriteUInt16( GetLower() ) + .WriteUInt16( GetPropLower() ); return rStrm; } @@ -1067,7 +1067,7 @@ SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8)GetValue(); + rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; } @@ -1122,7 +1122,7 @@ SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8)GetValue(); + rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; } @@ -1267,7 +1267,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) if( IsPosProtected() ) cProt |= 0x01; if( IsSizeProtected() ) cProt |= 0x02; if( IsCntntProtected() ) cProt |= 0x04; - rStrm << (sal_Int8) cProt; + rStrm.WriteSChar( (sal_Int8) cProt ); return rStrm; } @@ -1510,12 +1510,12 @@ SfxItemPresentation SvxShadowItem::GetPresentation SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8) GetLocation() - << (sal_uInt16) GetWidth() - << (sal_Bool)(aShadowColor.GetTransparency() > 0) + rStrm.WriteSChar( (sal_Int8) GetLocation() ) + .WriteUInt16( (sal_uInt16) GetWidth() ) + .WriteUChar( (sal_Bool)(aShadowColor.GetTransparency() > 0) ) << GetColor() - << GetColor() - << (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID + << GetColor(); + rStrm.WriteSChar( (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID return rStrm; } @@ -2200,7 +2200,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { - rStrm << (sal_uInt16) GetDistance(); + rStrm.WriteUInt16( (sal_uInt16) GetDistance() ); const SvxBorderLine* pLine[ 4 ]; // top, left, right, bottom pLine[ 0 ] = GetTop(); pLine[ 1 ] = GetLeft(); @@ -2212,7 +2212,7 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const const SvxBorderLine* l = pLine[ i ]; if( l ) { - rStrm << static_cast<sal_Int8>(i); + rStrm.WriteSChar( static_cast<sal_Int8>(i) ); StoreBorderLine(rStrm, *l, BorderLineVersionFromBoxVersion(nItemVersion)); } } @@ -2225,14 +2225,14 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const cLine |= 0x10; } - rStrm << cLine; + rStrm.WriteSChar( cLine ); if( nItemVersion >= BOX_4DISTS_VERSION && (cLine & 0x10) != 0 ) { - rStrm << (sal_uInt16)nTopDist - << (sal_uInt16)nLeftDist - << (sal_uInt16)nRightDist - << (sal_uInt16)nBottomDist; + rStrm.WriteUInt16( (sal_uInt16)nTopDist ) + .WriteUInt16( (sal_uInt16)nLeftDist ) + .WriteUInt16( (sal_uInt16)nRightDist ) + .WriteUInt16( (sal_uInt16)nBottomDist ); } return rStrm; @@ -2601,8 +2601,8 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) cFlags |= 0x02; if ( IsMinDist() ) cFlags |= 0x04; - rStrm << (sal_Int8) cFlags - << (sal_uInt16) GetDefDist(); + rStrm.WriteSChar( (sal_Int8) cFlags ) + .WriteUInt16( (sal_uInt16) GetDefDist() ); const SvxBorderLine* pLine[ 2 ]; pLine[ 0 ] = GetHori(); pLine[ 1 ] = GetVert(); @@ -2612,14 +2612,14 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const SvxBorderLine* l = pLine[ i ]; if( l ) { - rStrm << (char) i - << l->GetColor() - << (short) l->GetOutWidth() - << (short) l->GetInWidth() - << (short) l->GetDistance(); + rStrm.WriteChar( (char) i ) + << l->GetColor(); + rStrm.WriteInt16( (short) l->GetOutWidth() ) + .WriteInt16( (short) l->GetInWidth() ) + .WriteInt16( (short) l->GetDistance() ); } } - rStrm << (char) 2; + rStrm.WriteChar( (char) 2 ); return rStrm; } @@ -3012,9 +3012,9 @@ SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { - rStrm << (sal_Int8)GetValue(); + rStrm.WriteSChar( (sal_Int8)GetValue() ); if( FMTBREAK_NOAUTO > nItemVersion ) - rStrm << (sal_Int8)0x01; + rStrm.WriteSChar( (sal_Int8)0x01 ); return rStrm; } @@ -3059,7 +3059,7 @@ SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8)GetValue(); + rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; } @@ -3257,13 +3257,16 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co { if( pLine ) { - rStrm << pLine->GetColor() - << (short)pLine->GetOutWidth() - << (short)pLine->GetInWidth() - << (short)pLine->GetDistance(); + rStrm << pLine->GetColor(); + rStrm.WriteInt16( (short)pLine->GetOutWidth() ) + .WriteInt16( (short)pLine->GetInWidth() ) + .WriteInt16( (short)pLine->GetDistance() ); } else - rStrm << Color() << (short)0 << (short)0 << (short)0; + { + rStrm << Color(); + rStrm.WriteInt16( (short)0 ).WriteInt16( (short)0 ).WriteInt16( (short)0 ); + } return rStrm; } @@ -3897,10 +3900,10 @@ SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) cons SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const { - rStream << (sal_Bool)sal_False; + rStream.WriteUChar( (sal_Bool)sal_False ); rStream << aColor; rStream << aColor; - rStream << (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID + rStream.WriteSChar( (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID sal_uInt16 nDoLoad = 0; @@ -3910,7 +3913,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) nDoLoad |= LOAD_LINK; if ( !maStrFilter.isEmpty() ) nDoLoad |= LOAD_FILTER; - rStream << nDoLoad; + rStream.WriteUInt16( nDoLoad ); if ( pImpl->pGraphicObject && maStrLink.isEmpty() ) rStream << pImpl->pGraphicObject->GetGraphic(); @@ -3927,7 +3930,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) // UNICODE: rStream << maStrFilter; rStream.WriteUniOrByteString(maStrFilter, rStream.GetStreamCharSet()); } - rStream << (sal_Int8)eGraphicPos; + rStream.WriteSChar( (sal_Int8)eGraphicPos ); return rStream; } @@ -4185,7 +4188,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer* SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const { sal_uInt16 nValue = GetValue(); - rStrm << nValue; + rStrm.WriteUInt16( nValue ); return rStrm; } diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 2dca4a74d332..08f0a63cd7b6 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -245,26 +245,26 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC pBulletFont->SetName(sFontName); } - rStream << (sal_uInt16)NUMITEM_VERSION_04; + rStream.WriteUInt16( (sal_uInt16)NUMITEM_VERSION_04 ); - rStream << (sal_uInt16)GetNumberingType(); - rStream << (sal_uInt16)eNumAdjust; - rStream << (sal_uInt16)nInclUpperLevels; - rStream << nStart; - rStream << (sal_uInt16)cBullet; + rStream.WriteUInt16( (sal_uInt16)GetNumberingType() ); + rStream.WriteUInt16( (sal_uInt16)eNumAdjust ); + rStream.WriteUInt16( (sal_uInt16)nInclUpperLevels ); + rStream.WriteUInt16( nStart ); + rStream.WriteUInt16( (sal_uInt16)cBullet ); - rStream << nFirstLineOffset; - rStream << nAbsLSpace; - rStream << nLSpace; + rStream.WriteInt16( nFirstLineOffset ); + rStream.WriteInt16( nAbsLSpace ); + rStream.WriteInt16( nLSpace ); - rStream << nCharTextDistance; + rStream.WriteInt16( nCharTextDistance ); rtl_TextEncoding eEnc = osl_getThreadTextEncoding(); rStream.WriteUniOrByteString(sPrefix, eEnc); rStream.WriteUniOrByteString(sSuffix, eEnc); rStream.WriteUniOrByteString(sCharStyleName, eEnc); if(pGraphicBrush) { - rStream << (sal_uInt16)1; + rStream.WriteUInt16( (sal_uInt16)1 ); // in SD or SI force bullet itself to be stored, // for that purpose throw away link when link and graphic @@ -277,30 +277,30 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION); } else - rStream << (sal_uInt16)0; + rStream.WriteUInt16( (sal_uInt16)0 ); - rStream << (sal_uInt16)eVertOrient; + rStream.WriteUInt16( (sal_uInt16)eVertOrient ); if(pBulletFont) { - rStream << (sal_uInt16)1; + rStream.WriteUInt16( (sal_uInt16)1 ); rStream << *pBulletFont; } else - rStream << (sal_uInt16)0; + rStream.WriteUInt16( (sal_uInt16)0 ); rStream << aGraphicSize; Color nTempColor = nBulletColor; if(COL_AUTO == nBulletColor.GetColor()) nTempColor = COL_BLACK; rStream << nTempColor; - rStream << nBulletRelSize; - rStream << (sal_uInt16)IsShowSymbol(); + rStream.WriteUInt16( nBulletRelSize ); + rStream.WriteUInt16( (sal_uInt16)IsShowSymbol() ); - rStream << ( sal_uInt16 ) mePositionAndSpaceMode; - rStream << ( sal_uInt16 ) meLabelFollowedBy; - rStream << ( sal_Int32 ) mnListtabPos; - rStream << ( sal_Int32 ) mnFirstLineIndent; - rStream << ( sal_Int32 ) mnIndentAt; + rStream.WriteUInt16( ( sal_uInt16 ) mePositionAndSpaceMode ); + rStream.WriteUInt16( ( sal_uInt16 ) meLabelFollowedBy ); + rStream.WriteInt32( ( sal_Int32 ) mnListtabPos ); + rStream.WriteInt32( ( sal_Int32 ) mnFirstLineIndent ); + rStream.WriteInt32( ( sal_Int32 ) mnIndentAt ); return rStream; } @@ -710,12 +710,12 @@ SvxNumRule* SvxNumRule::Create( SvStream & rStream ) SvStream& SvxNumRule::Store( SvStream &rStream ) { - rStream<<(sal_uInt16)NUMITEM_VERSION_03; - rStream<<nLevelCount; + rStream.WriteUInt16( (sal_uInt16)NUMITEM_VERSION_03 ); + rStream.WriteUInt16( nLevelCount ); //first save of nFeatureFlags for old versions - rStream<<(sal_uInt16)nFeatureFlags; - rStream<<(sal_uInt16)bContinuousNumbering; - rStream<<(sal_uInt16)eNumberingType; + rStream.WriteUInt16( (sal_uInt16)nFeatureFlags ); + rStream.WriteUInt16( (sal_uInt16)bContinuousNumbering ); + rStream.WriteUInt16( (sal_uInt16)eNumberingType ); FontToSubsFontConverter pConverter = 0; sal_Bool bConvertBulletFont = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_50 ) && ( rStream.GetVersion() ); @@ -724,7 +724,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream ) sal_uInt16 nSetFlag(aFmtsSet[i] ? 2 : 0); // fdo#68648 store that too if(aFmts[i]) { - rStream << sal_uInt16(1 | nSetFlag); + rStream.WriteUInt16( sal_uInt16(1 | nSetFlag) ); if(bConvertBulletFont && aFmts[i]->GetBulletFont()) { if(!pConverter) @@ -735,10 +735,10 @@ SvStream& SvxNumRule::Store( SvStream &rStream ) aFmts[i]->Store(rStream, pConverter); } else - rStream << sal_uInt16(0 | nSetFlag); + rStream.WriteUInt16( sal_uInt16(0 | nSetFlag) ); } //second save of nFeatureFlags for new versions - rStream<<(sal_uInt16)nFeatureFlags; + rStream.WriteUInt16( (sal_uInt16)nFeatureFlags ); if(pConverter) DestroyFontToSubsFontConverter(pConverter); diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx index c3f315ed2791..53f92281686f 100644 --- a/editeng/source/items/optitems.cxx +++ b/editeng/source/items/optitems.cxx @@ -182,8 +182,8 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const { - rStrm << (sal_uInt8) GetMinLead() - << (sal_uInt8) GetMinTrail(); + rStrm.WriteUChar( (sal_uInt8) GetMinLead() ) + .WriteUChar( (sal_uInt8) GetMinTrail() ); return rStrm; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 5f11920eb39b..747664150799 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -278,11 +278,11 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8) GetPropLineSpace() - << (short) GetInterLineSpace() - << (sal_uInt16) GetLineHeight() - << (sal_Int8) GetLineSpaceRule() - << (sal_Int8) GetInterLineSpaceRule(); + rStrm.WriteSChar( (sal_Int8) GetPropLineSpace() ) + .WriteInt16( (short) GetInterLineSpace() ) + .WriteUInt16( (sal_uInt16) GetLineHeight() ) + .WriteSChar( (sal_Int8) GetLineSpaceRule() ) + .WriteSChar( (sal_Int8) GetInterLineSpaceRule() ); return rStrm; } @@ -509,7 +509,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const { - rStrm << (char)GetAdjust(); + rStrm.WriteChar( (char)GetAdjust() ); if ( nItemVersion >= ADJUST_LASTBLOCK_VERSION ) { sal_Int8 nFlags = 0; @@ -519,7 +519,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const nFlags |= 0x0002; if ( bLastBlock ) nFlags |= 0x0004; - rStrm << (sal_Int8) nFlags; + rStrm.WriteSChar( (sal_Int8) nFlags ); } return rStrm; } @@ -551,7 +551,7 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8)GetValue(); + rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; } @@ -621,7 +621,7 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8) GetValue(); + rStrm.WriteSChar( (sal_Int8) GetValue() ); return rStrm; } @@ -823,11 +823,11 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8) IsHyphen() - << (sal_Int8) IsPageEnd() - << (sal_Int8) GetMinLead() - << (sal_Int8) GetMinTrail() - << (sal_Int8) GetMaxHyphens(); + rStrm.WriteSChar( (sal_Int8) IsHyphen() ) + .WriteSChar( (sal_Int8) IsPageEnd() ) + .WriteSChar( (sal_Int8) GetMinLead() ) + .WriteSChar( (sal_Int8) GetMinTrail() ) + .WriteSChar( (sal_Int8) GetMaxHyphens() ); return rStrm; } @@ -1187,24 +1187,24 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) nCount = (sal_uInt16)(nNew < lA3Width ? ( lA3Width - nNew ) / nDefDist + 1 : 0); } - rStrm << (sal_Int8) ( nTabs + nCount ); + rStrm.WriteSChar( (sal_Int8) ( nTabs + nCount ) ); for ( short i = 0; i < nTabs; i++ ) { const SvxTabStop& rTab = (*this)[ i ]; - rStrm << rTab.GetTabPos() - << (sal_Int8) rTab.GetAdjustment() - << (unsigned char) rTab.GetDecimal() - << (unsigned char) rTab.GetFill(); + rStrm.WriteInt32( rTab.GetTabPos() ) + .WriteSChar( (sal_Int8) rTab.GetAdjustment() ) + .WriteUChar( (unsigned char) rTab.GetDecimal() ) + .WriteUChar( (unsigned char) rTab.GetFill() ); } if ( bStoreDefTabs ) for( ; nCount; --nCount ) { SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT); - rStrm << aSwTabStop.GetTabPos() - << (sal_Int8) aSwTabStop.GetAdjustment() - << (unsigned char) aSwTabStop.GetDecimal() - << (unsigned char) aSwTabStop.GetFill(); + rStrm.WriteInt32( aSwTabStop.GetTabPos() ) + .WriteSChar( (sal_Int8) aSwTabStop.GetAdjustment() ) + .WriteUChar( (unsigned char) aSwTabStop.GetDecimal() ) + .WriteUChar( (unsigned char) aSwTabStop.GetFill() ); nNew += nDefDist; } @@ -1252,7 +1252,7 @@ SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Int8)GetValue(); + rStrm.WriteSChar( (sal_Int8)GetValue() ); return rStrm; } @@ -1548,7 +1548,7 @@ SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const { - rStrm << GetValue(); + rStrm.WriteUInt16( GetValue() ); return rStrm; } diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx index 07742bc1a1a4..4ec1280ce5f9 100644 --- a/editeng/source/items/svdfield.cxx +++ b/editeng/source/items/svdfield.cxx @@ -45,7 +45,7 @@ void SdrMeasureField::Load(SvPersistStream& rIn) void SdrMeasureField::Save(SvPersistStream& rOut) { - rOut<<(sal_uInt16)eMeasureFieldKind; + rOut.WriteUInt16( (sal_uInt16)eMeasureFieldKind ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index eb304063a875..7352f575e1f3 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -375,8 +375,8 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co { sal_Bool bToBats = IsStarSymbol( GetFamilyName() ); - rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch() - << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())); + rStrm.WriteUChar( (sal_uInt8) GetFamily() ).WriteUChar( (sal_uInt8) GetPitch() ) + .WriteUChar( (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())) ); OUString aStoreFamilyName( GetFamilyName() ); if( bToBats ) @@ -388,7 +388,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co if ( bEnableStoreUnicodeNames ) { sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER; - rStrm << nMagic; + rStrm.WriteUInt32( nMagic ); rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE ); rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE ); } @@ -495,7 +495,7 @@ sal_uInt16 SvxPostureItem::GetValueCount() const SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8)GetValue(); + rStrm.WriteUChar( (sal_uInt8)GetValue() ); return rStrm; } @@ -660,7 +660,7 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8)GetValue(); + rStrm.WriteUChar( (sal_uInt8)GetValue() ); return rStrm; } @@ -768,10 +768,10 @@ SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const { - rStrm << (sal_uInt16)GetHeight(); + rStrm.WriteUInt16( (sal_uInt16)GetHeight() ); if( FONTHEIGHT_UNIT_VERSION <= nItemVersion ) - rStrm << GetProp() << (sal_uInt16)GetPropUnit(); + rStrm.WriteUInt16( GetProp() ).WriteUInt16( (sal_uInt16)GetPropUnit() ); else { // When exporting to the old versions the relative information is lost @@ -779,7 +779,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) sal_uInt16 _nProp = GetProp(); if( SFX_MAPUNIT_RELATIVE != GetPropUnit() ) _nProp = 100; - rStrm << _nProp; + rStrm.WriteUInt16( _nProp ); } return rStrm; } @@ -1157,7 +1157,7 @@ SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << GetWidth() << GetProp(); + rStrm.WriteUInt16( GetWidth() ).WriteUInt16( GetProp() ); return rStrm; } @@ -1317,7 +1317,7 @@ sal_uInt16 SvxTextLineItem::GetValueCount() const SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8)GetValue(); + rStrm.WriteUChar( (sal_uInt8)GetValue() ); return rStrm; } @@ -1545,7 +1545,7 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8)GetValue(); + rStrm.WriteUChar( (sal_uInt8)GetValue() ); return rStrm; } @@ -1642,7 +1642,7 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8) GetValue(); + rStrm.WriteUChar( (sal_uInt8) GetValue() ); return rStrm; } @@ -1703,7 +1703,7 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8) GetValue(); + rStrm.WriteUChar( (sal_uInt8) GetValue() ); return rStrm; } @@ -1765,7 +1765,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Bool) GetValue(); + rStrm.WriteUChar( (sal_Bool) GetValue() ); return rStrm; } @@ -1826,7 +1826,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Bool) GetValue(); + rStrm.WriteUChar( (sal_Bool) GetValue() ); return rStrm; } @@ -1887,7 +1887,7 @@ SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt16) GetValue(); + rStrm.WriteUInt16( (sal_uInt16) GetValue() ); return rStrm; } @@ -2082,7 +2082,7 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) << GetValue(); + rStrm.WriteUChar( (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) ) << GetValue(); return rStrm; } @@ -2128,7 +2128,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (short) GetValue(); + rStrm.WriteInt16( (short) GetValue() ); return rStrm; } @@ -2242,7 +2242,7 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8) GetValue(); + rStrm.WriteUChar( (sal_uInt8) GetValue() ); return rStrm; } @@ -2381,8 +2381,8 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion* else if( DFLT_ESC_AUTO_SUB == _nEsc ) _nEsc = DFLT_ESC_SUB; } - rStrm << (sal_uInt8) GetProp() - << (short) _nEsc; + rStrm.WriteUChar( (sal_uInt8) GetProp() ) + .WriteInt16( (short) _nEsc ); return rStrm; } @@ -2555,7 +2555,7 @@ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt16) GetValue(); + rStrm.WriteUInt16( (sal_uInt16) GetValue() ); return rStrm; } @@ -2655,7 +2655,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Bool)GetValue(); + rStrm.WriteUChar( (sal_Bool)GetValue() ); return rStrm; } @@ -2700,7 +2700,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_Bool) GetValue(); + rStrm.WriteUChar( (sal_Bool) GetValue() ); return rStrm; } @@ -2788,7 +2788,7 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt8) GetValue(); + rStrm.WriteUChar( (sal_uInt8) GetValue() ); return rStrm; } @@ -2851,7 +2851,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt16)GetValue(); + rStrm.WriteUInt16( (sal_uInt16)GetValue() ); return rStrm; } @@ -3108,7 +3108,7 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) con SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const { - rStrm << GetValue() << GetStartBracket() << GetEndBracket(); + rStrm.WriteUChar( GetValue() ).WriteUInt16( GetStartBracket() ).WriteUInt16( GetEndBracket() ); return rStrm; } @@ -3150,7 +3150,7 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const { sal_Bool bFlag = IsFitToLine(); - rStrm << GetValue() << bFlag; + rStrm.WriteUInt16( GetValue() ).WriteUChar( bFlag ); return rStrm; } @@ -3288,10 +3288,10 @@ SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, sal_uInt16 nVer ) con { // see comment in Create().... rRet.SeekRel( -1*(long)sizeof(sal_uInt16) ); - rRet << (sal_uInt16)0; - rRet << GetValue(); + rRet.WriteUInt16( (sal_uInt16)0 ); + rRet.WriteUInt16( GetValue() ); // Really ugly, but not a problem for reading the doc in 5.2 - rRet << (sal_uInt16)0x1234; + rRet.WriteUInt16( (sal_uInt16)0x1234 ); } return rRet; } @@ -3378,7 +3378,7 @@ SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const { sal_uInt16 nVal = GetValue(); - rStrm << nVal; + rStrm.WriteUInt16( nVal ); return rStrm; } diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 95134df24eb3..9ad00111762d 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -603,25 +603,25 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) aConverter.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); // write bitmap stream header - aConverter << 'B' << 'M'; - aConverter << (sal_uInt32) 0; - aConverter << (sal_uInt32) 0; - aConverter << (sal_uInt32) 60; + aConverter.WriteChar( 'B' ).WriteChar( 'M' ); + aConverter.WriteUInt32( (sal_uInt32) 0 ); + aConverter.WriteUInt32( (sal_uInt32) 0 ); + aConverter.WriteUInt32( (sal_uInt32) 60 ); // write BITMAPINFOHEADER - aConverter << (sal_uInt32)40; - aConverter << (sal_uInt32)0; // fill in width later - aConverter << (sal_uInt32)0; // fill in height later - aConverter << (sal_uInt16)1; + aConverter.WriteUInt32( (sal_uInt32)40 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); // fill in width later + aConverter.WriteUInt32( (sal_uInt32)0 ); // fill in height later + aConverter.WriteUInt16( (sal_uInt16)1 ); // create header for 24 bits // correct later if necessary - aConverter << (sal_uInt16)24; - aConverter << (sal_uInt32)0; - aConverter << (sal_uInt32)0; - aConverter << (sal_uInt32)0; - aConverter << (sal_uInt32)0; - aConverter << (sal_uInt32)0; - aConverter << (sal_uInt32)0; + aConverter.WriteUInt16( (sal_uInt16)24 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); for( nStream=0; nStream < 3 && bSuccess ; nStream++ ) { @@ -762,11 +762,11 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) #endif aConverter.Seek( 18 ); - aConverter << (sal_uInt32)nWidth; - aConverter << (sal_uInt32)nHeight; + aConverter.WriteUInt32( (sal_uInt32)nWidth ); + aConverter.WriteUInt32( (sal_uInt32)nHeight ); aConverter.Seek( 38 ); - aConverter << (sal_uInt32)(1000*nWidth/nWidthMM); - aConverter << (sal_uInt32)(1000*nHeight/nHeightMM); + aConverter.WriteUInt32( (sal_uInt32)(1000*nWidth/nWidthMM) ); + aConverter.WriteUInt32( (sal_uInt32)(1000*nHeight/nHeightMM) ); bWidthSet = sal_True; } aConverter.Seek(60); @@ -774,31 +774,31 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) if( eType == FrameStyle_BW ) { aConverter.Seek( 10 ); - aConverter << (sal_uInt32)64; + aConverter.WriteUInt32( (sal_uInt32)64 ); aConverter.Seek( 28 ); - aConverter << (sal_uInt16) 1; + aConverter.WriteUInt16( (sal_uInt16) 1 ); aConverter.Seek( 54 ); // write color table - aConverter << (sal_uInt16)0xffff; - aConverter << (sal_uInt8)0xff; - aConverter << (sal_uInt8)0; - aConverter << (sal_uInt32)0; + aConverter.WriteUInt16( (sal_uInt16)0xffff ); + aConverter.WriteUChar( (sal_uInt8)0xff ); + aConverter.WriteUChar( (sal_uInt8)0 ); + aConverter.WriteUInt32( (sal_uInt32)0 ); aConverter.Seek( 64 ); } else if( eType == FrameStyle_Gray ) { aConverter.Seek( 10 ); - aConverter << (sal_uInt32)1084; + aConverter.WriteUInt32( (sal_uInt32)1084 ); aConverter.Seek( 28 ); - aConverter << (sal_uInt16) 8; + aConverter.WriteUInt16( (sal_uInt16) 8 ); aConverter.Seek( 54 ); // write color table for( nLine = 0; nLine < 256; nLine++ ) { - aConverter << (sal_uInt8)nLine; - aConverter << (sal_uInt8)nLine; - aConverter << (sal_uInt8)nLine; - aConverter << (sal_uInt8)0; + aConverter.WriteUChar( (sal_uInt8)nLine ); + aConverter.WriteUChar( (sal_uInt8)nLine ); + aConverter.WriteUChar( (sal_uInt8)nLine ); + aConverter.WriteUChar( (sal_uInt8)0 ); } aConverter.Seek( 1084 ); } @@ -823,7 +823,7 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) for( i = 0; i < (aParams.pixels_per_line); i++ ) { sal_uInt8 nGray = _ReadValue( pFrame, aParams.depth ); - aConverter << nGray; + aConverter.WriteUChar( nGray ); } } else if( eType == FrameStyle_RGB ) @@ -834,9 +834,9 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) nRed = _ReadValue( pFrame, aParams.depth ); nGreen = _ReadValue( pFrame, aParams.depth ); nBlue = _ReadValue( pFrame, aParams.depth ); - aConverter << nBlue; - aConverter << nGreen; - aConverter << nRed; + aConverter.WriteUChar( nBlue ); + aConverter.WriteUChar( nGreen ); + aConverter.WriteUChar( nRed ); } } else if( eType == FrameStyle_Separated ) @@ -848,15 +848,15 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) { case SANE_FRAME_RED: aConverter.SeekRel( 2 ); - aConverter << nValue; + aConverter.WriteUChar( nValue ); break; case SANE_FRAME_GREEN: aConverter.SeekRel( 1 ); - aConverter << nValue; + aConverter.WriteUChar( nValue ); aConverter.SeekRel( 1 ); break; case SANE_FRAME_BLUE: - aConverter << nValue; + aConverter.WriteUChar( nValue ); aConverter.SeekRel( 2 ); break; case SANE_FRAME_GRAY: @@ -881,7 +881,7 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap ) int nPos = aConverter.Tell(); aConverter.Seek( 2 ); - aConverter << (sal_uInt32) nPos+1; + aConverter.WriteUInt32( (sal_uInt32) nPos+1 ); aConverter.Seek( 0 ); rBitmap.unlock(); diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 073ae56b1d87..0a6e562739e9 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -150,7 +150,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream ) } // Endtag - *mpMovieStream << (sal_uInt16)0; + mpMovieStream->WriteUInt16( (sal_uInt16)0 ); Tag aHeader( 0xff ); @@ -161,7 +161,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream ) sal_uInt32 nSizePos = aHeader.Tell(); - aHeader << (sal_uInt32)0; + aHeader.WriteUInt32( (sal_uInt32)0 ); Rectangle aDocRect( 0, 0, static_cast<long>(mnDocWidth*mnDocXScale), static_cast<long>(mnDocHeight*mnDocYScale) ); @@ -176,7 +176,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream ) const sal_uInt32 nSize = aHeader.Tell() + mpFontsStream->Tell() + mpMovieStream->Tell(); aHeader.Seek( nSizePos ); - aHeader << (sal_uInt32)nSize; + aHeader.WriteUInt32( (sal_uInt32)nSize ); ImplCopySvStreamToXOutputStream( aHeader, xOutStream ); ImplCopySvStreamToXOutputStream( *mpFontsStream, xOutStream ); diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 766b02a34025..d8d21f05c074 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -121,7 +121,7 @@ void BitStream::writeTo( SvStream& out ) const vector< sal_uInt8>::iterator aEnd( maData.end() ); while(aIter != aEnd) { - out << (*aIter++); + out.WriteUChar( (*aIter++) ); } } @@ -153,20 +153,20 @@ void Tag::write( SvStream &out ) sal_uInt16 nCode = ( mnTagId << 6 ) | ( bLarge ? 0x3f : _uInt16(nSz) ); - out << (sal_uInt8)nCode; - out << (sal_uInt8)(nCode >> 8); + out.WriteUChar( (sal_uInt8)nCode ); + out.WriteUChar( (sal_uInt8)(nCode >> 8) ); if( bLarge ) { sal_uInt32 nTmp = nSz; - out << (sal_uInt8)nTmp; + out.WriteUChar( (sal_uInt8)nTmp ); nTmp >>= 8; - out << (sal_uInt8)nTmp; + out.WriteUChar( (sal_uInt8)nTmp ); nTmp >>= 8; - out << (sal_uInt8)nTmp; + out.WriteUChar( (sal_uInt8)nTmp ); nTmp >>= 8; - out << (sal_uInt8)nTmp; + out.WriteUChar( (sal_uInt8)nTmp ); } } @@ -184,7 +184,7 @@ void Tag::addI32( sal_Int32 nValue ) void Tag::addUI32( sal_uInt32 nValue ) { - *this << nValue; + WriteUInt32( nValue ); } #if 0 // ----------------------------------------------------------------------------- @@ -198,15 +198,15 @@ void Tag::addI16( sal_Int16 nValue ) void Tag::addUI16( sal_uInt16 nValue ) { - *this << (sal_uInt8)nValue; - *this << (sal_uInt8)(nValue >> 8); + WriteUChar( (sal_uInt8)nValue ); + WriteUChar( (sal_uInt8)(nValue >> 8) ); } // ----------------------------------------------------------------------------- void Tag::addUI8( sal_uInt8 nValue ) { - *this << (sal_uInt8)nValue; + WriteUChar( (sal_uInt8)nValue ); } // ----------------------------------------------------------------------------- diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 74b82a6daf97..946968e177b4 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -307,18 +307,18 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize ) const sal_uInt8 cFlags = 128 | ( 7 << 4 ); // write values - m_rGIF << nWidth; - m_rGIF << nHeight; - m_rGIF << cFlags; - m_rGIF << (sal_uInt8) 0x00; - m_rGIF << (sal_uInt8) 0x00; + m_rGIF.WriteUInt16( nWidth ); + m_rGIF.WriteUInt16( nHeight ); + m_rGIF.WriteUChar( cFlags ); + m_rGIF.WriteUChar( (sal_uInt8) 0x00 ); + m_rGIF.WriteUChar( (sal_uInt8) 0x00 ); // write dummy palette with two entries (black/white); // we do this only because of a bug in Photoshop, since those can't // read pictures without a global color palette - m_rGIF << (sal_uInt16) 0; - m_rGIF << (sal_uInt16) 255; - m_rGIF << (sal_uInt16) 65535; + m_rGIF.WriteUInt16( (sal_uInt16) 0 ); + m_rGIF.WriteUInt16( (sal_uInt16) 255 ); + m_rGIF.WriteUInt16( (sal_uInt16) 65535 ); if( m_rGIF.GetError() ) bStatus = sal_False; @@ -346,15 +346,15 @@ void GIFWriter::WriteLoopExtension( const Animation& rAnimation ) const sal_uInt8 cLoByte = (const sal_uInt8) nLoopCount; const sal_uInt8 cHiByte = (const sal_uInt8) ( nLoopCount >> 8 ); - m_rGIF << (sal_uInt8) 0x21; - m_rGIF << (sal_uInt8) 0xff; - m_rGIF << (sal_uInt8) 0x0b; + m_rGIF.WriteUChar( (sal_uInt8) 0x21 ); + m_rGIF.WriteUChar( (sal_uInt8) 0xff ); + m_rGIF.WriteUChar( (sal_uInt8) 0x0b ); m_rGIF.Write( "NETSCAPE2.0", 11 ); - m_rGIF << (sal_uInt8) 0x03; - m_rGIF << (sal_uInt8) 0x01; - m_rGIF << cLoByte; - m_rGIF << cHiByte; - m_rGIF << (sal_uInt8) 0x00; + m_rGIF.WriteUChar( (sal_uInt8) 0x03 ); + m_rGIF.WriteUChar( (sal_uInt8) 0x01 ); + m_rGIF.WriteUChar( cLoByte ); + m_rGIF.WriteUChar( cHiByte ); + m_rGIF.WriteUChar( (sal_uInt8) 0x00 ); } } @@ -365,15 +365,15 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 ) // writer PrefSize in 100th-mm as ApplicationExtension if( rSize100.Width() && rSize100.Height() ) { - m_rGIF << (sal_uInt8) 0x21; - m_rGIF << (sal_uInt8) 0xff; - m_rGIF << (sal_uInt8) 0x0b; + m_rGIF.WriteUChar( (sal_uInt8) 0x21 ); + m_rGIF.WriteUChar( (sal_uInt8) 0xff ); + m_rGIF.WriteUChar( (sal_uInt8) 0x0b ); m_rGIF.Write( "STARDIV 5.0", 11 ); - m_rGIF << (sal_uInt8) 0x09; - m_rGIF << (sal_uInt8) 0x01; - m_rGIF << (sal_uInt32) rSize100.Width(); - m_rGIF << (sal_uInt32) rSize100.Height(); - m_rGIF << (sal_uInt8) 0x00; + m_rGIF.WriteUChar( (sal_uInt8) 0x09 ); + m_rGIF.WriteUChar( (sal_uInt8) 0x01 ); + m_rGIF.WriteUInt32( (sal_uInt32) rSize100.Width() ); + m_rGIF.WriteUInt32( (sal_uInt32) rSize100.Height() ); + m_rGIF.WriteUChar( (sal_uInt8) 0x00 ); } } @@ -396,13 +396,13 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal ) else if( eDisposal == DISPOSE_PREVIOUS ) cFlags |= ( 3 << 2 ); - m_rGIF << (sal_uInt8) 0x21; - m_rGIF << (sal_uInt8) 0xf9; - m_rGIF << (sal_uInt8) 0x04; - m_rGIF << cFlags; - m_rGIF << nDelay; - m_rGIF << (sal_uInt8) m_pAcc->GetBestPaletteIndex( BMP_COL_TRANS ); - m_rGIF << (sal_uInt8) 0x00; + m_rGIF.WriteUChar( (sal_uInt8) 0x21 ); + m_rGIF.WriteUChar( (sal_uInt8) 0xf9 ); + m_rGIF.WriteUChar( (sal_uInt8) 0x04 ); + m_rGIF.WriteUChar( cFlags ); + m_rGIF.WriteUInt16( nDelay ); + m_rGIF.WriteUChar( (sal_uInt8) m_pAcc->GetBestPaletteIndex( BMP_COL_TRANS ) ); + m_rGIF.WriteUChar( (sal_uInt8) 0x00 ); if( m_rGIF.GetError() ) bStatus = sal_False; @@ -429,12 +429,12 @@ void GIFWriter::WriteLocalHeader() cFlags |= 0x80; // alles rausschreiben - m_rGIF << (sal_uInt8) 0x2c; - m_rGIF << nPosX; - m_rGIF << nPosY; - m_rGIF << nWidth; - m_rGIF << nHeight; - m_rGIF << cFlags; + m_rGIF.WriteUChar( (sal_uInt8) 0x2c ); + m_rGIF.WriteUInt16( nPosX ); + m_rGIF.WriteUInt16( nPosY ); + m_rGIF.WriteUInt16( nWidth ); + m_rGIF.WriteUInt16( nHeight ); + m_rGIF.WriteUChar( cFlags ); if( m_rGIF.GetError() ) bStatus = sal_False; @@ -454,9 +454,9 @@ void GIFWriter::WritePalette() { const BitmapColor& rColor = m_pAcc->GetPaletteColor( i ); - m_rGIF << rColor.GetRed(); - m_rGIF << rColor.GetGreen(); - m_rGIF << rColor.GetBlue(); + m_rGIF.WriteUChar( rColor.GetRed() ); + m_rGIF.WriteUChar( rColor.GetGreen() ); + m_rGIF.WriteUChar( rColor.GetBlue() ); } // fill up the rest with 0 @@ -549,7 +549,7 @@ void GIFWriter::WriteTerminator() { if( bStatus ) { - m_rGIF << (sal_uInt8) 0x3b; + m_rGIF.WriteUChar( (sal_uInt8) 0x3b ); if( m_rGIF.GetError() ) bStatus = sal_False; diff --git a/filter/source/graphicfilter/egif/giflzwc.cxx b/filter/source/graphicfilter/egif/giflzwc.cxx index dcc1533640d5..57b5efd6fdba 100644 --- a/filter/source/graphicfilter/egif/giflzwc.cxx +++ b/filter/source/graphicfilter/egif/giflzwc.cxx @@ -81,7 +81,7 @@ GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 n nBlockBufSize = 0; nBitsBufSize = 0; nBitsBuf = 0; - rStream << nLZWDataSize; + rStream.WriteUChar( nLZWDataSize ); } // ------------------------------------------------------------------------ @@ -92,7 +92,7 @@ GIFImageDataOutputStream::~GIFImageDataOutputStream() WriteBits(0,7); FlushBitsBufsFullBytes(); FlushBlockBuf(); - rStream << (sal_uInt8)0; + rStream.WriteUChar( (sal_uInt8)0 ); delete[] pBlockBuf; } @@ -102,7 +102,7 @@ void GIFImageDataOutputStream::FlushBlockBuf() { if( nBlockBufSize ) { - rStream << (sal_uInt8) nBlockBufSize; + rStream.WriteUChar( (sal_uInt8) nBlockBufSize ); rStream.Write( pBlockBuf,nBlockBufSize ); nBlockBufSize = 0; } diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index e48c370d5e19..ff2f3e74e01b 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -282,8 +282,8 @@ void METWriter::WriteClipRect( const Rectangle& rRect ) METEndPath(); } WillWriteOrder(8); - *pMET << (sal_uInt8)0xb4 << (sal_uInt8)6 - << (sal_uInt8)0x00 << (sal_uInt8)0 << nPathId; + pMET->WriteUChar( (sal_uInt8)0xb4 ).WriteUChar( (sal_uInt8)6 ) + .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0 ).WriteUInt32( nPathId ); } void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF) @@ -323,7 +323,7 @@ void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF) void METWriter::WriteBigEndianShort(sal_uInt16 nWord) { - *pMET << ((sal_uInt8)(nWord>>8)) << ((sal_uInt8)(nWord&0x00ff)); + pMET->WriteUChar( (sal_uInt8)(nWord>>8) ).WriteUChar( (sal_uInt8)(nWord&0x00ff) ); } @@ -338,8 +338,8 @@ void METWriter::WritePoint(Point aPt) { Point aNewPt = pCompDev->LogicToLogic( aPt, aPictureMapMode, aTargetMapMode ); - *pMET << (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) - << (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ); + pMET->WriteInt32( (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) ) + .WriteInt32( (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ) ); } @@ -348,7 +348,7 @@ void METWriter::WriteFieldIntroducer(sal_uInt16 nFieldSize, sal_uInt16 nFieldTyp { nActualFieldStartPos=pMET->Tell(); WriteBigEndianShort(nFieldSize); - *pMET << (sal_uInt8)0xd3 << nFieldType << nFlags << nSegSeqNum; + pMET->WriteUChar( (sal_uInt8)0xd3 ).WriteUInt16( nFieldType ).WriteUChar( nFlags ).WriteUInt16( nSegSeqNum ); } @@ -370,7 +370,7 @@ void METWriter::WriteFieldId(sal_uLong nId) for (i=1; i<=8; i++) { nbyte= '0' + (sal_uInt8)((nId >> (32-i*4)) & 0x0f); - *pMET << nbyte; + pMET->WriteUChar( nbyte ); } } @@ -445,13 +445,13 @@ void METWriter::WriteChrSets() WriteBigEndianShort(0x0050); - *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0xa4 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x01; - *pMET << (sal_uInt8)0x01 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0xa4 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x01 ); + pMET->WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); - *pMET << (sal_uInt8)0x04 << (sal_uInt8)0x24 << (sal_uInt8)0x05 << (sal_uInt8)pCS->nSet; + pMET->WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)pCS->nSet ); - *pMET << (sal_uInt8)0x14 << (sal_uInt8)0x1f; + pMET->WriteUChar( (sal_uInt8)0x14 ).WriteUChar( (sal_uInt8)0x1f ); switch (pCS->eWeight) { case WEIGHT_THIN: nbyte=1; break; @@ -465,24 +465,24 @@ void METWriter::WriteChrSets() case WEIGHT_BLACK: nbyte=9; break; default: nbyte=5; } - *pMET << nbyte; - *pMET << (sal_uInt8)0x05; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x0c; + pMET->WriteUChar( nbyte ); + pMET->WriteUChar( (sal_uInt8)0x05 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x0c ); - *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x20 << (sal_uInt8)0x03 << (sal_uInt8)0xd4; - *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x52; + pMET->WriteUChar( (sal_uInt8)0x06 ).WriteUChar( (sal_uInt8)0x20 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0xd4 ); + pMET->WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x52 ); - *pMET << (sal_uInt8)0x24 << (sal_uInt8)0x02 << (sal_uInt8)0x08 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x00 ); OString n(OUStringToOString(pCS->aName, osl_getThreadTextEncoding())); for (i=0; i<32; i++) { if ( i == 0 || c != 0 ) c = n[i]; - *pMET << c; + pMET->WriteChar( c ); } } } @@ -500,7 +500,7 @@ void METWriter::WriteColorAttributeTable(sal_uLong nFieldId, BitmapPalette* pPal //--- The Field 'Color Attribute Table': WriteFieldIntroducer(0,BlkColAtrMagic,0,0); - *pMET << nBasePartFlags << (sal_uInt8)0x00 << nBasePartLCTID; // 'Base Part' + pMET->WriteUChar( nBasePartFlags ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( nBasePartLCTID ); // 'Base Part' if (pPalette!=NULL) { nIndex=0; @@ -508,18 +508,18 @@ void METWriter::WriteColorAttributeTable(sal_uLong nFieldId, BitmapPalette* pPal { nNumI=pPalette->GetEntryCount()-nIndex; if (nNumI>81) nNumI=81; - *pMET << (sal_uInt8)(11+nNumI*3); // length of the parameter - *pMET << (sal_uInt8)1 << (sal_uInt8)0 << (sal_uInt8)1; // typ: element list, Reserved, Format: RGB - *pMET << (sal_uInt8)0; WriteBigEndianShort(nIndex); // start-Index (3 Bytes) - *pMET << (sal_uInt8)8 << (sal_uInt8)8 << (sal_uInt8)8; // Bits per component R,G,B - *pMET << (sal_uInt8)3; // number of bytes per entry + pMET->WriteUChar( (sal_uInt8)(11+nNumI*3) ); // length of the parameter + pMET->WriteUChar( (sal_uInt8)1 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)1 ); // typ: element list, Reserved, Format: RGB + pMET->WriteUChar( (sal_uInt8)0 ); WriteBigEndianShort(nIndex); // start-Index (3 Bytes) + pMET->WriteUChar( (sal_uInt8)8 ).WriteUChar( (sal_uInt8)8 ).WriteUChar( (sal_uInt8)8 ); // Bits per component R,G,B + pMET->WriteUChar( (sal_uInt8)3 ); // number of bytes per entry for (i=0; i<nNumI; i++) { const BitmapColor& rCol = (*pPalette)[ nIndex ]; - *pMET << (sal_uInt8) rCol.GetRed(); - *pMET << (sal_uInt8) rCol.GetGreen(); - *pMET << (sal_uInt8) rCol.GetBlue(); + pMET->WriteUChar( (sal_uInt8) rCol.GetRed() ); + pMET->WriteUChar( (sal_uInt8) rCol.GetGreen() ); + pMET->WriteUChar( (sal_uInt8) rCol.GetBlue() ); nIndex++; } } @@ -527,8 +527,8 @@ void METWriter::WriteColorAttributeTable(sal_uLong nFieldId, BitmapPalette* pPal else { // 'Trible Generating' - *pMET << (sal_uInt8)0x0a << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x01 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x08 << (sal_uInt8)0x08 << (sal_uInt8)0x08; + pMET->WriteUChar( (sal_uInt8)0x0a ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x08 ); } UpdateFieldSize(); @@ -606,9 +606,9 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) //--- The Field 'Map Color Attribute Table': WriteFieldIntroducer(26,MapColAtrMagic,0,0); WriteBigEndianShort(0x0012); - *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 ); WriteFieldId(nActColMapId); - *pMET << (sal_uInt8)0x04 << (sal_uInt8)0x24 << (sal_uInt8)0x07 << (sal_uInt8)0x01; + pMET->WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x01 ); //--- The Field 'End Object Environment Group': WriteFieldIntroducer(16,EndObjEnvMagic,0,0); @@ -617,7 +617,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) //--- The Field 'Image Data Descriptor': WriteFieldIntroducer(17,DscImgObjMagic,0,0); - *pMET << (sal_uInt8)0x01; // Unit of measure: tens of centimeters + pMET->WriteUChar( (sal_uInt8)0x01 ); // Unit of measure: tens of centimeters WriteBigEndianShort((sal_uInt16)nResX); WriteBigEndianShort((sal_uInt16)nResY); WriteBigEndianShort((sal_uInt16)nWidth); @@ -627,32 +627,32 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) WriteFieldIntroducer(0,DatImgObjMagic,0,0); // Begin Segment: - *pMET << (sal_uInt8)0x70 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x70 ).WriteUChar( (sal_uInt8)0x00 ); // Begin Image Content: - *pMET << (sal_uInt8)0x91 << (sal_uInt8)0x01 << (sal_uInt8)0xff; + pMET->WriteUChar( (sal_uInt8)0x91 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0xff ); // Image Size: - *pMET << (sal_uInt8)0x94 << (sal_uInt8)0x09 << (sal_uInt8)0x02; - *pMET << (sal_uInt16) 0 << (sal_uInt16) 0; + pMET->WriteUChar( (sal_uInt8)0x94 ).WriteUChar( (sal_uInt8)0x09 ).WriteUChar( (sal_uInt8)0x02 ); + pMET->WriteUInt16( (sal_uInt16) 0 ).WriteUInt16( (sal_uInt16) 0 ); WriteBigEndianShort((sal_uInt16)nHeight); WriteBigEndianShort((sal_uInt16)nWidth); // Image Encoding: - *pMET << (sal_uInt8)0x95 << (sal_uInt8)0x02 << (sal_uInt8)0x03 << (sal_uInt8)0x03; + pMET->WriteUChar( (sal_uInt8)0x95 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x03 ); // Image IDE-Size: - *pMET << (sal_uInt8)0x96 << (sal_uInt8)0x01 << (sal_uInt8)nBitsPerPixel; + pMET->WriteUChar( (sal_uInt8)0x96 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)nBitsPerPixel ); if (nBitsPerPixel<=8) { // Image LUT-ID - *pMET << (sal_uInt8)0x97 << (sal_uInt8)0x01 << (sal_uInt8)0x01; + pMET->WriteUChar( (sal_uInt8)0x97 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x01 ); } else { // IDE Structure - *pMET << (sal_uInt8)0x9b << (sal_uInt8)0x08 << (sal_uInt8)0x00 << (sal_uInt8)0x01; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x08; - *pMET << (sal_uInt8)0x08 << (sal_uInt8)0x08; + pMET->WriteUChar( (sal_uInt8)0x9b ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x01 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x08 ); + pMET->WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x08 ); } pBuf=new sal_uInt8[nBytesPerLine]; @@ -689,10 +689,10 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap) delete[] pBuf; // End Image Content: - *pMET << (sal_uInt8)0x93 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x93 ).WriteUChar( (sal_uInt8)0x00 ); // End Segment: - *pMET << (sal_uInt8)0x71 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x71 ).WriteUChar( (sal_uInt8)0x00 ); // finalize the last field 'Image Picture Data': UpdateFieldSize(); @@ -819,9 +819,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // 8 Coordinate types in data // 0x04Intel16 // 0x05Intel32 - *pMET << (sal_uInt8)0xf7 << (sal_uInt8)0x07 << (sal_uInt8)0xb0 << (sal_uInt8)0x00 - << (sal_uInt8)0x00 << (sal_uInt8)0x23 << (sal_uInt8)0x01 << (sal_uInt8)0x01 - << (sal_uInt8)0x05; + pMET->WriteUChar( (sal_uInt8)0xf7 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0xb0 ).WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x23 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x01 ) + .WriteUChar( (sal_uInt8)0x05 ); // 0 0xF6 Set Picture Descriptor // 1 Length of following data @@ -851,14 +851,14 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // GPS Y bottom, Y top // GPS Z near, Z far Size aUnitsPerDecimeter=OutputDevice::LogicToLogic(Size(10,10),MapMode(MAP_CM),aPictureMapMode); - *pMET << (sal_uInt8)0xf6 << (sal_uInt8)0x28 << (sal_uInt8)0x40 << (sal_uInt8)0x00 - << (sal_uInt8)0x05 << (sal_uInt8)0x01 - << (sal_uInt32)(aUnitsPerDecimeter.Width()) - << (sal_uInt32)(aUnitsPerDecimeter.Height()) - << (sal_uInt32)0 - << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetWidth() - << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetHeight() - << (sal_uInt32)0 << (sal_uInt32)0; + pMET->WriteUChar( (sal_uInt8)0xf6 ).WriteUChar( (sal_uInt8)0x28 ).WriteUChar( (sal_uInt8)0x40 ).WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)0x01 ) + .WriteUInt32( (sal_uInt32)(aUnitsPerDecimeter.Width()) ) + .WriteUInt32( (sal_uInt32)(aUnitsPerDecimeter.Height()) ) + .WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)aPictureRect.GetWidth() ) + .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)aPictureRect.GetHeight() ) + .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); // 0 0x21 Set Current Defaults // 1 Length of following data @@ -873,9 +873,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // 8 Geometrics // 0x04 Intel16 // 0x05 Intel32 - *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x07 << (sal_uInt8)0x08 << (sal_uInt8)0xe0 - << (sal_uInt8)0x00 << (sal_uInt8)0x8f << (sal_uInt8)0x00 << (sal_uInt8)0x05 - << (sal_uInt8)0x05; + pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0xe0 ) + .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x8f ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x05 ) + .WriteUChar( (sal_uInt8)0x05 ); // 0 0x21 Set Current Defaults // 1 Length of following data @@ -883,10 +883,10 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // 3-4 Mask 0xCC0C // 5 Names 0x8F // 6-n M11, M12, M21, M22, M41, M42 Matrix elements - *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x1c << (sal_uInt8)0x07 << (sal_uInt8)0xcc - << (sal_uInt8)0x0c << (sal_uInt8)0x8f - << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000 - << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000; + pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x1c ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0xcc ) + .WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x8f ) + .WriteUInt32( (sal_uInt32)0x00010000 ).WriteUInt32( (sal_uInt32)0x00000000 ).WriteUInt32( (sal_uInt32)0x00000000 ) + .WriteUInt32( (sal_uInt32)0x00010000 ).WriteUInt32( (sal_uInt32)0x00000000 ).WriteUInt32( (sal_uInt32)0x00000000 ); // 0 0x21 Set Current Defaults // 1 Length of following data @@ -955,11 +955,11 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // (1 byte) - Character mix // (1 byte) - Character background mix (G=2 or 4 depending on the Geometrics // parameter of Set Default Parameter Format) - *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x10 << (sal_uInt8)0x02 << (sal_uInt8)0x40 - << (sal_uInt8)0x00 << (sal_uInt8)0x8f - << (sal_uInt8)0xaa << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00 - << (sal_uInt8)0x44 << (sal_uInt8)0x04 << (sal_uInt8)0x00 << (sal_uInt8)0x00 - << (sal_uInt8)0xa8 << (sal_uInt8)0xaa << (sal_uInt8)0x40 << (sal_uInt8)0x44; + pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x10 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x40 ) + .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x8f ) + .WriteUChar( (sal_uInt8)0xaa ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0x44 ).WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0xa8 ).WriteUChar( (sal_uInt8)0xaa ).WriteUChar( (sal_uInt8)0x40 ).WriteUChar( (sal_uInt8)0x44 ); // 0 0x21 Set Current Defaults // 1 Length of following data @@ -989,10 +989,10 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // (1 byte) - Marker mix // (1 byte) - Marker background mix (G=2 or 4 depending on the Geometrics // parameter of Set Default Parameter Format) - *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x0c << (sal_uInt8)0x03 << (sal_uInt8)0x40 - << (sal_uInt8)0x00 << (sal_uInt8)0x8f - << (sal_uInt8)0x66 << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00 - << (sal_uInt8)0x66 << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x40 ) + .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x8f ) + .WriteUChar( (sal_uInt8)0x66 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ) + .WriteUChar( (sal_uInt8)0x66 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); // 0 0x21 Set Current Defaults // 1 Length of following data @@ -1101,9 +1101,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *) // 4-7 Bit-map handle // 8 Lcid if (nNumberOfBitmaps>0) { - *pMET << (sal_uInt8)0xe7 << (sal_uInt8)0x07 << (sal_uInt8)0x80 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0xe7 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x80 ).WriteUChar( (sal_uInt8)0x00 ); WriteBigEndianLong(nActBitmapId); - *pMET << (sal_uInt8)0xfe; + pMET->WriteUChar( (sal_uInt8)0xfe ); } UpdateFieldSize(); @@ -1132,14 +1132,14 @@ void METWriter::WillWriteOrder(sal_uLong nNextOrderMaximumLength) void METWriter::METBitBlt(Point aPt, Size aSize, const Size& rBmpSizePixel) { WillWriteOrder(46); - *pMET << (sal_uInt8)0xd6 << (sal_uInt8)44 << (sal_uInt16)0 << (sal_uInt16) 0x00cc; + pMET->WriteUChar( (sal_uInt8)0xd6 ).WriteUChar( (sal_uInt8)44 ).WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16) 0x00cc ); WriteBigEndianLong(nActBitmapId++); - *pMET << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); WritePoint(Point(aPt.X(),aPt.Y()+aSize.Height())); WritePoint(Point(aPt.X()+aSize.Width(),aPt.Y())); - *pMET << (sal_uInt32)0 << (sal_uInt32)0 - << (sal_uInt32)(rBmpSizePixel.Width()) - << (sal_uInt32)(rBmpSizePixel.Height()); + pMET->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)(rBmpSizePixel.Width()) ) + .WriteUInt32( (sal_uInt32)(rBmpSizePixel.Height()) ); } void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo ) @@ -1147,11 +1147,11 @@ void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo ) sal_Int32 nWidth = pCompDev->LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width(); WillWriteOrder( 8 ); // set stroke linewidth - *pMET << (sal_uInt8)0x15 - << (sal_uInt8)6 - << (sal_uInt8)0 // Flags - << (sal_uInt8)0 - << nWidth; + pMET ->WriteUChar( (sal_uInt8)0x15 ) + .WriteUChar( (sal_uInt8)6 ) + .WriteUChar( (sal_uInt8)0 ) // Flags + .WriteUChar( (sal_uInt8)0 ) + .WriteInt32( nWidth ); if ( rLineInfo.GetStyle() != LINE_SOLID ) { @@ -1181,83 +1181,83 @@ void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo ) break; // not handled -Wall } WillWriteOrder( 2 ); - *pMET << (sal_uInt8)0x18 << nStyle; // set LineType + pMET->WriteUChar( (sal_uInt8)0x18 ).WriteUChar( nStyle ); // set LineType } } void METWriter::METPopLineInfo( const LineInfo& rLineInfo ) { WillWriteOrder( 8 ); // set stroke linewidth - *pMET << (sal_uInt8)0x15 - << (sal_uInt8)6 - << (sal_uInt8)0 // Flags - << (sal_uInt8)0 - << (sal_uInt32)1; + pMET ->WriteUChar( (sal_uInt8)0x15 ) + .WriteUChar( (sal_uInt8)6 ) + .WriteUChar( (sal_uInt8)0 ) // Flags + .WriteUChar( (sal_uInt8)0 ) + .WriteUInt32( (sal_uInt32)1 ); if ( rLineInfo.GetStyle() != LINE_SOLID ) { WillWriteOrder( 2 ); - *pMET << (sal_uInt8)0x18 << (sal_uInt8)0; // set LineType + pMET->WriteUChar( (sal_uInt8)0x18 ).WriteUChar( (sal_uInt8)0 ); // set LineType } } void METWriter::METBeginArea(sal_Bool bBoundaryLine) { WillWriteOrder(2); - *pMET << (sal_uInt8)0x68; - if (bBoundaryLine) *pMET << (sal_uInt8)0xc0; - else *pMET << (sal_uInt8)0x80; + pMET->WriteUChar( (sal_uInt8)0x68 ); + if (bBoundaryLine) pMET->WriteUChar( (sal_uInt8)0xc0 ); + else pMET->WriteUChar( (sal_uInt8)0x80 ); } void METWriter::METEndArea() { WillWriteOrder(2); - *pMET << (sal_uInt8)0x60 << (sal_uInt8)0; + pMET->WriteUChar( (sal_uInt8)0x60 ).WriteUChar( (sal_uInt8)0 ); } void METWriter::METBeginPath(sal_uInt32 nPathId) { WillWriteOrder(8); - *pMET << (sal_uInt8)0xd0 << (sal_uInt8)6 << (sal_uInt16) 0 << nPathId; + pMET->WriteUChar( (sal_uInt8)0xd0 ).WriteUChar( (sal_uInt8)6 ).WriteUInt16( (sal_uInt16) 0 ).WriteUInt32( nPathId ); } void METWriter::METEndPath() { WillWriteOrder(2); - *pMET << (sal_uInt8)0x7f << (sal_uInt8)0; + pMET->WriteUChar( (sal_uInt8)0x7f ).WriteUChar( (sal_uInt8)0 ); } void METWriter::METFillPath(sal_uInt32 nPathId) { WillWriteOrder(8); - *pMET << (sal_uInt8)0xd7 << (sal_uInt8)6 - << (sal_uInt8)0x00 << (sal_uInt8)0 << nPathId; + pMET->WriteUChar( (sal_uInt8)0xd7 ).WriteUChar( (sal_uInt8)6 ) + .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0 ).WriteUInt32( nPathId ); } void METWriter::METOutlinePath(sal_uInt32 nPathId) { WillWriteOrder(8); - *pMET << (sal_uInt8)0xd4 << (sal_uInt8)6 - << (sal_uInt8)0 << (sal_uInt8)0 << nPathId; + pMET->WriteUChar( (sal_uInt8)0xd4 ).WriteUChar( (sal_uInt8)6 ) + .WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUInt32( nPathId ); } void METWriter::METCloseFigure() { WillWriteOrder(2); - *pMET << (sal_uInt8)0x7d << (sal_uInt8)0; + pMET->WriteUChar( (sal_uInt8)0x7d ).WriteUChar( (sal_uInt8)0 ); } void METWriter::METMove(Point aPt) { WillWriteOrder(10); - *pMET << (sal_uInt8)0x21 << (sal_uInt8)8; + pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)8 ); WritePoint(aPt); } @@ -1265,7 +1265,7 @@ void METWriter::METMove(Point aPt) void METWriter::METLine(Point aPt1, Point aPt2) { WillWriteOrder(18); - *pMET << (sal_uInt8)0xc1 << (sal_uInt8)16; + pMET->WriteUChar( (sal_uInt8)0xc1 ).WriteUChar( (sal_uInt8)16 ); WritePoint(aPt1); WritePoint(aPt2); } @@ -1282,13 +1282,13 @@ void METWriter::METLine(const Polygon & rPolygon) if (nOrderPoints>30) nOrderPoints=30; WillWriteOrder(nOrderPoints*8+2); if (bFirstOrder==sal_True) { - *pMET << (sal_uInt8)0xc1; // Line at given pos + pMET->WriteUChar( (sal_uInt8)0xc1 ); // Line at given pos bFirstOrder=sal_False; } else { - *pMET << (sal_uInt8)0x81; // Line at current pos + pMET->WriteUChar( (sal_uInt8)0x81 ); // Line at current pos } - *pMET << (sal_uInt8)(nOrderPoints*8); + pMET->WriteUChar( (sal_uInt8)(nOrderPoints*8) ); for (j=0; j<nOrderPoints; j++) WritePoint(rPolygon.GetPoint(i++)); } } @@ -1308,7 +1308,7 @@ void METWriter::METLine(const PolyPolygon & rPolyPolygon) void METWriter::METLineAtCurPos(Point aPt) { WillWriteOrder(10); - *pMET << (sal_uInt8)0x81 << (sal_uInt8)8; + pMET->WriteUChar( (sal_uInt8)0x81 ).WriteUChar( (sal_uInt8)8 ); WritePoint(aPt); } @@ -1321,19 +1321,19 @@ void METWriter::METBox(sal_Bool bFill, sal_Bool bBoundary, if (bBoundary) nFlags|=0x20; WillWriteOrder(28); - *pMET << (sal_uInt8)0xc0 << (sal_uInt8)26 << nFlags << (sal_uInt8)0; + pMET->WriteUChar( (sal_uInt8)0xc0 ).WriteUChar( (sal_uInt8)26 ).WriteUChar( nFlags ).WriteUChar( (sal_uInt8)0 ); WritePoint(aRect.BottomLeft()); WritePoint(aRect.TopRight()); - *pMET << nHAxis << nVAxis; + pMET->WriteUInt32( nHAxis ).WriteUInt32( nVAxis ); } void METWriter::METFullArc(Point aCenter, double fMultiplier) { WillWriteOrder(14); - *pMET << (sal_uInt8)0xc7 << (sal_uInt8)12; + pMET->WriteUChar( (sal_uInt8)0xc7 ).WriteUChar( (sal_uInt8)12 ); WritePoint(aCenter); - *pMET << (sal_Int32)(fMultiplier*65536.0+0.5); + pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) ); } @@ -1347,11 +1347,11 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, while (fSweepAngle>360.0) fSweepAngle-=360.0; while (fSweepAngle<.00) fSweepAngle+=360.0; WillWriteOrder(22); - *pMET << (sal_uInt8)0xa3 << (sal_uInt8)20; + pMET->WriteUChar( (sal_uInt8)0xa3 ).WriteUChar( (sal_uInt8)20 ); WritePoint(aCenter); - *pMET << (sal_Int32)(fMultiplier*65536.0+0.5); - *pMET << (sal_Int32)(fStartAngle*65536.0+0.5); - *pMET << (sal_Int32)(fSweepAngle*65536.0+0.5); + pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) ); + pMET->WriteInt32( (sal_Int32)(fStartAngle*65536.0+0.5) ); + pMET->WriteInt32( (sal_Int32)(fSweepAngle*65536.0+0.5) ); } @@ -1361,18 +1361,18 @@ void METWriter::METChrStr( Point aPt, OUString aUniStr ) osl_getThreadTextEncoding())); sal_uInt16 nLen = aStr.getLength(); WillWriteOrder( 11 + nLen ); - *pMET << (sal_uInt8)0xc3 << (sal_uInt8)( 9 + nLen ); + pMET->WriteUChar( (sal_uInt8)0xc3 ).WriteUChar( (sal_uInt8)( 9 + nLen ) ); WritePoint(aPt); for (sal_uInt16 i = 0; i < nLen; ++i) - *pMET << aStr[i]; - *pMET << (sal_uInt8)0; + pMET->WriteChar( aStr[i] ); + pMET->WriteUChar( (sal_uInt8)0 ); } void METWriter::METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS) { WillWriteOrder(18); - *pMET << (sal_uInt8)0x22 << (sal_uInt8)16 << nP << nQ << nR << nS; + pMET->WriteUChar( (sal_uInt8)0x22 ).WriteUChar( (sal_uInt8)16 ).WriteInt32( nP ).WriteInt32( nQ ).WriteInt32( nR ).WriteInt32( nS ); } @@ -1382,10 +1382,10 @@ void METWriter::METSetColor(Color aColor) aMETColor=aColor; WillWriteOrder(6); - *pMET << (sal_uInt8)0xa6 << (sal_uInt8)4 << (sal_uInt8)0 - << (sal_uInt8)(aColor.GetBlue()) - << (sal_uInt8)(aColor.GetGreen()) - << (sal_uInt8)(aColor.GetRed()); + pMET->WriteUChar( (sal_uInt8)0xa6 ).WriteUChar( (sal_uInt8)4 ).WriteUChar( (sal_uInt8)0 ) + .WriteUChar( (sal_uInt8)(aColor.GetBlue()) ) + .WriteUChar( (sal_uInt8)(aColor.GetGreen()) ) + .WriteUChar( (sal_uInt8)(aColor.GetRed()) ); } @@ -1395,10 +1395,10 @@ void METWriter::METSetBackgroundColor(Color aColor) aMETBackgroundColor=aColor; WillWriteOrder(6); - *pMET << (sal_uInt8)0xa7 << (sal_uInt8)4 << (sal_uInt8)0 - << (sal_uInt8)(aColor.GetBlue()) - << (sal_uInt8)(aColor.GetGreen()) - << (sal_uInt8)(aColor.GetRed()); + pMET->WriteUChar( (sal_uInt8)0xa7 ).WriteUChar( (sal_uInt8)4 ).WriteUChar( (sal_uInt8)0 ) + .WriteUChar( (sal_uInt8)(aColor.GetBlue()) ) + .WriteUChar( (sal_uInt8)(aColor.GetGreen()) ) + .WriteUChar( (sal_uInt8)(aColor.GetRed()) ); } void METWriter::METSetMix(RasterOp eROP) @@ -1418,7 +1418,7 @@ void METWriter::METSetMix(RasterOp eROP) } WillWriteOrder(2); - *pMET << (sal_uInt8)0x0c << nMix; + pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( nMix ); } @@ -1430,7 +1430,7 @@ void METWriter::METSetChrCellSize(Size aSize) aMETChrCellSize=aSize; WillWriteOrder(10); if (aSize.Width()==0) aSize.Width()=aSize.Height(); - *pMET << (sal_uInt8)0x33 << (sal_uInt8)8 << (sal_Int32)aSize.Width() << (sal_Int32)aSize.Height(); + pMET->WriteUChar( (sal_uInt8)0x33 ).WriteUChar( (sal_uInt8)8 ).WriteInt32( (sal_Int32)aSize.Width() ).WriteInt32( (sal_Int32)aSize.Height() ); } @@ -1454,7 +1454,7 @@ void METWriter::METSetChrAngle(short nAngle) } WillWriteOrder(10); - *pMET << (sal_uInt8)0x34 << (sal_uInt8)8 << nax << nay; + pMET->WriteUChar( (sal_uInt8)0x34 ).WriteUChar( (sal_uInt8)8 ).WriteInt32( nax ).WriteInt32( nay ); } @@ -1465,7 +1465,7 @@ void METWriter::METSetChrSet(sal_uInt8 nSet) nMETChrSet=nSet; WillWriteOrder(2); - *pMET << (sal_uInt8)0x38 << nSet; + pMET->WriteUChar( (sal_uInt8)0x38 ).WriteUChar( nSet ); } @@ -2331,18 +2331,18 @@ void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF) //--- The Field 'Map Color Attribute Table': WriteFieldIntroducer(22,MapColAtrMagic,0,0); WriteBigEndianShort(0x000e); - *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 ); WriteFieldId(4); //--- The first Field 'Map Coded Font': WriteFieldIntroducer(32,MapCodFntMagic,0,0); WriteBigEndianShort(0x0018); - *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0xff << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x04 << (sal_uInt8)0x24 << (sal_uInt8)0x05 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x20; - *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x97 << (sal_uInt8)0x01 << (sal_uInt8)0xb5; + pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0xff ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x06 ).WriteUChar( (sal_uInt8)0x20 ); + pMET->WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x97 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0xb5 ); //--- The additional Fields 'Map Coded Font': CreateChrSets(pMTF); @@ -2354,10 +2354,10 @@ void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF) { WriteFieldIntroducer(29,MapDatResMagic,0,0); WriteBigEndianShort(0x0015); - *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 ); WriteFieldId(nId); - *pMET << (sal_uInt8)0x07 << (sal_uInt8)0x22 << (sal_uInt8)0x10; - *pMET << (sal_uInt32)nId; + pMET->WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x22 ).WriteUChar( (sal_uInt8)0x10 ); + pMET->WriteUInt32( (sal_uInt32)nId ); nId++; } @@ -2395,11 +2395,11 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF) nNumberOfDataFields++; // now at first we write the head of the segment: - *pMET << (sal_uInt8)0x70 << (sal_uInt8)0x0e << (sal_uInt32)0; - *pMET << (sal_uInt8)0x70 << (sal_uInt8)0x10; // Flags - *pMET << (sal_uInt16)0; // Lo-Word of the length of the segment data (Big Endian) - *pMET << (sal_uInt32)0; // Reserved - *pMET << (sal_uInt16)0; // Hi-Word of the length of the segment (Big Endian) (Ohh Ohh OS2) + pMET->WriteUChar( (sal_uInt8)0x70 ).WriteUChar( (sal_uInt8)0x0e ).WriteUInt32( (sal_uInt32)0 ); + pMET->WriteUChar( (sal_uInt8)0x70 ).WriteUChar( (sal_uInt8)0x10 ); // Flags + pMET->WriteUInt16( (sal_uInt16)0 ); // Lo-Word of the length of the segment data (Big Endian) + pMET->WriteUInt32( (sal_uInt32)0 ); // Reserved + pMET->WriteUInt16( (sal_uInt16)0 ); // Hi-Word of the length of the segment (Big Endian) (Ohh Ohh OS2) // Annotation: we're writing the correct data length again below // now all orders are being written out: @@ -2462,10 +2462,10 @@ void METWriter::WriteDocument(const GDIMetaFile * pMTF) //--- The Field 'Begin Document': WriteFieldIntroducer(0,BegDocumnMagic,0,0); WriteFieldId(1); - *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x05 << (sal_uInt8)0x18 << (sal_uInt8)0x03 << (sal_uInt8)0x0c << (sal_uInt8)0x00; - *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x01 << (sal_uInt8)0x03 << (sal_uInt8)0xd4 << (sal_uInt8)0x03 << (sal_uInt8)0x52; - *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x65 << (sal_uInt8)0x00; + pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)0x18 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x00 ); + pMET->WriteUChar( (sal_uInt8)0x06 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0xd4 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x52 ); + pMET->WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x65 ).WriteUChar( (sal_uInt8)0x00 ); UpdateFieldSize(); //--- The Content: diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 7fc5743d23ed..f71ed0cad0d9 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -119,14 +119,14 @@ sal_Bool PBMWriter::ImplWriteHeader() if ( mnWidth && mnHeight ) { if ( mnMode == 0 ) - m_rOStm << "P4\x0a"; + m_rOStm.WriteCharPtr( "P4\x0a" ); else - m_rOStm << "P1\x0a"; + m_rOStm.WriteCharPtr( "P1\x0a" ); ImplWriteNumber( mnWidth ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( mnHeight ); - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } else mbStatus = sal_False; return mbStatus; @@ -148,10 +148,10 @@ void PBMWriter::ImplWriteBody() if (!(mpAcc->GetPixelIndex( y, x ) & 1 ) ) nBYTE++; if ( ( x & 7 ) == 7 ) - m_rOStm << nBYTE; + m_rOStm.WriteUChar( nBYTE ); } if ( ( x & 7 ) != 0 ) - m_rOStm << (sal_uInt8)( nBYTE << ( ( x ^ 7 ) + 1 ) ); + m_rOStm.WriteUChar( (sal_uInt8)( nBYTE << ( ( x ^ 7 ) + 1 ) ) ); } } else @@ -165,11 +165,11 @@ void PBMWriter::ImplWriteBody() if (!( --nxCount ) ) { nxCount = 69; - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } - m_rOStm << (sal_uInt8)( ( mpAcc->GetPixelIndex( y, x ) ^ 1 ) + '0' ) ; + m_rOStm.WriteUChar( (sal_uInt8)( ( mpAcc->GetPixelIndex( y, x ) ^ 1 ) + '0' ) ) ; } - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } } } @@ -180,7 +180,7 @@ void PBMWriter::ImplWriteBody() void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) { const OString aNum(OString::number(nNumber)); - m_rOStm << aNum.getStr(); + m_rOStm.WriteCharPtr( aNum.getStr() ); } // ------------------------------------------------------------------------ diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 40ee4c5066e7..3a61cf0b0dfe 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -120,16 +120,16 @@ sal_Bool PGMWriter::ImplWriteHeader() if ( mnWidth && mnHeight ) { if ( mnMode == 0 ) - m_rOStm << "P5\x0a"; + m_rOStm.WriteCharPtr( "P5\x0a" ); else - m_rOStm << "P2\x0a"; + m_rOStm.WriteCharPtr( "P2\x0a" ); ImplWriteNumber( mnWidth ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( mnHeight ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( 255 ); // max. gray value - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } else mbStatus = sal_False; @@ -147,7 +147,7 @@ void PGMWriter::ImplWriteBody() { for ( sal_uLong x = 0; x < mnWidth; x++ ) { - m_rOStm << mpAcc->GetPixelIndex( y, x ); + m_rOStm.WriteUChar( mpAcc->GetPixelIndex( y, x ) ); } } } @@ -162,18 +162,18 @@ void PGMWriter::ImplWriteBody() if ( nCount < 0 ) { nCount = 69; - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } nDat = mpAcc->GetPixelIndex( y, x ); nNumb = nDat / 100; if ( nNumb ) { - m_rOStm << (sal_uInt8)( nNumb + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nNumb + '0' ) ); nDat -= ( nNumb * 100 ); nNumb = nDat / 10; - m_rOStm << (sal_uInt8)( nNumb + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nNumb + '0' ) ); nDat -= ( nNumb * 10 ); - m_rOStm << (sal_uInt8)( nDat + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDat + '0' ) ); nCount -= 4; } else @@ -181,20 +181,20 @@ void PGMWriter::ImplWriteBody() nNumb = nDat / 10; if ( nNumb ) { - m_rOStm << (sal_uInt8)( nNumb + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nNumb + '0' ) ); nDat -= ( nNumb * 10 ); - m_rOStm << (sal_uInt8)( nDat + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDat + '0' ) ); nCount -= 3; } else { - m_rOStm << (sal_uInt8)( nDat + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDat + '0' ) ); nCount -= 2; } } - m_rOStm << (sal_uInt8)' '; + m_rOStm.WriteUChar( (sal_uInt8)' ' ); } - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } } } @@ -204,7 +204,7 @@ void PGMWriter::ImplWriteBody() void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) { const OString aNum(OString::number(nNumber)); - m_rOStm << aNum.getStr(); + m_rOStm.WriteCharPtr( aNum.getStr() ); } // ------------------------------------------------------------------------ diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index b0a19bb0c2da..54a02a99f233 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -288,14 +288,14 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly) void PictWriter::WritePoint(const Point & rPoint) { Point aPoint = OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ); - *pPict << ((short)aPoint.Y()) << ((short)aPoint.X()); + pPict->WriteInt16( (short)aPoint.Y() ).WriteInt16( (short)aPoint.X() ); } void PictWriter::WriteSize(const Size & rSize) { OutputDevice::LogicToLogic( rSize, aSrcMapMode, aTargetMapMode ); // -Wall is this needed. - *pPict << ((short)rSize.Height()) << ((short)rSize.Width()); + pPict->WriteInt16( (short)rSize.Height() ).WriteInt16( (short)rSize.Width() ); } @@ -305,7 +305,7 @@ void PictWriter::WriteRGBColor(const Color & rColor) const sal_uInt16 nG = ( (sal_uInt16) rColor.GetGreen() << 8 ) | (sal_uInt16) rColor.GetGreen(); const sal_uInt16 nB = ( (sal_uInt16) rColor.GetBlue() << 8 ) | (sal_uInt16) rColor.GetBlue(); - *pPict << nR << nG << nB; + pPict->WriteUInt16( nR ).WriteUInt16( nG ).WriteUInt16( nB ); } void PictWriter::WriteString( const OUString & rString ) @@ -314,9 +314,9 @@ void PictWriter::WriteString( const OUString & rString ) sal_Int32 nLen = aString.getLength(); if ( nLen > 255 ) nLen = 255; - *pPict << ( (sal_uInt8)nLen ); + pPict->WriteUChar( (sal_uInt8)nLen ); for (sal_Int32 i = 0; i < nLen; ++i) - *pPict << aString[i]; + pPict->WriteChar( aString[i] ); } Rectangle PictWriter::MapRectangle( const Rectangle& rRect ) @@ -333,8 +333,8 @@ Rectangle PictWriter::MapRectangle( const Rectangle& rRect ) void PictWriter::WriteRectangle(const Rectangle & rRect) { Rectangle aRect( MapRectangle( rRect ) ); - *pPict << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() - << (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right(); + pPict ->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ) + .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() ); } void PictWriter::WritePolygon(const Polygon & rPoly) @@ -373,7 +373,7 @@ void PictWriter::WritePolygon(const Polygon & rPoly) nMaxY=ny; } - *pPict << nDataSize << nMinY << nMinX << nMaxY << nMaxX; + pPict->WriteUInt16( nDataSize ).WriteInt16( nMinY ).WriteInt16( nMinX ).WriteInt16( nMaxY ).WriteInt16( nMaxX ); for (i=0; i<nSize; i++) WritePoint( aPoly.GetPoint(i) ); @@ -418,7 +418,7 @@ void PictWriter::WriteArcAngles(const Rectangle & rRect, const Point & rStartPt, nArcAngle=((short)(fAngE*180.0/3.14159265359))-nStartAngle; if (nArcAngle<0) nArcAngle += 360; - *pPict << nStartAngle << nArcAngle; + pPict->WriteInt16( nStartAngle ).WriteInt16( nArcAngle ); } @@ -468,7 +468,7 @@ void PictWriter::WriteOpcode_TxFace(const Font & rFont) if (rFont.IsShadow()==sal_True) nFace|=0x10; if (bDstTxFaceValid==sal_False || nDstTxFace!=nFace) { - *pPict << (sal_uInt16)0x0004 << nFace << (sal_uInt8)0; + pPict->WriteUInt16( (sal_uInt16)0x0004 ).WriteUChar( nFace ).WriteUChar( (sal_uInt8)0 ); nDstTxFace=nFace; bDstTxFaceValid=sal_True; } @@ -485,7 +485,7 @@ void PictWriter::WriteOpcode_TxMode(RasterOp eMode) case ROP_XOR: nVal=0x000a; break; default: nVal=0x0008; } - *pPict << (sal_uInt16)0x0005 << nVal; + pPict->WriteUInt16( (sal_uInt16)0x0005 ).WriteUInt16( nVal ); eDstTxMode=eMode; bDstTxModeValid=sal_True; } @@ -496,7 +496,7 @@ void PictWriter::WriteOpcode_PnSize(sal_uInt16 nSize) { if (nSize==0) nSize=1; if (bDstPnSizeValid==sal_False || nDstPnSize!=nSize) { - *pPict << (sal_uInt16)0x0007 << nSize << nSize; + pPict->WriteUInt16( (sal_uInt16)0x0007 ).WriteUInt16( nSize ).WriteUInt16( nSize ); nDstPnSize=nSize; bDstPnSizeValid=sal_True; } @@ -514,7 +514,7 @@ void PictWriter::WriteOpcode_PnMode(RasterOp eMode) case ROP_XOR: nVal=0x000a; break; default: nVal=0x0008; } - *pPict << (sal_uInt16)0x0008 << nVal; + pPict->WriteUInt16( (sal_uInt16)0x0008 ).WriteUInt16( nVal ); eDstPnMode=eMode; bDstPnModeValid=sal_True; } @@ -527,7 +527,7 @@ void PictWriter::WriteOpcode_PnLinePat(sal_Bool bVisible) ConvertLinePattern(aPat,bVisible); if (bDstPnPatValid==sal_False || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) { - *pPict << (sal_uInt16)0x0009 << aPat.nHi << aPat.nLo; + pPict->WriteUInt16( (sal_uInt16)0x0009 ).WriteUInt32( aPat.nHi ).WriteUInt32( aPat.nLo ); aDstPnPat=aPat; bDstPnPatValid=sal_True; } @@ -540,7 +540,7 @@ void PictWriter::WriteOpcode_PnFillPat(sal_Bool bVisible) ConvertFillPattern(aPat,bVisible); if (bDstPnPatValid==sal_False || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) { - *pPict << (sal_uInt16)0x0009 << aPat.nHi << aPat.nLo; + pPict->WriteUInt16( (sal_uInt16)0x0009 ).WriteUInt32( aPat.nHi ).WriteUInt32( aPat.nLo ); aDstPnPat=aPat; bDstPnPatValid=sal_True; } @@ -549,7 +549,7 @@ void PictWriter::WriteOpcode_PnFillPat(sal_Bool bVisible) void PictWriter::WriteOpcode_OvSize(const Size & rSize) { - *pPict << (sal_uInt16)0x000b; + pPict->WriteUInt16( (sal_uInt16)0x000b ); WriteSize(rSize); } @@ -561,7 +561,7 @@ void PictWriter::WriteOpcode_TxSize(sal_uInt16 nSize) nDstTxSize = (sal_uInt16) OutputDevice::LogicToLogic( Size( 0, nSize ), aSrcMapMode, aTargetMapMode ).Height(); - *pPict << (sal_uInt16)0x000d << nDstTxSize; + pPict->WriteUInt16( (sal_uInt16)0x000d ).WriteUInt16( nDstTxSize ); bDstTxSizeValid=sal_True; } } @@ -570,7 +570,7 @@ void PictWriter::WriteOpcode_TxSize(sal_uInt16 nSize) void PictWriter::WriteOpcode_RGBFgCol(const Color & rColor) { if (bDstFgColValid==sal_False || aDstFgCol!=rColor) { - *pPict << (sal_uInt16)0x001a; + pPict->WriteUInt16( (sal_uInt16)0x001a ); WriteRGBColor(rColor); aDstFgCol=rColor; bDstFgColValid=sal_True; @@ -581,7 +581,7 @@ void PictWriter::WriteOpcode_RGBFgCol(const Color & rColor) void PictWriter::WriteOpcode_RGBBkCol(const Color & rColor) { if (bDstBkColValid==sal_False || aDstBkCol!=rColor) { - *pPict << (sal_uInt16)0x001b; + pPict->WriteUInt16( (sal_uInt16)0x001b ); WriteRGBColor(rColor); aDstBkCol=rColor; bDstBkColValid=sal_True; @@ -603,13 +603,13 @@ void PictWriter::WriteOpcode_Line(const Point & rLocPt, const Point & rNewPt) dv=aNewPt.Y()-aLocPt.Y(); if (dh<=127 && dh>=-128 && dv<=127 && dv>=-128) { // ShortLine - *pPict << (sal_uInt16)0x0022; + pPict->WriteUInt16( (sal_uInt16)0x0022 ); WritePoint(rLocPt); - *pPict << (char)dh << (char)dv; + pPict->WriteChar( (char)dh ).WriteChar( (char)dv ); } else { - *pPict << (sal_uInt16)0x0020; + pPict->WriteUInt16( (sal_uInt16)0x0020 ); WritePoint(rLocPt); WritePoint(rNewPt); } @@ -630,12 +630,12 @@ void PictWriter::WriteOpcode_LineFrom(const Point & rNewPt) if (dh<=127 && dh>=-128 && dv<=127 && dv>=-128) { // ShortLine - *pPict << (sal_uInt16)0x0023; - *pPict << (char)dh << (char)dv; + pPict->WriteUInt16( (sal_uInt16)0x0023 ); + pPict->WriteChar( (char)dh ).WriteChar( (char)dv ); } else { - *pPict << (sal_uInt16)0x0021; + pPict->WriteUInt16( (sal_uInt16)0x0021 ); WritePoint(rNewPt); } aDstPenPosition=rNewPt; @@ -657,25 +657,25 @@ void PictWriter::WriteOpcode_Text(const Point & rPoint, const OUString& rString, if (bDstTextPositionValid==sal_False || dh<0 || dh>255 || dv<0 || dv>255 || bDelta==sal_False) { - *pPict << (sal_uInt16)0x0028; + pPict->WriteUInt16( (sal_uInt16)0x0028 ); WritePoint(rPoint); } else if (dv==0) { - *pPict << (sal_uInt16)0x0029 << (sal_uInt8)dh; + pPict->WriteUInt16( (sal_uInt16)0x0029 ).WriteUChar( (sal_uInt8)dh ); } else if (dh==0) { - *pPict << (sal_uInt16)0x002a << (sal_uInt8)dv; + pPict->WriteUInt16( (sal_uInt16)0x002a ).WriteUChar( (sal_uInt8)dv ); } else { - *pPict << (sal_uInt16)0x002b << (sal_uInt8)dh << (sal_uInt8)dv; + pPict->WriteUInt16( (sal_uInt16)0x002b ).WriteUChar( (sal_uInt8)dh ).WriteUChar( (sal_uInt8)dv ); } WriteString( rString ); if (((pPict->Tell()-nPos)&1)!=0) - *pPict << (sal_uInt8)0; + pPict->WriteUChar( (sal_uInt8)0 ); aDstTextPosition = aPoint; bDstTextPositionValid=sal_True; @@ -700,12 +700,12 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont) if ( nFontNameLen ) { nDataLen = 3 + nFontNameLen; - *pPict << (sal_uInt16)0x002c << nDataLen << nFontId; + pPict->WriteUInt16( (sal_uInt16)0x002c ).WriteUInt16( nDataLen ).WriteUInt16( nFontId ); WriteString( rFont.GetName() ); if ( ( nFontNameLen & 1 ) == 0 ) - *pPict << (sal_uInt8)0; + pPict->WriteUChar( (sal_uInt8)0 ); } - *pPict << (sal_uInt16)0x0003 << nFontId; + pPict->WriteUInt16( (sal_uInt16)0x0003 ).WriteUInt16( nFontId ); aDstFontName=rFont.GetName(); nDstFontNameId=nFontId; bDstFontNameValid=sal_True; @@ -717,10 +717,10 @@ void PictWriter::WriteOpcode_ClipRect( const Rectangle& rRect ) Rectangle aRect( MapRectangle( rRect ) ); ++aRect.Bottom(); ++aRect.Right(); - *pPict << (sal_uInt16)1 // opcode 1 - << (sal_uInt16)10 // data size - << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() - << (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right(); + pPict ->WriteUInt16( (sal_uInt16)1 ) // opcode 1 + .WriteUInt16( (sal_uInt16)10 ) // data size + .WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ) + .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() ); aClipRect = aRect; } @@ -735,7 +735,7 @@ void PictWriter::WriteOpcode_Rect(PictDrawingMethod eMethod, const Rectangle & r case PDM_FILL: oc=0x0034; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); WriteRectangle(rRect); } @@ -751,7 +751,7 @@ void PictWriter::WriteOpcode_SameRect(PictDrawingMethod eMethod) case PDM_FILL: oc=0x003c; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); } @@ -766,7 +766,7 @@ void PictWriter::WriteOpcode_RRect(PictDrawingMethod eMethod, const Rectangle & case PDM_FILL: oc=0x0044; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); WriteRectangle(rRect); } @@ -782,7 +782,7 @@ void PictWriter::WriteOpcode_SameRRect(PictDrawingMethod eMethod) case PDM_FILL: oc=0x004c; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); } @@ -797,7 +797,7 @@ void PictWriter::WriteOpcode_Oval(PictDrawingMethod eMethod, const Rectangle & r case PDM_FILL: oc=0x0054; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); WriteRectangle(rRect); } @@ -813,7 +813,7 @@ void PictWriter::WriteOpcode_SameOval(PictDrawingMethod eMethod) case PDM_FILL: oc=0x005c; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); } @@ -829,7 +829,7 @@ void PictWriter::WriteOpcode_Arc(PictDrawingMethod eMethod, const Rectangle & rR case PDM_FILL: oc=0x0064; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); WriteRectangle(rRect); WriteArcAngles(rRect,rStartPt,rEndPt); } @@ -847,7 +847,7 @@ void PictWriter::WriteOpcode_SameArc(PictDrawingMethod eMethod, const Rectangle case PDM_FILL: oc=0x006c; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); WriteArcAngles(rRect,rStartPt,rEndPt); } @@ -865,7 +865,7 @@ void PictWriter::WriteOpcode_Poly(PictDrawingMethod eMethod, const Polygon & rPo case PDM_FILL: oc=0x0074; break; default: oc=0; break; // -Wall a default for oc... } - *pPict << oc; + pPict->WriteUInt16( oc ); WritePolygon(rPoly); } @@ -910,7 +910,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nDstRowBytes = nWidth * 4; // writing Opcode and BaseAddr (?): - *pPict << (sal_uInt16)0x009a << (sal_uInt32)0x000000ff; + pPict->WriteUInt16( (sal_uInt16)0x009a ).WriteUInt32( (sal_uInt32)0x000000ff ); // Normally we want to produce packing type 4 (run length encoding // for 32-bit pixels). But if RowBytes<8 is true, generally all data is @@ -923,36 +923,36 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nPackType = 4; // writing PixMap-Structure: - *pPict << (sal_uInt16)(nDstRowBytes|0x8000) // Bytes per row and the fact that it's a 'PixMap' - << (sal_uInt16)0x0000 // Y1-position of the bitmap in the source - << (sal_uInt16)0x0000 // X1-position of the bitmap in the source - << (sal_uInt16)nHeight // Y2-position of the bitmap in the source - << (sal_uInt16)nWidth // X2-position of the bitmap in the source - << (sal_uInt16)0x0000 // Version - << (sal_uInt16)nPackType // Packing type - << (sal_uInt32) 0x00000000 // Packing size (?) - << (sal_uInt32) 0x00480000 // H-Res - << (sal_uInt32) 0x00480000 // V-Res - << (sal_uInt16)0x0010 // Pixel type (?) - << (sal_uInt16)0x0020 // Pixel size: 32 bit - << (sal_uInt16)0x0004 // CmpCount: 4 components - << (sal_uInt16)0x0008 // CmpSize: 8 bits - << (sal_uInt32) 0x00000000 // PlaneBytes (?) - << (sal_uInt32) 0x00000000 // (?) - << (sal_uInt32) 0x00000000; // (?) + pPict->WriteUInt16( (sal_uInt16)(nDstRowBytes|0x8000) ) // Bytes per row and the fact that it's a 'PixMap' + .WriteUInt16( (sal_uInt16)0x0000 ) // Y1-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)0x0000 ) // X1-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)nHeight ) // Y2-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)nWidth ) // X2-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)0x0000 ) // Version + .WriteUInt16( (sal_uInt16)nPackType ) // Packing type + .WriteUInt32( (sal_uInt32) 0x00000000 ) // Packing size (?) + .WriteUInt32( (sal_uInt32) 0x00480000 ) // H-Res + .WriteUInt32( (sal_uInt32) 0x00480000 ) // V-Res + .WriteUInt16( (sal_uInt16)0x0010 ) // Pixel type (?) + .WriteUInt16( (sal_uInt16)0x0020 ) // Pixel size: 32 bit + .WriteUInt16( (sal_uInt16)0x0004 ) // CmpCount: 4 components + .WriteUInt16( (sal_uInt16)0x0008 ) // CmpSize: 8 bits + .WriteUInt32( (sal_uInt32) 0x00000000 ) // PlaneBytes (?) + .WriteUInt32( (sal_uInt32) 0x00000000 ) // (?) + .WriteUInt32( (sal_uInt32) 0x00000000 ); // (?) // Source-Rectangle schreiben: - *pPict << (sal_uInt16)0x0000 // Y1-position on the bitmap - << (sal_uInt16)0x0000 // X1-position on the bitmap - << (sal_uInt16)nHeight // Y2-position on the bitmap - << (sal_uInt16)nWidth; // X2-position on the bitmap + pPict->WriteUInt16( (sal_uInt16)0x0000 ) // Y1-position on the bitmap + .WriteUInt16( (sal_uInt16)0x0000 ) // X1-position on the bitmap + .WriteUInt16( (sal_uInt16)nHeight ) // Y2-position on the bitmap + .WriteUInt16( (sal_uInt16)nWidth ); // X2-position on the bitmap // writing the Destination-Rectangle: WritePoint( rPoint ); WritePoint( Point( rPoint.X() + rSize.Width(), rPoint.Y() + rSize.Height() ) ); // writing the Transfer mode: - *pPict << (sal_uInt16)0x0000; // (?) + pPict->WriteUInt16( (sal_uInt16)0x0000 ); // (?) // remember position of the Map-data in the target: nDstMapPos=pPict->Tell(); @@ -961,10 +961,10 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, { // don't pack for ( ny = 0; ny < nHeight; ny++ ) { - *pPict << (sal_uInt8)0; - *pPict << (sal_uInt8)pAcc->GetPixel( ny, 0 ).GetRed(); - *pPict << (sal_uInt8)pAcc->GetPixel( ny, 0 ).GetGreen(); - *pPict << (sal_uInt8)pAcc->GetPixel( ny, 0 ).GetBlue(); + pPict->WriteUChar( (sal_uInt8)0 ); + pPict->WriteUChar( (sal_uInt8)pAcc->GetPixel( ny, 0 ).GetRed() ); + pPict->WriteUChar( (sal_uInt8)pAcc->GetPixel( ny, 0 ).GetGreen() ); + pPict->WriteUChar( (sal_uInt8)pAcc->GetPixel( ny, 0 ).GetBlue() ); // count percentages, Callback, check errors: nActBitmapPercent = ( ny * 70 / nHeight ) + 30; // (30% already added up to the writing of the Win-BMP file) MayCallback(); @@ -994,9 +994,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, // ByteCount (that's the size of the packed row) is at first 0 (will be corrected later): if ( nDstRowBytes > 250 ) - *pPict << (sal_uInt16)0; + pPict->WriteUInt16( (sal_uInt16)0 ); else - *pPict << (sal_uInt8)0; + pPict->WriteUChar( (sal_uInt8)0 ); // loop trough components: for ( nc = 0; nc < 4; nc++ ) @@ -1029,10 +1029,10 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, if ( nCount > 128 ) nCount=128; nFlagCounterByte = (sal_uInt8)(nCount-1); - *pPict << nFlagCounterByte; + pPict->WriteUChar( nFlagCounterByte ); do { - *pPict << pComp[nc][nx++]; + pPict->WriteUChar( pComp[nc][nx++] ); nCount--; } while ( nCount > 0 ); @@ -1051,7 +1051,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, } // nCount write equal Bytes compressed: nFlagCounterByte = (sal_uInt8)( 1 - (long)nCount ); - *pPict << nFlagCounterByte << nEquData; + pPict->WriteUChar( nFlagCounterByte ).WriteUChar( nEquData ); nx += nCount; } } @@ -1060,9 +1060,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nPos = pPict->Tell(); pPict->Seek( nDstRowPos ); if ( nDstRowBytes > 250 ) - *pPict << ( (sal_uInt16)( nPos - nDstRowPos - 2 ) ); + pPict->WriteUInt16( (sal_uInt16)( nPos - nDstRowPos - 2 ) ); else - *pPict << ( (sal_uInt8)( nPos - nDstRowPos - 1 ) ); + pPict->WriteUChar( (sal_uInt8)( nPos - nDstRowPos - 1 ) ); pPict->Seek( nPos ); // count percentages, Callback, check errors: @@ -1095,7 +1095,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nSrcRowBytes = ( nDstRowBytes + 3 ) & 0xfffffffc; // writing Opcode: - *pPict << (sal_uInt16)0x0098; + pPict->WriteUInt16( (sal_uInt16)0x0098 ); // Normally we want to produce packing type 0 (default packing). // But if RowBytes<8 is true, generally all data is unpacked even if packing @@ -1107,45 +1107,45 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nPackType = 0; // write PixMap-Structure: - *pPict << (sal_uInt16)(nDstRowBytes|0x8000) // Bytes per row and the fact that it's a 'PixMap' - << (sal_uInt16)0x0000 // Y1-position of the bitmap in the source - << (sal_uInt16)0x0000 // X1-position of the bitmap in the source - << (sal_uInt16)nHeight // Y2-position of the bitmap in the source - << (sal_uInt16)nWidth // X2-position of the bitmap in the source - << (sal_uInt16)0x0000 // Version - << (sal_uInt16)nPackType // Packing type - << (sal_uInt32) 0x00000000 // Packing size (?) - << (sal_uInt32) 0x00480000 // H-Res - << (sal_uInt32) 0x00480000 // V-Res - << (sal_uInt16)0x0000 // Pixel type (?) - << (sal_uInt16)nBitsPerPixel // Pixel size - << (sal_uInt16)0x0001 // CmpCount: 1 component - << (sal_uInt16)nBitsPerPixel // CmpSize - << (sal_uInt32) 0x00000000 // PlaneBytes (?) - << (sal_uInt32) 0x00000000 // (?) - << (sal_uInt32) 0x00000000; // (?) + pPict->WriteUInt16( (sal_uInt16)(nDstRowBytes|0x8000) ) // Bytes per row and the fact that it's a 'PixMap' + .WriteUInt16( (sal_uInt16)0x0000 ) // Y1-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)0x0000 ) // X1-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)nHeight ) // Y2-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)nWidth ) // X2-position of the bitmap in the source + .WriteUInt16( (sal_uInt16)0x0000 ) // Version + .WriteUInt16( (sal_uInt16)nPackType ) // Packing type + .WriteUInt32( (sal_uInt32) 0x00000000 ) // Packing size (?) + .WriteUInt32( (sal_uInt32) 0x00480000 ) // H-Res + .WriteUInt32( (sal_uInt32) 0x00480000 ) // V-Res + .WriteUInt16( (sal_uInt16)0x0000 ) // Pixel type (?) + .WriteUInt16( (sal_uInt16)nBitsPerPixel ) // Pixel size + .WriteUInt16( (sal_uInt16)0x0001 ) // CmpCount: 1 component + .WriteUInt16( (sal_uInt16)nBitsPerPixel ) // CmpSize + .WriteUInt32( (sal_uInt32) 0x00000000 ) // PlaneBytes (?) + .WriteUInt32( (sal_uInt32) 0x00000000 ) // (?) + .WriteUInt32( (sal_uInt32) 0x00000000 ); // (?) // writing and reading the palette: nColTabSize = pAcc->GetPaletteEntryCount(); - *pPict << (sal_uInt32)0 << (sal_uInt16)0x8000 << (sal_uInt16)( nColTabSize - 1 ); + pPict->WriteUInt32( (sal_uInt32)0 ).WriteUInt16( (sal_uInt16)0x8000 ).WriteUInt16( (sal_uInt16)( nColTabSize - 1 ) ); for ( i = 0; i < nColTabSize; i++ ) { nRed = (sal_uInt8)pAcc->GetPaletteColor( (sal_uInt16)i ).GetRed(); nGreen = (sal_uInt8)pAcc->GetPaletteColor( (sal_uInt16)i ).GetGreen(); nBlue = (sal_uInt8)pAcc->GetPaletteColor( (sal_uInt16)i ).GetBlue(); - *pPict << (sal_uInt16)0 << nRed << nRed << nGreen << nGreen << nBlue << nBlue; + pPict->WriteUInt16( (sal_uInt16)0 ).WriteUChar( nRed ).WriteUChar( nRed ).WriteUChar( nGreen ).WriteUChar( nGreen ).WriteUChar( nBlue ).WriteUChar( nBlue ); } // writing Source-Rectangle: - *pPict << (sal_uInt16)0 << (sal_uInt16)0 << (sal_uInt16)nHeight << (sal_uInt16)nWidth; + pPict->WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16)nHeight ).WriteUInt16( (sal_uInt16)nWidth ); // writing Destination-Rectangle: WritePoint( rPoint ); WritePoint( Point( rPoint.X() + rSize.Width(), rPoint.Y() + rSize.Height() ) ); // writing Transfer mode: - *pPict << (sal_uInt16)0; // (?) + pPict->WriteUInt16( (sal_uInt16)0 ); // (?) // allocate memory for a row: pPix = new sal_uInt8[ nSrcRowBytes ]; @@ -1190,9 +1190,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, // ByteCount (this is the size of the packed line) initialized with 0 (will be corrected later): if ( nDstRowBytes > 250 ) - *pPict << (sal_uInt16)0; + pPict->WriteUInt16( (sal_uInt16)0 ); else - *pPict << (sal_uInt8)0; + pPict->WriteUChar( (sal_uInt8)0 ); // loop trough bytes of the row: nx=0; @@ -1222,10 +1222,10 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, if ( nCount > 128 ) nCount = 128; nFlagCounterByte = (sal_uInt8)( nCount - 1 ); - *pPict << nFlagCounterByte; + pPict->WriteUChar( nFlagCounterByte ); do { - *pPict << pPix[ nx++ ]; + pPict->WriteUChar( pPix[ nx++ ] ); nCount--; } while ( nCount > 0 ); } @@ -1243,7 +1243,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, } // write nCount identical bytes unpacked: nFlagCounterByte = (sal_uInt8)( 1 - (long)nCount ); - *pPict << nFlagCounterByte << nEquData; + pPict->WriteUChar( nFlagCounterByte ).WriteUChar( nEquData ); nx += nCount; } } @@ -1252,9 +1252,9 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, nPos = pPict->Tell(); pPict->Seek( nDstRowPos ); if ( nDstRowBytes > 250 ) - *pPict << ( (sal_uInt16)( nPos - nDstRowPos - 2 ) ); + pPict->WriteUInt16( (sal_uInt16)( nPos - nDstRowPos - 2 ) ); else - *pPict << ( (sal_uInt8)( nPos - nDstRowPos - 1 ) ); + pPict->WriteUChar( (sal_uInt8)( nPos - nDstRowPos - 1 ) ); pPict->Seek( nPos ); } @@ -1270,7 +1270,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, // Map-Data has to be an even number of bytes: if ( ( ( pPict->Tell() - nDstMapPos ) & 1 ) != 0 ) - *pPict << (sal_uInt8)0; + pPict->WriteUChar( (sal_uInt8)0 ); // counting Bitmaps: nWrittenBitmaps++; @@ -1281,7 +1281,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, void PictWriter::WriteOpcode_EndOfFile() { - *pPict << (sal_uInt16)0x00ff; + pPict->WriteUInt16( (sal_uInt16)0x00ff ); } @@ -2063,10 +2063,10 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) if ( pAt->aClipRect != aClipRect ) { Rectangle aRect( pAt->aClipRect ); - *pPict << (sal_uInt16)1 // opcode 1 - << (sal_uInt16)10 // data size - << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() - << (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right(); + pPict ->WriteUInt16( (sal_uInt16)1 ) // opcode 1 + .WriteUInt16( (sal_uInt16)10 ) // data size + .WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ) + .WriteInt16( (sal_Int16)aRect.Bottom() ).WriteInt16( (sal_Int16)aRect.Right() ); } aClipRect=pAt->aClipRect; pAttrStack=pAt->pSucc; @@ -2150,25 +2150,25 @@ void PictWriter::WriteHeader(const GDIMetaFile & rMTF) Rectangle aRect( aPoint, aSize ); // 512 Bytes "trash" at the beginning: - for (i=0;i<128;i++) *pPict << (sal_uInt32)0; + for (i=0;i<128;i++) pPict->WriteUInt32( (sal_uInt32)0 ); // Lo-16-Bits of the file size without the 512 bytes trash: - *pPict << (sal_uInt16)0; // gets corrected later on by UpdateHeader() + pPict->WriteUInt16( (sal_uInt16)0 ); // gets corrected later on by UpdateHeader() // The Bounding-Rectangle (y1,x1,y2,x2 !): WriteRectangle( aRect ); // Version 2: - *pPict << (sal_uInt32)0x001102ff; + pPict->WriteUInt32( (sal_uInt32)0x001102ff ); // Extended-Version-2-Header: - *pPict << (sal_uInt16)0x0c00 // Opcode - << (sal_uInt16)0xfffe // Version (?) - << (sal_uInt16)0x0000 // Reserved - << (sal_uInt32) 0x00480000 // hRes - << (sal_uInt32) 0x00480000; + pPict->WriteUInt16( (sal_uInt16)0x0c00 ) // Opcode + .WriteUInt16( (sal_uInt16)0xfffe ) // Version (?) + .WriteUInt16( (sal_uInt16)0x0000 ) // Reserved + .WriteUInt32( (sal_uInt32) 0x00480000 ) // hRes + .WriteUInt32( (sal_uInt32) 0x00480000 ); WriteRectangle( aRect ); - *pPict << (sal_uInt32)0x00000000; // Reserved + pPict->WriteUInt32( (sal_uInt32)0x00000000 ); // Reserved // many import filters demand the declaration // of a clipping area at the beginning @@ -2184,7 +2184,7 @@ void PictWriter::UpdateHeader() // correct the Lo-16-Bits of the file size without the 512 bytes trash: nPos=pPict->Tell(); pPict->Seek(512); - *pPict << (sal_uInt16)((nPos-512)&0x0000ffff); + pPict->WriteUInt16( (sal_uInt16)((nPos-512)&0x0000ffff) ); pPict->Seek(nPos); } diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index fcb40f128829..0af3cb8dabe4 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -120,16 +120,16 @@ sal_Bool PPMWriter::ImplWriteHeader() if ( mnWidth && mnHeight ) { if ( mnMode == 0 ) - m_rOStm << "P6\x0a"; + m_rOStm.WriteCharPtr( "P6\x0a" ); else - m_rOStm << "P3\x0a"; + m_rOStm.WriteCharPtr( "P3\x0a" ); ImplWriteNumber( mnWidth ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( mnHeight ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( 255 ); // max. col. - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } else mbStatus = sal_False; @@ -148,9 +148,9 @@ void PPMWriter::ImplWriteBody() for ( sal_uLong x = 0; x < mnWidth; x++ ) { const BitmapColor& rColor = mpAcc->GetPixel( y, x ); - m_rOStm << rColor.GetRed(); - m_rOStm << rColor.GetGreen(); - m_rOStm << rColor.GetBlue(); + m_rOStm.WriteUChar( rColor.GetRed() ); + m_rOStm.WriteUChar( rColor.GetGreen() ); + m_rOStm.WriteUChar( rColor.GetBlue() ); } } } @@ -165,7 +165,7 @@ void PPMWriter::ImplWriteBody() if ( nCount < 0 ) { nCount = 69; - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } nDat[0] = mpAcc->GetPixel( y, x ).GetRed(); nDat[1] = mpAcc->GetPixel( y, x ).GetGreen(); @@ -175,12 +175,12 @@ void PPMWriter::ImplWriteBody() nNumb = nDat[ i ] / 100; if ( nNumb ) { - m_rOStm << (sal_uInt8)( nNumb + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nNumb + '0' ) ); nDat[ i ] -= ( nNumb * 100 ); nNumb = nDat[ i ] / 10; - m_rOStm << (sal_uInt8)( nNumb + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nNumb + '0' ) ); nDat[ i ] -= ( nNumb * 10 ); - m_rOStm << (sal_uInt8)( nDat[ i ] + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDat[ i ] + '0' ) ); nCount -= 4; } else @@ -188,21 +188,21 @@ void PPMWriter::ImplWriteBody() nNumb = nDat[ i ] / 10; if ( nNumb ) { - m_rOStm << (sal_uInt8)( nNumb + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nNumb + '0' ) ); nDat[ i ] -= ( nNumb * 10 ); - m_rOStm << (sal_uInt8)( nDat[ i ] + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDat[ i ] + '0' ) ); nCount -= 3; } else { - m_rOStm << (sal_uInt8)( nDat[ i ] + '0' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDat[ i ] + '0' ) ); nCount -= 2; } } - m_rOStm << (sal_uInt8)' '; + m_rOStm.WriteUChar( (sal_uInt8)' ' ); } } - m_rOStm << (sal_uInt8)10; + m_rOStm.WriteUChar( (sal_uInt8)10 ); } } } @@ -213,7 +213,7 @@ void PPMWriter::ImplWriteBody() void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) { const OString aNum(OString::number(nNumber)); - m_rOStm << aNum.getStr(); + m_rOStm.WriteCharPtr( aNum.getStr() ); } // ------------------------------------------------------------------------ diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index effeb74087cb..07864762af68 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -328,10 +328,10 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi if ( mnPreview & EPS_PREVIEW_TIFF ) { - rTargetStream << (sal_uInt32)0xC6D3D0C5; + rTargetStream.WriteUInt32( (sal_uInt32)0xC6D3D0C5 ); nStreamPosition = rTargetStream.Tell(); - rTargetStream << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0 - << nStreamPosition + 26 << (sal_uInt32)0 << (sal_uInt16)0xffff; + rTargetStream.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( nStreamPosition + 26 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt16( (sal_uInt16)0xffff ); sal_uInt32 nErrCode; if ( mbGrayScale ) @@ -348,7 +348,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi rTargetStream.Seek( STREAM_SEEK_TO_END ); nPSPosition = rTargetStream.Tell(); rTargetStream.Seek( nStreamPosition + 20 ); - rTargetStream << nPSPosition - 30; // size of tiff gfx + rTargetStream.WriteUInt32( nPSPosition - 30 ); // size of tiff gfx rTargetStream.Seek( nPSPosition ); } else @@ -412,8 +412,8 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi { sal_uInt32 nPosition = rTargetStream.Tell(); rTargetStream.Seek( nStreamPosition ); - rTargetStream << nPSPosition; - rTargetStream << nPosition - nPSPosition; + rTargetStream.WriteUInt32( nPSPosition ); + rTargetStream.WriteUInt32( nPosition - nPSPosition ); rTargetStream.Seek( nPosition ); } while( pChrSetList ) @@ -455,7 +455,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi void PSWriter::ImplWriteProlog( const Graphic* pPreview ) { ImplWriteLine( "%!PS-Adobe-3.0 EPSF-3.0 " ); - *mpPS << "%%BoundingBox: "; // BoundingBox + mpPS->WriteCharPtr( "%%BoundingBox: " ); // BoundingBox ImplWriteLong( 0 ); ImplWriteLong( 0 ); Size aSizePoint = Application::GetDefaultDevice()->LogicToLogic( pMTF->GetPrefSize(), @@ -471,7 +471,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) // defaults - *mpPS << "%%LanguageLevel: "; // Language level + mpPS->WriteCharPtr( "%%LanguageLevel: " ); // Language level ImplWriteLong( mnLevel, PS_RET ); if ( !mbGrayScale && mnLevel == 1 ) ImplWriteLine( "%%Extensions: CMYK" ); // CMYK extension is to set in color mode in level 1 @@ -485,10 +485,10 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) BitmapReadAccess* pAcc = aTmpBitmap.AcquireReadAccess(); if ( pAcc ) { - *mpPS << "%%BeginPreview: "; // BoundingBox + mpPS->WriteCharPtr( "%%BeginPreview: " ); // BoundingBox ImplWriteLong( aSizeBitmap.Width() ); ImplWriteLong( aSizeBitmap.Height() ); - *mpPS << "1 "; + mpPS->WriteCharPtr( "1 " ); sal_Int32 nLines = aSizeBitmap.Width() / 312; if ( ( nLines * 312 ) != aSizeBitmap.Width() ) nLines++; @@ -506,7 +506,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) if ( !nCount2 ) { ImplExecMode( PS_RET ); - *mpPS << "%"; + mpPS->WriteCharPtr( "%" ); nCount2 = 312; } nVal <<= 1; @@ -518,7 +518,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) nVal += 'A' - 10; else nVal += '0'; - *mpPS << nVal; + mpPS->WriteChar( nVal ); nVal = 0; nCount += 4; } @@ -1306,12 +1306,12 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) ImplAddPath( aPolyPoly.GetObject( i ) ); if ( ++i < nPolyCount ) { - *mpPS << "p"; + mpPS->WriteCharPtr( "p" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } } - *mpPS << "p ef"; + mpPS->WriteCharPtr( "p ef" ); mnCursorPos += 4; ImplExecMode( PS_RET ); } @@ -1445,7 +1445,7 @@ void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3 ImplWritePoint( rP1 ); ImplWritePoint( rP2 ); ImplWritePoint( rP3 ); - *mpPS << "ct "; + mpPS->WriteCharPtr( "ct " ); ImplExecMode( nMode ); } @@ -1483,14 +1483,14 @@ void PSWriter::ImplRect( const Rectangle & rRect ) ImplWriteLineColor( PS_SPACE ); ImplMoveTo( rRect.TopLeft() ); ImplWriteDouble( nWidth ); - *mpPS << "0 rl 0 "; + mpPS->WriteCharPtr( "0 rl 0 " ); ImplWriteDouble( nHeight ); - *mpPS << "rl "; + mpPS->WriteCharPtr( "rl " ); ImplWriteDouble( nWidth ); - *mpPS << "neg 0 rl "; + mpPS->WriteCharPtr( "neg 0 rl " ); ImplClosePathDraw(); } - *mpPS << (sal_uInt8)10; + mpPS->WriteUChar( (sal_uInt8)10 ); mnCursorPos = 0; } @@ -1504,12 +1504,12 @@ void PSWriter::ImplRectFill( const Rectangle & rRect ) ImplWriteFillColor( PS_SPACE ); ImplMoveTo( rRect.TopLeft() ); ImplWriteDouble( nWidth ); - *mpPS << "0 rl 0 "; + mpPS->WriteCharPtr( "0 rl 0 " ); ImplWriteDouble( nHeight ); - *mpPS << "rl "; + mpPS->WriteCharPtr( "rl " ); ImplWriteDouble( nWidth ); - *mpPS << "neg 0 rl ef "; - *mpPS << "p ef"; + mpPS->WriteCharPtr( "neg 0 rl ef " ); + mpPS->WriteCharPtr( "p ef" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } @@ -1549,7 +1549,7 @@ void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly ) ImplAddPath( rPolyPoly.GetObject( i ) ); if ( ++i < nPolyCount ) { - *mpPS << "p"; + mpPS->WriteCharPtr( "p" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } @@ -1586,12 +1586,12 @@ void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutlin ImplAddPath( rPolyPoly.GetObject( i ) ); if ( ++i < nPolyCount ) { - *mpPS << "p"; + mpPS->WriteCharPtr( "p" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } } - *mpPS << "p ef"; + mpPS->WriteCharPtr( "p ef" ); mnCursorPos += 4; ImplExecMode( PS_RET ); } @@ -1834,14 +1834,14 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi { ImplWriteLong( nWidth ); ImplWriteLong( nHeight ); - *mpPS << "8 ["; + mpPS->WriteCharPtr( "8 [" ); ImplWriteLong( nWidth ); - *mpPS << "0 0 "; + mpPS->WriteCharPtr( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0 ); ImplWriteLong( nHeight ); ImplWriteLine( "]" ); - *mpPS << "{currentfile "; + mpPS->WriteCharPtr( "{currentfile " ); ImplWriteLong( nWidth ); ImplWriteLine( "string readhexstring pop}" ); ImplWriteLine( "image" ); @@ -1852,7 +1852,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi ImplWriteHexByte( pAcc->GetPixelIndex( y, x ) ); } } - *mpPS << (sal_uInt8)10; + mpPS->WriteUChar( (sal_uInt8)10 ); } else // Level 2 { @@ -1861,15 +1861,15 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi ImplWriteLine( "/DeviceGray setcolorspace" ); ImplWriteLine( "<<" ); ImplWriteLine( "/ImageType 1" ); - *mpPS << "/Width "; + mpPS->WriteCharPtr( "/Width " ); ImplWriteLong( nWidth, PS_RET ); - *mpPS << "/Height "; + mpPS->WriteCharPtr( "/Height " ); ImplWriteLong( nHeight, PS_RET ); ImplWriteLine( "/BitsPerComponent 8" ); ImplWriteLine( "/Decode[0 1]" ); - *mpPS << "/ImageMatrix["; + mpPS->WriteCharPtr( "/ImageMatrix[" ); ImplWriteLong( nWidth ); - *mpPS << "0 0 "; + mpPS->WriteCharPtr( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0 ); ImplWriteLong( nHeight, PS_NONE ); @@ -1924,15 +1924,15 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi ImplWriteLine( "] setcolorspace" ); ImplWriteLine( "<<" ); ImplWriteLine( "/ImageType 1" ); - *mpPS << "/Width "; + mpPS->WriteCharPtr( "/Width " ); ImplWriteLong( nWidth, PS_RET ); - *mpPS << "/Height "; + mpPS->WriteCharPtr( "/Height " ); ImplWriteLong( nHeight, PS_RET ); ImplWriteLine( "/BitsPerComponent 8" ); ImplWriteLine( "/Decode[0 255]" ); - *mpPS << "/ImageMatrix["; + mpPS->WriteCharPtr( "/ImageMatrix[" ); ImplWriteLong( nWidth ); - *mpPS << "0 0 "; + mpPS->WriteCharPtr( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0); ImplWriteLong( nHeight, PS_NONE ); @@ -1971,15 +1971,15 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi ImplWriteLine( "/DeviceRGB setcolorspace" ); ImplWriteLine( "<<" ); ImplWriteLine( "/ImageType 1" ); - *mpPS << "/Width "; + mpPS->WriteCharPtr( "/Width " ); ImplWriteLong( nWidth, PS_RET ); - *mpPS << "/Height "; + mpPS->WriteCharPtr( "/Height " ); ImplWriteLong( nHeight, PS_RET ); ImplWriteLine( "/BitsPerComponent 8" ); ImplWriteLine( "/Decode[0 1 0 1 0 1]" ); - *mpPS << "/ImageMatrix["; + mpPS->WriteCharPtr( "/ImageMatrix[" ); ImplWriteLong( nWidth ); - *mpPS << "0 0 "; + mpPS->WriteCharPtr( "0 0 " ); ImplWriteLong( -nHeight ); ImplWriteLong( 0 ); ImplWriteLong( nHeight, PS_NONE ); @@ -2122,7 +2122,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sa if ( nRotation ) { ImplWriteF( nRotation, 1 ); - *mpPS << "r "; + mpPS->WriteCharPtr( "r " ); } std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); while ( aIter != aPolyPolyVec.end() ) @@ -2169,7 +2169,7 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) maLastFont = maFont; aSize = maFont.GetSize(); ImplWriteDouble( aSize.Height() ); - *mpPS << "sf "; + mpPS->WriteCharPtr( "sf " ); } if ( eTextAlign != ALIGN_BASELINE ) { // PostScript kennt kein FontAlignment @@ -2181,9 +2181,9 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) ImplMoveTo( aPoint ); if ( nRotation ) { - *mpPS << "gs "; + mpPS->WriteCharPtr( "gs " ); ImplWriteF( nRotation, 1 ); - *mpPS << "r "; + mpPS->WriteCharPtr( "r " ); } } @@ -2191,21 +2191,21 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint ) void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) { - *mpPS << (sal_uInt8)'/'; //convert the font pOriginalName using ISOLatin1Encoding - *mpPS << pOriginalName; + mpPS->WriteUChar( (sal_uInt8)'/' ); //convert the font pOriginalName using ISOLatin1Encoding + mpPS->WriteCharPtr( pOriginalName ); switch ( maFont.GetWeight() ) { case WEIGHT_SEMIBOLD : case WEIGHT_BOLD : case WEIGHT_ULTRABOLD : case WEIGHT_BLACK : - *mpPS << "-Bold"; + mpPS->WriteCharPtr( "-Bold" ); if ( maFont.GetItalic() != ITALIC_NONE ) - *mpPS << pItalic; + mpPS->WriteCharPtr( pItalic ); break; default: if ( maFont.GetItalic() != ITALIC_NONE ) - *mpPS << pItalic; + mpPS->WriteCharPtr( pItalic ); break; } ImplWriteLine( " f" ); @@ -2217,14 +2217,14 @@ void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic ) void PSWriter::ImplClosePathDraw( sal_uLong nMode ) { - *mpPS << "pc"; + mpPS->WriteCharPtr( "pc" ); mnCursorPos += 2; ImplExecMode( nMode ); } void PSWriter::ImplPathDraw() { - *mpPS << "ps"; + mpPS->WriteCharPtr( "ps" ); mnCursorPos += 2; ImplExecMode( PS_RET ); } @@ -2281,7 +2281,7 @@ void PSWriter::ImplWriteColor( sal_uLong nMode ) ImplWriteB1 ( (sal_uInt8)aColor.GetGreen() ); ImplWriteB1 ( (sal_uInt8)aColor.GetBlue() ); } - *mpPS << "c"; // ( c is defined as setrgbcolor or setgray ) + mpPS->WriteCharPtr( "c" ); // ( c is defined as setrgbcolor or setgray ) ImplExecMode( nMode ); } @@ -2354,18 +2354,18 @@ inline void PSWriter::ImplExecMode( sal_uLong nMode ) if ( mnCursorPos >= PS_LINESIZE ) { mnCursorPos = 0; - *mpPS << (sal_uInt8)0xa; + mpPS->WriteUChar( (sal_uInt8)0xa ); return; } } if ( nMode & PS_SPACE ) { - *mpPS << (sal_uInt8)32; + mpPS->WriteUChar( (sal_uInt8)32 ); mnCursorPos++; } if ( nMode & PS_RET ) { - *mpPS << (sal_uInt8)0xa; + mpPS->WriteUChar( (sal_uInt8)0xa ); mnCursorPos = 0; } } @@ -2377,7 +2377,7 @@ inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode ) sal_uLong i = 0; while ( pString[ i ] ) { - *mpPS << (sal_uInt8)pString[ i++ ]; + mpPS->WriteUChar( (sal_uInt8)pString[ i++ ] ); } mnCursorPos += i; ImplExecMode( nMode ); @@ -2484,7 +2484,7 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { const OString aNumber(OString::number(nNumber)); mnCursorPos += aNumber.getLength(); - *mpPS << aNumber.getStr(); + mpPS->WriteCharPtr( aNumber.getStr() ); ImplExecMode(nMode); } @@ -2496,16 +2496,16 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) sal_Int32 nATemp = labs( (sal_Int32)( ( fNumber - nPTemp ) * 100000 ) ); if ( !nPTemp && nATemp && ( fNumber < 0.0 ) ) - *mpPS << (sal_Char)'-'; + mpPS->WriteChar( (sal_Char)'-' ); const OString aNumber1(OString::number(nPTemp)); - *mpPS << aNumber1.getStr(); + mpPS->WriteCharPtr( aNumber1.getStr() ); mnCursorPos += aNumber1.getLength(); if ( nATemp ) { int zCount = 0; - *mpPS << (sal_uInt8)'.'; + mpPS->WriteUChar( (sal_uInt8)'.' ); mnCursorPos++; const OString aNumber2(OString::number(nATemp)); @@ -2515,13 +2515,13 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) mnCursorPos += 6 - nLen; for ( n = 0; n < ( 5 - nLen ); n++ ) { - *mpPS << (sal_uInt8)'0'; + mpPS->WriteUChar( (sal_uInt8)'0' ); } } mnCursorPos += nLen; for ( n = 0; n < nLen; n++ ) { - *mpPS << aNumber2[n]; + mpPS->WriteChar( aNumber2[n] ); zCount--; if ( aNumber2[n] != '0' ) zCount = 0; @@ -2540,7 +2540,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode { if ( nNumber < 0 ) { - *mpPS << (sal_uInt8)'-'; + mpPS->WriteUChar( (sal_uInt8)'-' ); nNumber = -nNumber; mnCursorPos++; } @@ -2549,15 +2549,15 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode long nStSize = ( nCount + 1 ) - nLen; if ( nStSize >= 1 ) { - *mpPS << (sal_uInt8)'0'; + mpPS->WriteUChar( (sal_uInt8)'0' ); mnCursorPos++; } if ( nStSize >= 2 ) { - *mpPS << (sal_uInt8)'.'; + mpPS->WriteUChar( (sal_uInt8)'.' ); for ( long i = 1; i < nStSize; i++ ) { - *mpPS << (sal_uInt8)'0'; + mpPS->WriteUChar( (sal_uInt8)'0' ); mnCursorPos++; } } @@ -2566,10 +2566,10 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode { if ( n == nLen - nCount ) { - *mpPS << (sal_uInt8)'.'; + mpPS->WriteUChar( (sal_uInt8)'.' ); mnCursorPos++; } - *mpPS << aScaleFactor[n]; + mpPS->WriteChar( aScaleFactor[n] ); } ImplExecMode( nMode ); } @@ -2578,7 +2578,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) { - *mpPS << ( nNumb ); + mpPS->WriteUChar( ( nNumb ) ); mnCursorPos++; ImplExecMode( nMode ); } @@ -2588,14 +2588,14 @@ void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode ) void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode ) { if ( ( nNumb >> 4 ) > 9 ) - *mpPS << (sal_uInt8)( ( nNumb >> 4 ) + 'A' - 10 ); + mpPS->WriteUChar( (sal_uInt8)( ( nNumb >> 4 ) + 'A' - 10 ) ); else - *mpPS << (sal_uInt8)( ( nNumb >> 4 ) + '0' ); + mpPS->WriteUChar( (sal_uInt8)( ( nNumb >> 4 ) + '0' ) ); if ( ( nNumb & 0xf ) > 9 ) - *mpPS << (sal_uInt8)( ( nNumb & 0xf ) + 'A' - 10 ); + mpPS->WriteUChar( (sal_uInt8)( ( nNumb & 0xf ) + 'A' - 10 ) ); else - *mpPS << (sal_uInt8)( ( nNumb & 0xf ) + '0' ); + mpPS->WriteUChar( (sal_uInt8)( ( nNumb & 0xf ) + '0' ) ); mnCursorPos += 2; ImplExecMode( nMode ); } diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index d40ee67b5a3f..46cc4fbcecaf 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -146,17 +146,17 @@ sal_Bool RASWriter::ImplWriteHeader() } if ( mbStatus && mnWidth && mnHeight && mnDepth ) { - m_rOStm << (sal_uInt32)0x59a66a95 << (sal_uInt32)mnWidth << (sal_uInt32)mnHeight - << (sal_uInt32)mnDepth - << (sal_uInt32)(( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight) - << (sal_uInt32)2; + m_rOStm.WriteUInt32( (sal_uInt32)0x59a66a95 ).WriteUInt32( (sal_uInt32)mnWidth ).WriteUInt32( (sal_uInt32)mnHeight ) + .WriteUInt32( (sal_uInt32)mnDepth ) + .WriteUInt32( (sal_uInt32)(( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight) ) + .WriteUInt32( (sal_uInt32)2 ); if ( mnDepth > 8 ) - m_rOStm << (sal_uInt32)0 << (sal_uInt32)0; + m_rOStm.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); else { - m_rOStm << (sal_uInt32)1 << (sal_uInt32)( mnColors * 3 ); + m_rOStm.WriteUInt32( (sal_uInt32)1 ).WriteUInt32( (sal_uInt32)( mnColors * 3 ) ); } } else mbStatus = sal_False; @@ -170,9 +170,9 @@ void RASWriter::ImplWritePalette() { sal_uInt16 i; - for ( i = 0; i < mnColors; m_rOStm << mpAcc->GetPaletteColor( i++ ).GetRed() ) ; - for ( i = 0; i < mnColors; m_rOStm << mpAcc->GetPaletteColor( i++ ).GetGreen() ) ; - for ( i = 0; i < mnColors; m_rOStm << mpAcc->GetPaletteColor( i++ ).GetBlue() ) ; + for ( i = 0; i < mnColors; m_rOStm.WriteUChar( mpAcc->GetPaletteColor( i++ ).GetRed() ) ) ; + for ( i = 0; i < mnColors; m_rOStm.WriteUChar( mpAcc->GetPaletteColor( i++ ).GetGreen() ) ) ; + for ( i = 0; i < mnColors; m_rOStm.WriteUChar( mpAcc->GetPaletteColor( i++ ).GetBlue() ) ) ; } // ------------------------------------------------------------------------ @@ -247,15 +247,15 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) { if ( mnRepCount == 0 ) { - m_rOStm << (sal_uInt8)mnRepVal; + m_rOStm.WriteUChar( (sal_uInt8)mnRepVal ); if ( mnRepVal == 0x80 ) - m_rOStm << (sal_uInt8)0; + m_rOStm.WriteUChar( (sal_uInt8)0 ); } else { - m_rOStm << (sal_uInt8)0x80; - m_rOStm << (sal_uInt8)mnRepCount; - m_rOStm << (sal_uInt8)mnRepVal; + m_rOStm.WriteUChar( (sal_uInt8)0x80 ); + m_rOStm.WriteUChar( (sal_uInt8)mnRepCount ); + m_rOStm.WriteUChar( (sal_uInt8)mnRepVal ); } mnRepVal = nPutThis; mnRepCount = 0; diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 68af37d4b9ab..aff5ce3733f6 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -159,9 +159,9 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt // we will use the BIG Endian Mode // TIFF header m_rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); - m_rOStm << (sal_uInt32)0x4d4d002a; // TIFF identifier + m_rOStm.WriteUInt32( (sal_uInt32)0x4d4d002a ); // TIFF identifier mnLatestIfdPos = m_rOStm.Tell(); - m_rOStm << (sal_uInt32)0; + m_rOStm.WriteUInt32( (sal_uInt32)0 ); Animation aAnimation; Bitmap aBmp; @@ -211,7 +211,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt } sal_uInt32 nCurPos = m_rOStm.Tell(); m_rOStm.Seek( mnCurrentTagCountPos ); - m_rOStm << mnTagCount; + m_rOStm.WriteUInt16( mnTagCount ); m_rOStm.Seek( nCurPos ); aBmp.ReleaseAccess( mpAcc ); @@ -256,12 +256,12 @@ sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage ) { sal_uInt32 nCurrentPos = m_rOStm.Tell(); m_rOStm.Seek( mnLatestIfdPos ); - m_rOStm << (sal_uInt32)( nCurrentPos - mnStreamOfs ); // offset to the IFD + m_rOStm.WriteUInt32( (sal_uInt32)( nCurrentPos - mnStreamOfs ) ); // offset to the IFD m_rOStm.Seek( nCurrentPos ); // (OFS8) TIFF image file directory (IFD) mnCurrentTagCountPos = m_rOStm.Tell(); - m_rOStm << (sal_uInt16)0; // the number of tagentrys is to insert later + m_rOStm.WriteUInt16( (sal_uInt16)0 ); // the number of tagentrys is to insert later sal_uInt32 nSubFileFlags = 0; if ( bMultiPage ) @@ -311,7 +311,7 @@ sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage ) // and last we write zero to close the num dir entries list mnLatestIfdPos = m_rOStm.Tell(); - m_rOStm << (sal_uInt32)0; // there are no more IFD + m_rOStm.WriteUInt32( (sal_uInt32)0 ); // there are no more IFD } else mbStatus = sal_False; @@ -326,23 +326,23 @@ void TIFFWriter::ImplWritePalette() sal_uInt16 i; sal_uLong nCurrentPos = m_rOStm.Tell(); m_rOStm.Seek( mnPalPos + 8 ); // the palette tag entry needs the offset - m_rOStm << static_cast<sal_uInt32>(nCurrentPos - mnStreamOfs); // to the palette colors + m_rOStm.WriteUInt32( static_cast<sal_uInt32>(nCurrentPos - mnStreamOfs) ); // to the palette colors m_rOStm.Seek( nCurrentPos ); for ( i = 0; i < mnColors; i++ ) { const BitmapColor& rColor = mpAcc->GetPaletteColor( i ); - m_rOStm << (sal_uInt16)( rColor.GetRed() << 8 ); + m_rOStm.WriteUInt16( (sal_uInt16)( rColor.GetRed() << 8 ) ); } for ( i = 0; i < mnColors; i++ ) { const BitmapColor& rColor = mpAcc->GetPaletteColor( i ); - m_rOStm << (sal_uInt16)( rColor.GetGreen() << 8 ); + m_rOStm.WriteUInt16( (sal_uInt16)( rColor.GetGreen() << 8 ) ); } for ( i = 0; i < mnColors; i++ ) { const BitmapColor& rColor = mpAcc->GetPaletteColor( i ); - m_rOStm << (sal_uInt16)( rColor.GetBlue() << 8 ); + m_rOStm.WriteUInt16( (sal_uInt16)( rColor.GetBlue() << 8 ) ); } } @@ -356,7 +356,7 @@ sal_Bool TIFFWriter::ImplWriteBody() sal_uLong nGfxBegin = m_rOStm.Tell(); m_rOStm.Seek( mnBitmapPos + 8 ); // the strip offset tag entry needs the offset - m_rOStm << static_cast<sal_uInt32>(nGfxBegin - mnStreamOfs); // to the bitmap data + m_rOStm.WriteUInt32( static_cast<sal_uInt32>(nGfxBegin - mnStreamOfs) ); // to the bitmap data m_rOStm.Seek( nGfxBegin ); StartCompression(); @@ -448,7 +448,7 @@ sal_Bool TIFFWriter::ImplWriteBody() { sal_uLong nGfxEnd = m_rOStm.Tell(); m_rOStm.Seek( mnStripByteCountPos + 8 ); - m_rOStm << static_cast<sal_uInt32>( nGfxEnd - nGfxBegin ); // mnStripByteCountPos needs the size of the compression data + m_rOStm.WriteUInt32( static_cast<sal_uInt32>( nGfxEnd - nGfxBegin ) ); // mnStripByteCountPos needs the size of the compression data m_rOStm.Seek( nGfxEnd ); } return mbStatus; @@ -460,10 +460,10 @@ void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResoluti { sal_uLong nCurrentPos = m_rOStm.Tell(); m_rOStm.Seek( nStreamPos + 8 ); - m_rOStm << (sal_uInt32)nCurrentPos - mnStreamOfs; + m_rOStm.WriteUInt32( (sal_uInt32)nCurrentPos - mnStreamOfs ); m_rOStm.Seek( nCurrentPos ); - m_rOStm << (sal_uInt32)1; - m_rOStm << nResolutionUnit; + m_rOStm.WriteUInt32( (sal_uInt32)1 ); + m_rOStm.WriteUInt32( nResolutionUnit ); } // ------------------------------------------------------------------------ @@ -472,12 +472,12 @@ void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt { mnTagCount++; - m_rOStm << nTagID; - m_rOStm << nDataType; - m_rOStm << nNumberOfItems; + m_rOStm.WriteUInt16( nTagID ); + m_rOStm.WriteUInt16( nDataType ); + m_rOStm.WriteUInt32( nNumberOfItems ); if ( nDataType == 3 ) nValue <<=16; // in Big Endian Mode WORDS needed to be shifted to a DWORD - m_rOStm << nValue; + m_rOStm.WriteUInt32( nValue ); } // ------------------------------------------------------------------------ @@ -488,13 +488,13 @@ inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen ) nOffset -= nCodeLen; while ( nOffset < 24 ) { - m_rOStm << (sal_uInt8)( dwShift >> 24 ); + m_rOStm.WriteUChar( (sal_uInt8)( dwShift >> 24 ) ); dwShift <<= 8; nOffset += 8; } if ( nCode == 257 && nOffset != 32 ) { - m_rOStm << (sal_uInt8)( dwShift >> 24 ); + m_rOStm.WriteUChar( (sal_uInt8)( dwShift >> 24 ) ); } } diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 25c8e5e90088..df650d1ef40f 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -124,7 +124,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter { ImplWritePalette(); ImplWriteBody(); - m_rOStm << "\x22XPMENDEXT\x22\x0a};"; + m_rOStm.WriteCharPtr( "\x22XPMENDEXT\x22\x0a};" ); } m_rOStm.SetNumberFormatInt(nOStmOldModus); @@ -149,15 +149,15 @@ sal_Bool XPMWriter::ImplWriteHeader() mnHeight = mpAcc->Height(); if ( mnWidth && mnHeight && mnColors ) { - m_rOStm << "/* XPM */\x0astatic char * image[] = \x0a{\x0a\x22"; + m_rOStm.WriteCharPtr( "/* XPM */\x0astatic char * image[] = \x0a{\x0a\x22" ); ImplWriteNumber( mnWidth ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( mnHeight ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( mnColors ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); ImplWriteNumber( ( mnColors > 26 ) ? 2 : 1 ); - m_rOStm << "\x22,\x0a"; + m_rOStm.WriteCharPtr( "\x22,\x0a" ); } else mbStatus = sal_False; return mbStatus; @@ -173,16 +173,16 @@ void XPMWriter::ImplWritePalette() nTransIndex = mpAcc->GetBestPaletteIndex( BMP_COL_TRANS ); for ( sal_uInt16 i = 0; i < mnColors; i++ ) { - m_rOStm << "\x22"; + m_rOStm.WriteCharPtr( "\x22" ); ImplWritePixel( i ); - m_rOStm << (sal_uInt8)32; + m_rOStm.WriteUChar( (sal_uInt8)32 ); if ( nTransIndex != i ) { ImplWriteColor( i ); - m_rOStm << "\x22,\x0a"; + m_rOStm.WriteCharPtr( "\x22,\x0a" ); } else - m_rOStm << "c none\x22,\x0a"; + m_rOStm.WriteCharPtr( "c none\x22,\x0a" ); } } @@ -193,12 +193,12 @@ void XPMWriter::ImplWriteBody() for ( sal_uLong y = 0; y < mnHeight; y++ ) { ImplCallback( (sal_uInt16)( ( 100 * y ) / mnHeight ) ); // processing output in percent - m_rOStm << (sal_uInt8)0x22; + m_rOStm.WriteUChar( (sal_uInt8)0x22 ); for ( sal_uLong x = 0; x < mnWidth; x++ ) { ImplWritePixel( mpAcc->GetPixelIndex( y, x ) ); } - m_rOStm << "\x22,\x0a"; + m_rOStm.WriteCharPtr( "\x22,\x0a" ); } } @@ -208,7 +208,7 @@ void XPMWriter::ImplWriteBody() void XPMWriter::ImplWriteNumber(sal_Int32 nNumber) { const OString aNum(OString::number(nNumber)); - m_rOStm << aNum.getStr(); + m_rOStm.WriteCharPtr( aNum.getStr() ); } // ------------------------------------------------------------------------ @@ -218,11 +218,11 @@ void XPMWriter::ImplWritePixel( sal_uLong nCol ) const if ( mnColors > 26 ) { sal_uInt8 nDiff = (sal_uInt8) ( nCol / 26 ); - m_rOStm << (sal_uInt8)( nDiff + 'A' ); - m_rOStm << (sal_uInt8)( nCol - ( nDiff*26 ) + 'A' ); + m_rOStm.WriteUChar( (sal_uInt8)( nDiff + 'A' ) ); + m_rOStm.WriteUChar( (sal_uInt8)( nCol - ( nDiff*26 ) + 'A' ) ); } else - m_rOStm << (sal_uInt8)( nCol + 'A' ); + m_rOStm.WriteUChar( (sal_uInt8)( nCol + 'A' ) ); } // ------------------------------------------------------------------------ @@ -232,7 +232,7 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) sal_uLong nTmp; sal_uInt8 j; - m_rOStm << "c #"; // # indicates a following hex value + m_rOStm.WriteCharPtr( "c #" ); // # indicates a following hex value const BitmapColor& rColor = mpAcc->GetPaletteColor( nNumber ); nTmp = ( rColor.GetRed() << 16 ) | ( rColor.GetGreen() << 8 ) | rColor.GetBlue(); for ( signed char i = 20; i >= 0 ; i-=4 ) @@ -241,7 +241,7 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) j += 'A' - 10; else j += '0'; - m_rOStm << j; + m_rOStm.WriteUChar( j ); } } diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 7da240f92059..70cdef846230 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -362,9 +362,9 @@ void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 sal_uInt32 nWPos = nSizeWMF ? 28 : 0; sal_uInt32 nTPos = nSizeTIFF ? 28 + nSizeWMF : 0; - aReplacement << nMagic << nPPos << nPSSize - << nWPos << nSizeWMF - << nTPos << nSizeTIFF; + aReplacement.WriteUInt32( nMagic ).WriteUInt32( nPPos ).WriteUInt32( nPSSize ) + .WriteUInt32( nWPos ).WriteUInt32( nSizeWMF ) + .WriteUInt32( nTPos ).WriteUInt32( nSizeTIFF ); if ( nSizeWMF ) { sal_uInt8* pBuf = new sal_uInt8[ nSizeWMF ]; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index fb74fc4addb3..43ffd67d9644 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2169,14 +2169,14 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) return; } // write (Windows-)BITMAPINFOHEADER: - *(p->pBMP) << ((sal_uInt32)40) << p->nWidth << p->nHeight; - *(p->pBMP) << ((sal_uInt16)1) << p->nBitsPerPixel; - *(p->pBMP) << ((sal_uInt32)0) << ((sal_uInt32)0) << ((sal_uInt32)0) << ((sal_uInt32)0); - *(p->pBMP) << ((sal_uInt32)0) << ((sal_uInt32)0); + (p->pBMP)->WriteUInt32( (sal_uInt32)40 ).WriteUInt32( p->nWidth ).WriteUInt32( p->nHeight ); + (p->pBMP)->WriteUInt16( (sal_uInt16)1 ).WriteUInt16( p->nBitsPerPixel ); + (p->pBMP)->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); + (p->pBMP)->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); // write color table: if (p->nBitsPerPixel<=8) { sal_uInt16 i, nColTabSize=1<<(p->nBitsPerPixel); - for (i=0; i<nColTabSize; i++) *(p->pBMP) << GetPalette0RGB(i); + for (i=0; i<nColTabSize; i++) (p->pBMP)->WriteUInt32( GetPalette0RGB(i) ); } } // OK, now the map data is beeing pushed. Unfortunatly OS2 and BMP diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 0bd10ac6b0ca..782dcfcecaaf 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -99,7 +99,7 @@ using namespace ::com::sun::star; EscherExContainer::EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance ) : rStrm ( rSt ) { - rStrm << (sal_uInt32)( ( 0xf | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) << (sal_uInt32)0; + rStrm.WriteUInt32( (sal_uInt32)( ( 0xf | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) ).WriteUInt32( (sal_uInt32)0 ); nContPos = rStrm.Tell(); } EscherExContainer::~EscherExContainer() @@ -109,7 +109,7 @@ EscherExContainer::~EscherExContainer() if ( nSize ) { rStrm.Seek( nContPos - 4 ); - rStrm << nSize; + rStrm.WriteUInt32( nSize ); rStrm.Seek( nPos ); } } @@ -117,7 +117,7 @@ EscherExContainer::~EscherExContainer() EscherExAtom::EscherExAtom( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance, const sal_uInt8 nVersion ) : rStrm ( rSt ) { - rStrm << (sal_uInt32)( ( nVersion | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) << (sal_uInt32)0; + rStrm.WriteUInt32( (sal_uInt32)( ( nVersion | ( nInstance << 4 ) ) | ( nRecType << 16 ) ) ).WriteUInt32( (sal_uInt32)0 ); nContPos = rStrm.Tell(); } EscherExAtom::~EscherExAtom() @@ -127,7 +127,7 @@ EscherExAtom::~EscherExAtom() if ( nSize ) { rStrm.Seek( nContPos - 4 ); - rStrm << nSize; + rStrm.WriteUInt32( nSize ); rStrm.Seek( nPos ); } } @@ -300,7 +300,7 @@ extern "C" int SAL_CALL EscherPropSortFunc( const void* p1, const void* p2 ) void EscherPropertyContainer::Commit( SvStream& rSt, sal_uInt16 nVersion, sal_uInt16 nRecType ) { - rSt << (sal_uInt16)( ( nCountCount << 4 ) | ( nVersion & 0xf ) ) << nRecType << nCountSize; + rSt.WriteUInt16( (sal_uInt16)( ( nCountCount << 4 ) | ( nVersion & 0xf ) ) ).WriteUInt16( nRecType ).WriteUInt32( nCountSize ); if ( nSortCount ) { qsort( pSortStruct, nSortCount, sizeof( EscherPropSortStruct ), EscherPropSortFunc ); @@ -311,8 +311,8 @@ void EscherPropertyContainer::Commit( SvStream& rSt, sal_uInt16 nVersion, sal_uI sal_uInt32 nPropValue = pSortStruct[ i ].nPropValue; sal_uInt16 nPropId = pSortStruct[ i ].nPropId; - rSt << nPropId - << nPropValue; + rSt.WriteUInt16( nPropId ) + .WriteUInt32( nPropValue ); } if ( bHasComplexData ) { @@ -3005,18 +3005,18 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_uInt16 nElementSize = 8; sal_uInt32 nStreamSize = nElementSize * nElements + 6; SvMemoryStream aOut( nStreamSize ); - aOut << nElements - << nElements - << nElementSize; + aOut.WriteUInt16( nElements ) + .WriteUInt16( nElements ) + .WriteUInt16( nElementSize ); std::vector< EnhancedCustomShapeEquation >::const_iterator aIter( aEquations.begin() ); std::vector< EnhancedCustomShapeEquation >::const_iterator aEnd ( aEquations.end() ); while( aIter != aEnd ) { - aOut << (sal_uInt16)aIter->nOperation - << (sal_Int16)aIter->nPara[ 0 ] - << (sal_Int16)aIter->nPara[ 1 ] - << (sal_Int16)aIter->nPara[ 2 ]; + aOut.WriteUInt16( (sal_uInt16)aIter->nOperation ) + .WriteInt16( (sal_Int16)aIter->nPara[ 0 ] ) + .WriteInt16( (sal_Int16)aIter->nPara[ 1 ] ) + .WriteInt16( (sal_Int16)aIter->nPara[ 2 ] ); ++aIter; } sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ]; @@ -3113,15 +3113,15 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_uInt16 j, nElementSize = 8; sal_uInt32 nStreamSize = nElementSize * nElements + 6; SvMemoryStream aOut( nStreamSize ); - aOut << nElements - << nElements - << nElementSize; + aOut.WriteUInt16( nElements ) + .WriteUInt16( nElements ) + .WriteUInt16( nElementSize ); for( j = 0; j < nElements; j++ ) { sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aGluePoints[ j ].First, aEquationOrder ); sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aGluePoints[ j ].Second, aEquationOrder ); - aOut << X - << Y; + aOut.WriteInt32( X ) + .WriteInt32( Y ); } sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ]; memcpy( pBuf, aOut.GetData(), nStreamSize ); @@ -3155,9 +3155,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_uInt16 nElementSize = 2; sal_uInt32 nStreamSize = nElementSize * nElements + 6; SvMemoryStream aOut( nStreamSize ); - aOut << nElements - << nElements - << nElementSize; + aOut.WriteUInt16( nElements ) + .WriteUInt16( nElements ) + .WriteUInt16( nElementSize ); for ( j = 0; j < nElements; j++ ) { sal_uInt16 nVal = (sal_uInt16)aSegments[ j ].Count; @@ -3242,7 +3242,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } break; } - aOut << nVal; + aOut.WriteUInt16( nVal ); } sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ]; memcpy( pBuf, aOut.GetData(), nStreamSize ); @@ -3287,9 +3287,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_uInt16 nElementSize = 16; sal_uInt32 nStreamSize = nElementSize * nElements + 6; SvMemoryStream aOut( nStreamSize ); - aOut << nElements - << nElements - << nElementSize; + aOut.WriteUInt16( nElements ) + .WriteUInt16( nElements ) + .WriteUInt16( nElementSize ); for ( j = 0; j < nElements; j++ ) { sal_Int32 nLeft = GetValueForEnhancedCustomShapeParameter( aPathTextFrames[ j ].TopLeft.First, aEquationOrder ); @@ -3297,10 +3297,10 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_Int32 nRight = GetValueForEnhancedCustomShapeParameter( aPathTextFrames[ j ].BottomRight.First, aEquationOrder ); sal_Int32 nBottom = GetValueForEnhancedCustomShapeParameter( aPathTextFrames[ j ].BottomRight.Second, aEquationOrder ); - aOut << nLeft - << nTop - << nRight - << nBottom; + aOut.WriteInt32( nLeft ) + .WriteInt32( nTop ) + .WriteInt32( nRight ) + .WriteInt32( nBottom ); } sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ]; memcpy( pBuf, aOut.GetData(), nStreamSize ); @@ -3530,9 +3530,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_uInt16 k, j, nElementSize = 36; sal_uInt32 nStreamSize = nElementSize * nElements + 6; SvMemoryStream aOut( nStreamSize ); - aOut << nElements - << nElements - << nElementSize; + aOut.WriteUInt16( nElements ) + .WriteUInt16( nElements ) + .WriteUInt16( nElementSize ); for ( k = 0; k < nElements; k++ ) { @@ -3678,15 +3678,15 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } } } - aOut << nFlags - << nXPosition - << nYPosition - << nXMap - << nYMap - << nXRangeMin - << nXRangeMax - << nYRangeMin - << nYRangeMax; + aOut.WriteUInt32( nFlags ) + .WriteInt32( nXPosition ) + .WriteInt32( nYPosition ) + .WriteInt32( nXMap ) + .WriteInt32( nYMap ) + .WriteInt32( nXRangeMin ) + .WriteInt32( nXRangeMax ) + .WriteInt32( nYRangeMin ) + .WriteInt32( nYRangeMax ); if ( nFlags & 8 ) nAdjustmentsWhichNeedsToBeConverted |= ( 1 << ( nYPosition - 0x100 ) ); @@ -3737,15 +3737,15 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT sal_uInt16 nElementSize = 8; sal_uInt32 nStreamSize = nElementSize * nElements + 6; SvMemoryStream aOut( nStreamSize ); - aOut << nElements - << nElements - << nElementSize; + aOut.WriteUInt16( nElements ) + .WriteUInt16( nElements ) + .WriteUInt16( nElementSize ); for( j = 0; j < nElements; j++ ) { sal_Int32 X = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].First, aEquationOrder, sal_True ); sal_Int32 Y = GetValueForEnhancedCustomShapeParameter( aCoordinates[ j ].Second, aEquationOrder, sal_True ); - aOut << X - << Y; + aOut.WriteInt32( X ) + .WriteInt32( Y ); } sal_uInt8* pBuf = new sal_uInt8[ nStreamSize ]; memcpy( pBuf, aOut.GetData(), nStreamSize ); @@ -4023,21 +4023,21 @@ EscherBlibEntry::EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject || pGraphicAttr->IsAdjusted() ) { SvMemoryStream aSt( sizeof( GraphicAttr ) ); - aSt << static_cast<sal_uInt16>(pGraphicAttr->GetDrawMode()) - << static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags()) - << static_cast<sal_Int32>(pGraphicAttr->GetLeftCrop()) - << static_cast<sal_Int32>(pGraphicAttr->GetTopCrop()) - << static_cast<sal_Int32>(pGraphicAttr->GetRightCrop()) - << static_cast<sal_Int32>(pGraphicAttr->GetBottomCrop()) - << pGraphicAttr->GetRotation() - << pGraphicAttr->GetLuminance() - << pGraphicAttr->GetContrast() - << pGraphicAttr->GetChannelR() - << pGraphicAttr->GetChannelG() - << pGraphicAttr->GetChannelB() - << pGraphicAttr->GetGamma() - << (sal_Bool)( pGraphicAttr->IsInvert() == sal_True ) - << pGraphicAttr->GetTransparency(); + aSt.WriteUInt16( static_cast<sal_uInt16>(pGraphicAttr->GetDrawMode()) ) + .WriteUInt32( static_cast<sal_uInt32>(pGraphicAttr->GetMirrorFlags()) ) + .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetLeftCrop()) ) + .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetTopCrop()) ) + .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetRightCrop()) ) + .WriteInt32( static_cast<sal_Int32>(pGraphicAttr->GetBottomCrop()) ) + .WriteUInt16( pGraphicAttr->GetRotation() ) + .WriteInt16( pGraphicAttr->GetLuminance() ) + .WriteInt16( pGraphicAttr->GetContrast() ) + .WriteInt16( pGraphicAttr->GetChannelR() ) + .WriteInt16( pGraphicAttr->GetChannelG() ) + .WriteInt16( pGraphicAttr->GetChannelB() ) + << pGraphicAttr->GetGamma(); + aSt.WriteUChar( (sal_Bool)( pGraphicAttr->IsInvert() == sal_True ) ) + .WriteUChar( pGraphicAttr->GetTransparency() ); mnIdentifier[ 1 ] = rtl_crc32( 0, aSt.GetData(), aSt.Tell() ); } else @@ -4064,26 +4064,26 @@ void EscherBlibEntry::WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffse { sal_uInt32 nPictureOffset = ( bWritePictureOffset ) ? mnPictureOffset : 0; - rSt << (sal_uInt32)( ( ESCHER_BSE << 16 ) | ( ( (sal_uInt16)meBlibType << 4 ) | 2 ) ) - << (sal_uInt32)( 36 + nResize ) - << (sal_uInt8)meBlibType; + rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_BSE << 16 ) | ( ( (sal_uInt16)meBlibType << 4 ) | 2 ) ) ) + .WriteUInt32( (sal_uInt32)( 36 + nResize ) ) + .WriteUChar( (sal_uInt8)meBlibType ); switch ( meBlibType ) { case EMF : case WMF : // converting EMF/WMF on OS2 to Pict - rSt << (sal_uInt8)PICT; + rSt.WriteUChar( (sal_uInt8)PICT ); break; default: - rSt << (sal_uInt8)meBlibType; + rSt.WriteUChar( (sal_uInt8)meBlibType ); }; rSt.Write( &mnIdentifier[ 0 ], 16 ); - rSt << (sal_uInt16)0 - << (sal_uInt32)( mnSize + mnSizeExtra ) - << mnRefCount - << nPictureOffset - << (sal_uInt32)0; + rSt.WriteUInt16( (sal_uInt16)0 ) + .WriteUInt32( (sal_uInt32)( mnSize + mnSizeExtra ) ) + .WriteUInt32( mnRefCount ) + .WriteUInt32( nPictureOffset ) + .WriteUInt32( (sal_uInt32)0 ); } EscherBlibEntry::~EscherBlibEntry() @@ -4165,8 +4165,8 @@ void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pM sal_uInt32 nSize = GetBlibStoreContainerSize( pMergePicStreamBSE ); if ( nSize ) { - rSt << (sal_uInt32)( ( ESCHER_BstoreContainer << 16 ) | 0x1f ) - << (sal_uInt32)( nSize - 8 ); + rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_BstoreContainer << 16 ) | 0x1f ) ) + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ); if ( pMergePicStreamBSE ) { @@ -4187,16 +4187,16 @@ void EscherGraphicProvider::WriteBlibStoreContainer( SvStream& rSt, SvStream* pM sal_uInt16 n16; // record version and instance *pMergePicStreamBSE >> n16; - rSt << n16; + rSt.WriteUInt16( n16 ); // record type *pMergePicStreamBSE >> n16; - rSt << sal_uInt16( ESCHER_BlipFirst + nBlibType ); + rSt.WriteUInt16( sal_uInt16( ESCHER_BlipFirst + nBlibType ) ); DBG_ASSERT( n16 == ESCHER_BlipFirst + nBlibType , "EscherGraphicProvider::WriteBlibStoreContainer: BLIP record types differ" ); sal_uInt32 n32; // record size *pMergePicStreamBSE >> n32; nBlipSize -= 8; - rSt << nBlipSize; + rSt.WriteUInt32( nBlipSize ); DBG_ASSERT( nBlipSize == n32, "EscherGraphicProvider::WriteBlibStoreContainer: BLIP sizes differ" ); // record while ( nBlipSize ) @@ -4356,17 +4356,17 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin if ( mnFlags & _E_GRAPH_PROV_USE_INSTANCES ) { - rPicOutStrm << (sal_uInt32)( 0x7f90000 | (sal_uInt16)( mnBlibEntrys << 4 ) ) - << (sal_uInt32)0; + rPicOutStrm.WriteUInt32( (sal_uInt32)( 0x7f90000 | (sal_uInt16)( mnBlibEntrys << 4 ) ) ) + .WriteUInt32( (sal_uInt32)0 ); nAtomSize = rPicOutStrm.Tell(); if ( eBlibType == PNG ) - rPicOutStrm << (sal_uInt16)0x0606; + rPicOutStrm.WriteUInt16( (sal_uInt16)0x0606 ); else if ( eBlibType == WMF ) - rPicOutStrm << (sal_uInt16)0x0403; + rPicOutStrm.WriteUInt16( (sal_uInt16)0x0403 ); else if ( eBlibType == EMF ) - rPicOutStrm << (sal_uInt16)0x0402; + rPicOutStrm.WriteUInt16( (sal_uInt16)0x0402 ); else if ( eBlibType == PEG ) - rPicOutStrm << (sal_uInt16)0x0505; + rPicOutStrm.WriteUInt16( (sal_uInt16)0x0505 ); } // fdo#69607 do not compress WMF files if we are in OOXML export if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) || @@ -4375,9 +4375,9 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin nExtra = 17; p_EscherBlibEntry->mnSizeExtra = nExtra + 8; nInstance = ( eBlibType == PNG ) ? 0xf01e6e00 : 0xf01d46a0; - rPicOutStrm << nInstance << (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra ); + rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32( (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra ) ); rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 ); - rPicOutStrm << (sal_uInt8)0xff; + rPicOutStrm.WriteUChar( (sal_uInt8)0xff ); rPicOutStrm.Write( pGraphicAry, p_EscherBlibEntry->mnSize ); } else @@ -4395,7 +4395,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin nExtra = eBlibType == WMF ? 0x42 : 0x32; // !EMF -> no change p_EscherBlibEntry->mnSizeExtra = nExtra + 8; nInstance = ( eBlibType == WMF ) ? 0xf01b2170 : 0xf01a3d40; // !EMF -> no change - rPicOutStrm << nInstance << (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra ); + rPicOutStrm.WriteUInt32( nInstance ).WriteUInt32( (sal_uInt32)( p_EscherBlibEntry->mnSize + nExtra ) ); if ( eBlibType == WMF ) // !EMF -> no change rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 ); rPicOutStrm.Write( p_EscherBlibEntry->mnIdentifier, 16 ); @@ -4425,15 +4425,15 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin nWidth = aPrefSize.Width() * 360; nHeight = aPrefSize.Height() * 360; } - rPicOutStrm << nUncompressedSize // WMFSize without FileHeader - << (sal_Int32)0 // since we can't find out anymore what the original size of - << (sal_Int32)0 // the WMF (without Fileheader) was we write 10cm / x - << nPrefWidth - << nPrefHeight - << nWidth - << nHeight - << p_EscherBlibEntry->mnSize - << (sal_uInt16)0xfe00; // compression Flags + rPicOutStrm.WriteUInt32( nUncompressedSize ) // WMFSize without FileHeader + .WriteInt32( (sal_Int32)0 ) // since we can't find out anymore what the original size of + .WriteInt32( (sal_Int32)0 ) // the WMF (without Fileheader) was we write 10cm / x + .WriteUInt32( nPrefWidth ) + .WriteUInt32( nPrefHeight ) + .WriteUInt32( nWidth ) + .WriteUInt32( nHeight ) + .WriteUInt32( p_EscherBlibEntry->mnSize ) + .WriteUInt16( (sal_uInt16)0xfe00 ); // compression Flags rPicOutStrm.Write( pGraphicAry, p_EscherBlibEntry->mnSize ); } } @@ -4441,7 +4441,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, const OStrin { sal_uInt32 nPos = rPicOutStrm.Tell(); rPicOutStrm.Seek( nAtomSize - 4 ); - rPicOutStrm << (sal_uInt32)( nPos - nAtomSize ); + rPicOutStrm.WriteUInt32( (sal_uInt32)( nPos - nAtomSize ) ); rPicOutStrm.Seek( nPos ); } nBlibId = ImplInsertBlib( p_EscherBlibEntry ), p_EscherBlibEntry = NULL; @@ -4764,9 +4764,9 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) if ( nCount ) { sal_uInt32 nRecHdPos, nCurrentPos, nSize; - rStrm << (sal_uInt16)( ( nCount << 4 ) | 0xf ) // open an ESCHER_SolverContainer - << (sal_uInt16)ESCHER_SolverContainer // - << (sal_uInt32)0; // + rStrm .WriteUInt16( (sal_uInt16)( ( nCount << 4 ) | 0xf ) ) // open an ESCHER_SolverContainer + .WriteUInt16( (sal_uInt16)ESCHER_SolverContainer ) // + .WriteUInt32( (sal_uInt32)0 ); // nRecHdPos = rStrm.Tell() - 4; @@ -4787,14 +4787,14 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) if ( aConnectorRule.nShapeB ) aConnectorRule.ncptiB = pPtr->GetConnectorRule( sal_False ); } - rStrm << (sal_uInt32)( ( ESCHER_ConnectorRule << 16 ) | 1 ) // atom hd - << (sal_uInt32)24 // - << aConnectorRule.nRuleId - << aConnectorRule.nShapeA - << aConnectorRule.nShapeB - << aConnectorRule.nShapeC - << aConnectorRule.ncptiA - << aConnectorRule.ncptiB; + rStrm .WriteUInt32( (sal_uInt32)( ( ESCHER_ConnectorRule << 16 ) | 1 ) ) // atom hd + .WriteUInt32( (sal_uInt32)24 ) // + .WriteUInt32( aConnectorRule.nRuleId ) + .WriteUInt32( aConnectorRule.nShapeA ) + .WriteUInt32( aConnectorRule.nShapeB ) + .WriteUInt32( aConnectorRule.nShapeC ) + .WriteUInt32( aConnectorRule.ncptiA ) + .WriteUInt32( aConnectorRule.ncptiB ); aConnectorRule.nRuleId += 2; } @@ -4802,7 +4802,7 @@ void EscherSolverContainer::WriteSolver( SvStream& rStrm ) nCurrentPos = rStrm.Tell(); // close the ESCHER_SolverContainer nSize = ( nCurrentPos - nRecHdPos ) - 4;// rStrm.Seek( nRecHdPos ); // - rStrm << nSize; // + rStrm.WriteUInt32( nSize ); // rStrm.Seek( nCurrentPos ); // } } @@ -4896,7 +4896,7 @@ void EscherExGlobal::WriteDggAtom( SvStream& rStrm ) const sal_uInt32 nDggSize = GetDggAtomSize(); // write the DGG record header (do not include the 8 bytes of the header in the data size) - rStrm << static_cast< sal_uInt32 >( ESCHER_Dgg << 16 ) << static_cast< sal_uInt32 >( nDggSize - 8 ); + rStrm.WriteUInt32( static_cast< sal_uInt32 >( ESCHER_Dgg << 16 ) ).WriteUInt32( static_cast< sal_uInt32 >( nDggSize - 8 ) ); // claculate and write the fixed DGG data sal_uInt32 nShapeCount = 0; @@ -4909,11 +4909,11 @@ void EscherExGlobal::WriteDggAtom( SvStream& rStrm ) const // the non-existing cluster with index #0 is counted too sal_uInt32 nClusterCount = static_cast< sal_uInt32 >( maClusterTable.size() + 1 ); sal_uInt32 nDrawingCount = static_cast< sal_uInt32 >( maDrawingInfos.size() ); - rStrm << nLastShapeId << nClusterCount << nShapeCount << nDrawingCount; + rStrm.WriteUInt32( nLastShapeId ).WriteUInt32( nClusterCount ).WriteUInt32( nShapeCount ).WriteUInt32( nDrawingCount ); // write the cluster table for( ClusterTable::const_iterator aIt = maClusterTable.begin(), aEnd = maClusterTable.end(); aIt != aEnd; ++aIt ) - rStrm << aIt->mnDrawingId << aIt->mnNextShapeId; + rStrm.WriteUInt32( aIt->mnDrawingId ).WriteUInt32( aIt->mnNextShapeId ); } SvStream* EscherExGlobal::QueryPictureStream() @@ -5041,7 +5041,7 @@ void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom ) if ( (nCurPos < nEndOfRecord) || ((nCurPos == nEndOfRecord) && (bContainer || bExpandEndOfAtom)) ) { mpOutStrm->SeekRel( -4 ); - *mpOutStrm << (sal_uInt32)( nSize + nBytes ); + mpOutStrm->WriteUInt32( (sal_uInt32)( nSize + nBytes ) ); if ( !bContainer ) mpOutStrm->SeekRel( nSize ); } @@ -5111,7 +5111,7 @@ sal_Bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ) sal_Bool bRetValue = SeekToPersistOffset( nKey ); if ( bRetValue ) { - *mpOutStrm << nValue; + mpOutStrm->WriteUInt32( nValue ); mpOutStrm->Seek( nOldPos ); } return bRetValue; @@ -5119,7 +5119,7 @@ sal_Bool EscherEx::InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ) void EscherEx::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance ) { - *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) << nEscherContainer << (sal_uInt32)0; + mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( nEscherContainer ).WriteUInt32( (sal_uInt32)0 ); mOffsets.push_back( mpOutStrm->Tell() - 4 ); mRecTypes.push_back( nEscherContainer ); switch( nEscherContainer ) @@ -5147,8 +5147,8 @@ void EscherEx::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance ) mnCurrentDg = mxGlobal->GenerateDrawingId(); AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg ); PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() ); - *mpOutStrm << (sal_uInt32)0 // The number of shapes in this drawing - << (sal_uInt32)0; // The last MSOSPID given to an SP in this DG + mpOutStrm->WriteUInt32( (sal_uInt32)0 ) // The number of shapes in this drawing + .WriteUInt32( (sal_uInt32)0 ); // The last MSOSPID given to an SP in this DG } } } @@ -5178,7 +5178,7 @@ void EscherEx::CloseContainer() sal_uInt32 nSize, nPos = mpOutStrm->Tell(); nSize = ( nPos - mOffsets.back() ) - 4; mpOutStrm->Seek( mOffsets.back() ); - *mpOutStrm << nSize; + mpOutStrm->WriteUInt32( nSize ); switch( mRecTypes.back() ) { @@ -5188,7 +5188,7 @@ void EscherEx::CloseContainer() { mbEscherDg = sal_False; if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) ) - *mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg ); + mpOutStrm->WriteUInt32( mxGlobal->GetDrawingShapeCount( mnCurrentDg ) ).WriteUInt32( mxGlobal->GetLastShapeId( mnCurrentDg ) ); } } break; @@ -5214,7 +5214,7 @@ void EscherEx::CloseContainer() void EscherEx::BeginAtom() { mnCountOfs = mpOutStrm->Tell(); - *mpOutStrm << (sal_uInt32)0 << (sal_uInt32)0; // record header wird spaeter geschrieben + mpOutStrm->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); // record header wird spaeter geschrieben } void EscherEx::EndAtom( sal_uInt16 nRecType, int nRecVersion, int nRecInstance ) @@ -5222,31 +5222,31 @@ void EscherEx::EndAtom( sal_uInt16 nRecType, int nRecVersion, int nRecInstance ) sal_uInt32 nOldPos = mpOutStrm->Tell(); mpOutStrm->Seek( mnCountOfs ); sal_uInt32 nSize = nOldPos - mnCountOfs; - *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) << nRecType << (sal_uInt32)( nSize - 8 ); + mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) ).WriteUInt16( nRecType ).WriteUInt32( (sal_uInt32)( nSize - 8 ) ); mpOutStrm->Seek( nOldPos ); } void EscherEx::AddAtom( sal_uInt32 nAtomSize, sal_uInt16 nRecType, int nRecVersion, int nRecInstance ) { - *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) << nRecType << nAtomSize; + mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | ( nRecVersion & 0xf ) ) ).WriteUInt16( nRecType ).WriteUInt32( nAtomSize ); } void EscherEx::AddChildAnchor( const Rectangle& rRect ) { AddAtom( 16, ESCHER_ChildAnchor ); - *mpOutStrm << (sal_Int32)rRect.Left() - << (sal_Int32)rRect.Top() - << (sal_Int32)rRect.Right() - << (sal_Int32)rRect.Bottom(); + mpOutStrm ->WriteInt32( (sal_Int32)rRect.Left() ) + .WriteInt32( (sal_Int32)rRect.Top() ) + .WriteInt32( (sal_Int32)rRect.Right() ) + .WriteInt32( (sal_Int32)rRect.Bottom() ); } void EscherEx::AddClientAnchor( const Rectangle& rRect ) { AddAtom( 8, ESCHER_ClientAnchor ); - *mpOutStrm << (sal_Int16)rRect.Top() - << (sal_Int16)rRect.Left() - << (sal_Int16)( rRect.GetWidth() + rRect.Left() ) - << (sal_Int16)( rRect.GetHeight() + rRect.Top() ); + mpOutStrm->WriteInt16( (sal_Int16)rRect.Top() ) + .WriteInt16( (sal_Int16)rRect.Left() ) + .WriteInt16( (sal_Int16)( rRect.GetWidth() + rRect.Left() ) ) + .WriteInt16( (sal_Int16)( rRect.GetHeight() + rRect.Top() ) ); } EscherExHostAppData* EscherEx::EnterAdditionalTextGroup() @@ -5265,10 +5265,10 @@ sal_uInt32 EscherEx::EnterGroup( const OUString& rShapeName, const Rectangle* pB AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (sal_Int32)aRect.Left() // Bounding box for the grouped shapes to which they will be attached - << (sal_Int32)aRect.Top() - << (sal_Int32)aRect.Right() - << (sal_Int32)aRect.Bottom(); + mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) // Bounding box for the grouped shapes to which they will be attached + .WriteInt32( (sal_Int32)aRect.Top() ) + .WriteInt32( (sal_Int32)aRect.Right() ) + .WriteInt32( (sal_Int32)aRect.Bottom() ); sal_uInt32 nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) @@ -5315,10 +5315,10 @@ sal_Bool EscherEx::SetGroupSnapRect( sal_uInt32 nGroupLevel, const Rectangle& rR sal_uInt32 nCurrentPos = mpOutStrm->Tell(); if ( DoSeek( ESCHER_Persist_Grouping_Snap | ( nGroupLevel - 1 ) ) ) { - *mpOutStrm << (sal_Int32)rRect.Left() // Bounding box for the grouped shapes to which they will be attached - << (sal_Int32)rRect.Top() - << (sal_Int32)rRect.Right() - << (sal_Int32)rRect.Bottom(); + mpOutStrm ->WriteInt32( (sal_Int32)rRect.Left() ) // Bounding box for the grouped shapes to which they will be attached + .WriteInt32( (sal_Int32)rRect.Top() ) + .WriteInt32( (sal_Int32)rRect.Right() ) + .WriteInt32( (sal_Int32)rRect.Bottom() ); mpOutStrm->Seek( nCurrentPos ); } } @@ -5333,7 +5333,7 @@ sal_Bool EscherEx::SetGroupLogicRect( sal_uInt32 nGroupLevel, const Rectangle& r sal_uInt32 nCurrentPos = mpOutStrm->Tell(); if ( DoSeek( ESCHER_Persist_Grouping_Logic | ( nGroupLevel - 1 ) ) ) { - *mpOutStrm << (sal_Int16)rRect.Top() << (sal_Int16)rRect.Left() << (sal_Int16)rRect.Right() << (sal_Int16)rRect.Bottom(); + mpOutStrm->WriteInt16( (sal_Int16)rRect.Top() ).WriteInt16( (sal_Int16)rRect.Left() ).WriteInt16( (sal_Int16)rRect.Right() ).WriteInt16( (sal_Int16)rRect.Bottom() ); mpOutStrm->Seek( nCurrentPos ); } } @@ -5360,7 +5360,7 @@ void EscherEx::AddShape( sal_uInt32 nShpInstance, sal_uInt32 nFlags, sal_uInt32 if ( mnGroupLevel > 1 ) nFlags |= 2; // this not a topmost shape } - *mpOutStrm << nShapeID << nFlags; + mpOutStrm->WriteUInt32( nShapeID ).WriteUInt32( nFlags ); } void EscherEx::Commit( EscherPropertyContainer& rProps, const Rectangle& ) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 42c4b4ef4a69..7ec4f1d71867 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -152,17 +152,17 @@ static sal_uInt32 nMSOleObjCntr = 0; void Impl_OlePres::Write( SvStream & rStm ) { WriteClipboardFormat( rStm, FORMAT_GDIMETAFILE ); - rStm << (sal_Int32)(nJobLen +4); // a TargetDevice that's always empty + rStm.WriteInt32( (sal_Int32)(nJobLen +4) ); // a TargetDevice that's always empty if( nJobLen ) rStm.Write( pJob, nJobLen ); - rStm << (sal_uInt32)nAspect; - rStm << (sal_Int32)-1; //L-Index always -1 - rStm << (sal_Int32)nAdvFlags; - rStm << (sal_Int32)0; //Compression - rStm << (sal_Int32)aSize.Width(); - rStm << (sal_Int32)aSize.Height(); + rStm.WriteUInt32( (sal_uInt32)nAspect ); + rStm.WriteInt32( (sal_Int32)-1 ); //L-Index always -1 + rStm.WriteInt32( (sal_Int32)nAdvFlags ); + rStm.WriteInt32( (sal_Int32)0 ); //Compression + rStm.WriteInt32( (sal_Int32)aSize.Width() ); + rStm.WriteInt32( (sal_Int32)aSize.Height() ); sal_uLong nPos = rStm.Tell(); - rStm << (sal_Int32)0; + rStm.WriteInt32( (sal_Int32)0 ); if( GetFormat() == FORMAT_GDIMETAFILE && pMtf ) { @@ -194,7 +194,7 @@ void Impl_OlePres::Write( SvStream & rStm ) } sal_uLong nEndPos = rStm.Tell(); rStm.Seek( nPos ); - rStm << (sal_uInt32)(nEndPos - nPos - 4); + rStm.WriteUInt32( (sal_uInt32)(nEndPos - nPos - 4) ); rStm.Seek( nEndPos ); } @@ -6648,7 +6648,7 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, rStm.Read( pData, nDataLen ); // write to ole10 stream - *xOle10Stm << nDataLen; + xOle10Stm->WriteUInt32( nDataLen ); xOle10Stm->Write( pData, nDataLen ); xOle10Stm = SotStorageStreamRef(); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 750316a9c0dd..3d047a03a9d2 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2025,8 +2025,8 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt rStCtrl.Seek( pPersistPtr[ nPersistPtr ] ); rStCtrl >> *pHd; - *xOriginal << nIDoNotKnow1 - << nIDoNotKnow2; + xOriginal->WriteUInt32( nIDoNotKnow1 ) + .WriteUInt32( nIDoNotKnow2 ); sal_uInt32 nToCopy, nBufSize; nToCopy = pHd->nRecLen; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 41db3c0644e0..4f13f68d8202 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -768,7 +768,7 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const // Header ScMultipleWriteHeader aHdr( rStream ); - rStream << nDdeCount; + rStream.WriteUInt16( nDdeCount ); // Links speichern diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index a6dbe6e6dc12..c8c0b4ecc335 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -178,7 +178,7 @@ SfxPoolItem* ScPatternAttr::Create( SvStream& rStream, sal_uInt16 /* nVersion */ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) const { - rStream << (sal_Bool)sal_True; + rStream.WriteUChar( (sal_Bool)sal_True ); if ( pStyle ) rStream.WriteUniOrByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); @@ -188,7 +188,7 @@ SvStream& ScPatternAttr::Store(SvStream& rStream, sal_uInt16 /* nItemVersion */) rStream.WriteUniOrByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), rStream.GetStreamCharSet() ); - rStream << (short)SFX_STYLE_FAMILY_PARA; // wg. altem Dateiformat + rStream.WriteInt16( (short)SFX_STYLE_FAMILY_PARA ); // wg. altem Dateiformat GetItemSet().Store( rStream ); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 924458a89187..3e8f9152b338 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -107,7 +107,7 @@ namespace SvStream& operator<<(SvStream &stream, AutoFormatSwBlob &blob) { const sal_uInt64 endOfBlob = stream.Tell() + sizeof(sal_uInt64) + blob.size; - stream << endOfBlob; + stream.WriteUInt64( endOfBlob ); if (blob.size) stream.Write(blob.pData, blob.size); @@ -176,33 +176,33 @@ void ScAfVersions::Load( SvStream& rStream, sal_uInt16 nVer ) void ScAfVersions::Write(SvStream& rStream, sal_uInt16 fileVersion) { - rStream << SvxFontItem(ATTR_FONT).GetVersion(fileVersion); - rStream << SvxFontHeightItem(240, 100, ATTR_FONT_HEIGHT).GetVersion(fileVersion); - rStream << SvxWeightItem(WEIGHT_NORMAL, ATTR_FONT_WEIGHT).GetVersion(fileVersion); - rStream << SvxPostureItem(ITALIC_NONE, ATTR_FONT_POSTURE).GetVersion(fileVersion); - rStream << SvxUnderlineItem(UNDERLINE_NONE, ATTR_FONT_UNDERLINE).GetVersion(fileVersion); - rStream << SvxOverlineItem(UNDERLINE_NONE, ATTR_FONT_OVERLINE).GetVersion(fileVersion); - rStream << SvxCrossedOutItem(STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT).GetVersion(fileVersion); - rStream << SvxContourItem(false, ATTR_FONT_CONTOUR).GetVersion(fileVersion); - rStream << SvxShadowedItem(false, ATTR_FONT_SHADOWED).GetVersion(fileVersion); - rStream << SvxColorItem(ATTR_FONT_COLOR).GetVersion(fileVersion); - rStream << SvxBoxItem(ATTR_BORDER).GetVersion(fileVersion); - rStream << SvxLineItem(SID_FRAME_LINESTYLE).GetVersion(fileVersion); - rStream << SvxBrushItem(ATTR_BACKGROUND).GetVersion(fileVersion); - - rStream << SvxAdjustItem(SVX_ADJUST_LEFT, 0).GetVersion(fileVersion); + rStream.WriteUInt16( SvxFontItem(ATTR_FONT).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxFontHeightItem(240, 100, ATTR_FONT_HEIGHT).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxWeightItem(WEIGHT_NORMAL, ATTR_FONT_WEIGHT).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxPostureItem(ITALIC_NONE, ATTR_FONT_POSTURE).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxUnderlineItem(UNDERLINE_NONE, ATTR_FONT_UNDERLINE).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxOverlineItem(UNDERLINE_NONE, ATTR_FONT_OVERLINE).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxCrossedOutItem(STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxContourItem(false, ATTR_FONT_CONTOUR).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxShadowedItem(false, ATTR_FONT_SHADOWED).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxColorItem(ATTR_FONT_COLOR).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxBoxItem(ATTR_BORDER).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxLineItem(SID_FRAME_LINESTYLE).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxBrushItem(ATTR_BACKGROUND).GetVersion(fileVersion) ); + + rStream.WriteUInt16( SvxAdjustItem(SVX_ADJUST_LEFT, 0).GetVersion(fileVersion) ); if (fileVersion >= SOFFICE_FILEFORMAT_50) rStream << swVersions; - rStream << SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY).GetVersion(fileVersion); - rStream << SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY).GetVersion(fileVersion); - rStream << SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0).GetVersion(fileVersion); - rStream << SvxMarginItem(ATTR_MARGIN).GetVersion(fileVersion); - rStream << SfxBoolItem(ATTR_LINEBREAK).GetVersion(fileVersion); - rStream << SfxInt32Item(ATTR_ROTATE_VALUE).GetVersion(fileVersion); - rStream << SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD,0).GetVersion(fileVersion); + rStream.WriteUInt16( SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxVerJustifyItem(SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxMarginItem(ATTR_MARGIN).GetVersion(fileVersion) ); + rStream.WriteUInt16( SfxBoolItem(ATTR_LINEBREAK).GetVersion(fileVersion) ); + rStream.WriteUInt16( SfxInt32Item(ATTR_ROTATE_VALUE).GetVersion(fileVersion) ); + rStream.WriteUInt16( SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD,0).GetVersion(fileVersion) ); - rStream << (sal_uInt16)0; // Num-Format + rStream.WriteUInt16( (sal_uInt16)0 ); // Num-Format } ScAutoFormatDataField::ScAutoFormatDataField() : @@ -792,17 +792,17 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion) { sal_uInt16 nVal = AUTOFORMAT_DATA_ID; sal_Bool b; - rStream << nVal; + rStream.WriteUInt16( nVal ); // --- from 680/dr25 on: store strings as UTF-8 write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, aName, RTL_TEXTENCODING_UTF8); - rStream << nStrResId; - rStream << ( b = bIncludeFont ); - rStream << ( b = bIncludeJustify ); - rStream << ( b = bIncludeFrame ); - rStream << ( b = bIncludeBackground ); - rStream << ( b = bIncludeValueFormat ); - rStream << ( b = bIncludeWidthHeight ); + rStream.WriteUInt16( nStrResId ); + rStream.WriteUChar( ( b = bIncludeFont ) ); + rStream.WriteUChar( ( b = bIncludeJustify ) ); + rStream.WriteUChar( ( b = bIncludeFrame ) ); + rStream.WriteUChar( ( b = bIncludeBackground ) ); + rStream.WriteUChar( ( b = bIncludeValueFormat ) ); + rStream.WriteUChar( ( b = bIncludeWidthHeight ) ); if (fileVersion >= SOFFICE_FILEFORMAT_50) rStream << m_swFields; @@ -1084,15 +1084,15 @@ bool ScAutoFormat::Save() // Attention: A common header has to be saved sal_uInt16 nVal = AUTOFORMAT_ID; - rStream << nVal - << (sal_uInt8)2 // Number of chars of the header including this - << (sal_uInt8)::GetSOStoreTextEncoding( - osl_getThreadTextEncoding() ); + rStream.WriteUInt16( nVal ) + .WriteUChar( (sal_uInt8)2 ) // Number of chars of the header including this + .WriteUChar( (sal_uInt8)::GetSOStoreTextEncoding( + osl_getThreadTextEncoding() ) ); m_aVersions.Write(rStream, fileVersion); bRet &= (rStream.GetError() == 0); - rStream << (sal_uInt16)(maData.size() - 1); + rStream.WriteUInt16( (sal_uInt16)(maData.size() - 1) ); bRet &= (rStream.GetError() == 0); MapType::iterator it = maData.begin(), itEnd = maData.end(); if (it != itEnd) diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index d79653ac6966..522ec5ddb9da 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -110,10 +110,10 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const rStream.WriteUniOrByteString( aItem, eCharSet ); sal_Bool bHasValue = ( pResult != 0 ); - rStream << bHasValue; + rStream.WriteUChar( bHasValue ); if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export - rStream << nMode; // seit 388b + rStream.WriteUChar( nMode ); // seit 388b // Links mit Mode != SC_DDE_DEFAULT werden bei 4.0 Export komplett weggelassen // (aus ScDocument::SaveDdeLinks) diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 606941aaa6c3..87590aaa3ec9 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -110,7 +110,7 @@ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nD aMemStream( 4096, 4096 ) { nDataSize = nDefault; - rStream << nDataSize; + rStream.WriteUInt32( nDataSize ); nDataPos = rStream.Tell(); nEntryStart = nDataPos; @@ -120,8 +120,8 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() { sal_uLong nDataEnd = rStream.Tell(); - rStream << (sal_uInt16) SCID_SIZES; - rStream << static_cast<sal_uInt32>(aMemStream.Tell()); + rStream.WriteUInt16( (sal_uInt16) SCID_SIZES ); + rStream.WriteUInt32( static_cast<sal_uInt32>(aMemStream.Tell()) ); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); if ( nDataEnd - nDataPos != nDataSize ) // matched default ? @@ -129,7 +129,7 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() nDataSize = nDataEnd - nDataPos; sal_uLong nPos = rStream.Tell(); rStream.Seek(nDataPos-sizeof(sal_uInt32)); - rStream << nDataSize; // record size at the beginning + rStream.WriteUInt32( nDataSize ); // record size at the beginning rStream.Seek(nPos); } } @@ -137,7 +137,7 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() void ScMultipleWriteHeader::EndEntry() { sal_uLong nPos = rStream.Tell(); - aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart); + aMemStream.WriteUInt32( static_cast<sal_uInt32>(nPos - nEntryStart) ); } void ScMultipleWriteHeader::StartEntry() diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 7dc049b0ef50..27abc627713a 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -58,7 +58,7 @@ void ScNumFormatAbbrev::Load( SvStream& rStream, rtl_TextEncoding eByteStrSet ) void ScNumFormatAbbrev::Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const { rStream.WriteUniOrByteString( sFormatstring, eByteStrSet ); - rStream << (sal_uInt16) eSysLnge << (sal_uInt16) eLnge; + rStream.WriteUInt16( (sal_uInt16) eSysLnge ).WriteUInt16( (sal_uInt16) eLnge ); } void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat, diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 9be1ad212564..da9a27996cc8 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -173,9 +173,9 @@ void XclExpSstImpl::Save( XclExpStream& rStrm ) // write bucket info before string to get correct record position sal_uInt32 nStrmPos = static_cast< sal_uInt32 >( rStrm.GetSvStreamPos() ); sal_uInt16 nRecPos = rStrm.GetRawRecPos() + 4; - aExtSst << nStrmPos // stream position - << nRecPos // position from start of SST or CONTINUE - << sal_uInt16( 0 ); // reserved + aExtSst.WriteUInt32( nStrmPos ) // stream position + .WriteUInt16( nRecPos ) // position from start of SST or CONTINUE + .WriteUInt16( sal_uInt16( 0 ) ); // reserved } rStrm << **aIt; diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index b72b5ed7c7d4..7d48615272b6 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -224,7 +224,7 @@ void XclExpDffAnchorBase::SetSdrObject( const SdrObject& rSdrObj ) void XclExpDffAnchorBase::WriteDffData( EscherEx& rEscherEx ) const { rEscherEx.AddAtom( 18, ESCHER_ClientAnchor ); - rEscherEx.GetStream() << mnFlags << maAnchor; + rEscherEx.GetStream().WriteUInt16( mnFlags ) << maAnchor; } void XclExpDffAnchorBase::WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 795f86ba8a5c..2ad9bef43254 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -135,7 +135,7 @@ XclExpStream& XclExpStream::operator<<( sal_Int8 nValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, nValue); else - mrStrm << nValue; + mrStrm.WriteSChar( nValue ); return *this; } @@ -145,7 +145,7 @@ XclExpStream& XclExpStream::operator<<( sal_uInt8 nValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, nValue); else - mrStrm << nValue; + mrStrm.WriteUChar( nValue ); return *this; } @@ -155,7 +155,7 @@ XclExpStream& XclExpStream::operator<<( sal_Int16 nValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, nValue); else - mrStrm << nValue; + mrStrm.WriteInt16( nValue ); return *this; } @@ -165,7 +165,7 @@ XclExpStream& XclExpStream::operator<<( sal_uInt16 nValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, nValue); else - mrStrm << nValue; + mrStrm.WriteUInt16( nValue ); return *this; } @@ -175,7 +175,7 @@ XclExpStream& XclExpStream::operator<<( sal_Int32 nValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, nValue); else - mrStrm << nValue; + mrStrm.WriteInt32( nValue ); return *this; } @@ -185,7 +185,7 @@ XclExpStream& XclExpStream::operator<<( sal_uInt32 nValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, nValue); else - mrStrm << nValue; + mrStrm.WriteUInt32( nValue ); return *this; } @@ -195,7 +195,7 @@ XclExpStream& XclExpStream::operator<<( float fValue ) if (mbUseEncrypter && HasValidEncrypter()) mxEncrypter->Encrypt(mrStrm, fValue); else - mrStrm << fValue; + mrStrm.WriteFloat( fValue ); return *this; } @@ -387,11 +387,11 @@ sal_Size XclExpStream::SetSvStreamPos( sal_Size nPos ) void XclExpStream::InitRecord( sal_uInt16 nRecId ) { mrStrm.Seek( STREAM_SEEK_TO_END ); - mrStrm << nRecId; + mrStrm.WriteUInt16( nRecId ); mnLastSizePos = mrStrm.Tell(); mnHeaderSize = static_cast< sal_uInt16 >( ::std::min< sal_Size >( mnPredictSize, mnCurrMaxSize ) ); - mrStrm << mnHeaderSize; + mrStrm.WriteUInt16( mnHeaderSize ); mnCurrSize = mnSliceSize = 0; } @@ -400,7 +400,7 @@ void XclExpStream::UpdateRecSize() if( mnCurrSize != mnHeaderSize ) { mrStrm.Seek( mnLastSizePos ); - mrStrm << mnCurrSize; + mrStrm.WriteUInt16( mnCurrSize ); } } @@ -458,7 +458,7 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes ) sal_Size nBytesLeft = nBytes; while( nBytesLeft >= sizeof( nData ) ) { - mrStrm << nData; + mrStrm.WriteUInt32( nData ); nBytesLeft -= sizeof( nData ); } if( nBytesLeft ) diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index a739409f5136..8eadc5994065 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -737,11 +737,11 @@ void XclImpDrawObjBase::ConvertFillStyle( SdrObject& rSdrObj, const XclObjFillDa const sal_uInt8* const pnPattern = sppnPatterns[ ::std::min< size_t >( rFillData.mnPattern - 2, SAL_N_ELEMENTS( sppnPatterns ) ) ]; // create 2-colored 8x8 DIB SvMemoryStream aMemStrm; - aMemStrm << sal_uInt32( 12 ) << sal_Int16( 8 ) << sal_Int16( 8 ) << sal_uInt16( 1 ) << sal_uInt16( 1 ); - aMemStrm << sal_uInt8( 0xFF ) << sal_uInt8( 0xFF ) << sal_uInt8( 0xFF ); - aMemStrm << sal_uInt8( 0x00 ) << sal_uInt8( 0x00 ) << sal_uInt8( 0x00 ); + aMemStrm.WriteUInt32( sal_uInt32( 12 ) ).WriteInt16( sal_Int16( 8 ) ).WriteInt16( sal_Int16( 8 ) ).WriteUInt16( sal_uInt16( 1 ) ).WriteUInt16( sal_uInt16( 1 ) ); + aMemStrm.WriteUChar( sal_uInt8( 0xFF ) ).WriteUChar( sal_uInt8( 0xFF ) ).WriteUChar( sal_uInt8( 0xFF ) ); + aMemStrm.WriteUChar( sal_uInt8( 0x00 ) ).WriteUChar( sal_uInt8( 0x00 ) ).WriteUChar( sal_uInt8( 0x00 ) ); for( size_t nIdx = 0; nIdx < 8; ++nIdx ) - aMemStrm << sal_uInt32( pnPattern[ nIdx ] ); // 32-bit little-endian + aMemStrm.WriteUInt32( sal_uInt32( pnPattern[ nIdx ] ) ); // 32-bit little-endian aMemStrm.Seek( STREAM_SEEK_TO_BEGIN ); Bitmap aBitmap; ReadDIB(aBitmap, aMemStrm, false); @@ -3686,7 +3686,7 @@ OUString XclImpDffConverter::ReadHlinkProperty( SvStream& rDffStrm ) const { // create a faked BIFF record that can be read by XclImpStream class SvMemoryStream aMemStream; - aMemStream << sal_uInt16( 0 ) << static_cast< sal_uInt16 >( nBufferSize ); + aMemStream.WriteUInt16( sal_uInt16( 0 ) ).WriteUInt16( static_cast< sal_uInt16 >( nBufferSize ) ); // copy from DFF stream to memory stream ::std::vector< sal_uInt8 > aBuffer( nBufferSize ); @@ -4040,7 +4040,7 @@ void XclImpDrawing::ReadBmp( Graphic& rGraphic, const XclImpRoot& rRoot, XclImpS { rStrm.Ignore( 3 ); aMemStrm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - aMemStrm << nHdrSize << nWidth << nHeight << nPlanes << nDepth; + aMemStrm.WriteUInt32( nHdrSize ).WriteUInt16( nWidth ).WriteUInt16( nHeight ).WriteUInt16( nPlanes ).WriteUInt16( nDepth ); rStrm.CopyToStream( aMemStrm, rStrm.GetRecLeft() ); } rStrm.PopPosition(); diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index cd257ca29c85..894aedce8177 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -63,7 +63,7 @@ void XclImpFmlaCompImpl::CreateRangeList( if( !rXclTokArr.Empty() ) { SvMemoryStream aMemStrm; - aMemStrm << EXC_ID_EOF << rXclTokArr.GetSize(); + aMemStrm.WriteUInt16( EXC_ID_EOF ).WriteUInt16( rXclTokArr.GetSize() ); aMemStrm.Write( rXclTokArr.GetData(), rXclTokArr.GetSize() ); XclImpStream aFmlaStrm( aMemStrm, GetRoot() ); aFmlaStrm.StartNextRecord(); @@ -79,7 +79,7 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( // evil hack! are we trying to phase out the old style formula converter ? SvMemoryStream aMemStrm; - aMemStrm << EXC_ID_EOF << rXclTokArr.GetSize(); + aMemStrm.WriteUInt16( EXC_ID_EOF ).WriteUInt16( rXclTokArr.GetSize() ); aMemStrm.Write( rXclTokArr.GetData(), rXclTokArr.GetSize() ); XclImpStream aFmlaStrm( aMemStrm, GetRoot() ); aFmlaStrm.StartNextRecord(); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 489286105068..9defd8a98c4f 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -189,7 +189,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres // to the Convert() routine (to prevent the construction/destruction of the // converter in each formula) SvMemoryStream aMemStrm; - aMemStrm << (sal_uInt16) 0x0001 << nFmlSize; + aMemStrm.WriteUInt16( (sal_uInt16) 0x0001 ).WriteUInt16( nFmlSize ); size_t nRead = pStrm->CopyToStream( aMemStrm, nFmlSize ); // survive reading invalid streams! diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 1ca265e2c6be..93e4bfa327df 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -279,7 +279,7 @@ bool ScImportExport::ExportData( const OUString& rMimeType, if( ExportStream( aStrm, OUString(), SotExchange::GetFormatIdFromMimeType( rMimeType ) )) { - aStrm << (sal_uInt8) 0; + aStrm.WriteUChar( (sal_uInt8) 0 ); rValue <<= ::com::sun::star::uno::Sequence< sal_Int8 >( (sal_Int8*)aStrm.GetData(), aStrm.Seek( STREAM_SEEK_TO_END ) ); @@ -333,7 +333,7 @@ bool ScImportExport::ExportString( OUString& rText, sal_uLong nFmt ) // mba: no BaseURL for data exc if( ExportStream( aStrm, OUString(), nFmt ) ) { - aStrm << (sal_Unicode) 0; + aStrm.WriteUInt16( (sal_Unicode) 0 ); aStrm.Seek( STREAM_SEEK_TO_END ); rText = OUString( (const sal_Unicode*) aStrm.GetData() ); @@ -361,7 +361,7 @@ bool ScImportExport::ExportByteString( OString& rText, rtl_TextEncoding eEnc, sa // mba: no BaseURL for data exchange if( ExportStream( aStrm, OUString(), nFmt ) ) { - aStrm << (sal_Char) 0; + aStrm.WriteChar( (sal_Char) 0 ); aStrm.Seek( STREAM_SEEK_TO_END ); // Sicherheits-Check: if( aStrm.Tell() <= (sal_uLong) STRING_MAXLEN ) @@ -470,9 +470,9 @@ bool ScImportExport::ExportStream( SvStream& rStrm, const OUString& rBaseURL, sa WriteUnicodeOrByteString( rStrm, aRefName, true ); WriteUnicodeOrByteString( rStrm, aExtraBits, true ); if ( rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE ) - rStrm << sal_Unicode(0); + rStrm.WriteUInt16( sal_Unicode(0) ); else - rStrm << sal_Char(0); + rStrm.WriteChar( sal_Char(0) ); return rStrm.GetError() == SVSTREAM_OK; } } @@ -504,18 +504,18 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const OUString& const sal_Unicode* const pStop = p + rString.getLength(); while ( p < pStop ) { - rStrm << *p; + rStrm.WriteUInt16( *p ); } } if ( bZero ) - rStrm << sal_Unicode(0); + rStrm.WriteUInt16( sal_Unicode(0) ); } else { OString aByteStr(OUStringToOString(rString, eEnc)); - rStrm << aByteStr.getStr(); + rStrm.WriteCharPtr( aByteStr.getStr() ); if ( bZero ) - rStrm << sal_Char(0); + rStrm.WriteChar( sal_Char(0) ); } } @@ -528,13 +528,13 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm ) switch ( rStrm.GetLineDelimiter() ) { case LINEEND_CR : - rStrm << sal_Unicode('\r'); + rStrm.WriteUInt16( sal_Unicode('\r') ); break; case LINEEND_LF : - rStrm << sal_Unicode('\n'); + rStrm.WriteUInt16( sal_Unicode('\n') ); break; default: - rStrm << sal_Unicode('\r') << sal_Unicode('\n'); + rStrm.WriteUInt16( sal_Unicode('\r') ).WriteUInt16( sal_Unicode('\n') ); } } else diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx index 3fc5a737ff02..ce28ab43f854 100644 --- a/sd/source/core/sdiocmpt.cxx +++ b/sd/source/core/sdiocmpt.cxx @@ -46,7 +46,7 @@ void old_SdrDownCompat::Read() void old_SdrDownCompat::Write() { - rStream << nSubRecSiz; + rStream.WriteUInt32( nSubRecSiz ); } void old_SdrDownCompat::OpenSubRecord() @@ -107,7 +107,7 @@ SdIOCompat::SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, sal_uInt16 nVe { DBG_ASSERT(nVer != SDIOCOMPAT_VERSIONDONTKNOW, "can´t write unknown version"); - rNewStream << nVersion; + rNewStream.WriteUInt16( nVersion ); } else if (nNewMode == STREAM_READ) { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 3189a30ca3d0..3f06b1118075 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -168,12 +168,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_Slide ); mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 ); - *mpStrm << rLayout.nLayout; + mpStrm->WriteInt32( rLayout.nLayout ); mpStrm->Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs (8 parts) - *mpStrm << (sal_uInt32)(nMasterNum | 0x80000000)// master ID (equals 0x80000000 on a master page) - << (sal_uInt32)nPageNum + 0x100 // notes ID (equals null if no notes are present) - << nMode - << (sal_uInt16)0; // padword + mpStrm->WriteUInt32( (sal_uInt32)(nMasterNum | 0x80000000) )// master ID (equals 0x80000000 on a master page) + .WriteUInt32( (sal_uInt32)nPageNum + 0x100 ) // notes ID (equals null if no notes are present) + .WriteUInt16( nMode ) + .WriteUInt16( (sal_uInt16)0 ); // padword mnDiaMode = 0; sal_Bool bVisible = sal_True; @@ -262,13 +262,13 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom ); - *mpStrm << nSlideTime // standtime in ticks - << nSoundRef - << nDirection - << nTransitionType - << nBuildFlags - << nSpeed - << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0; + mpStrm->WriteInt32( nSlideTime ) // standtime in ticks + .WriteUInt32( nSoundRef ) + .WriteUChar( nDirection ) + .WriteUChar( nTransitionType ) + .WriteUInt16( nBuildFlags ) + .WriteUChar( nSpeed ) + .WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ); } ImplCreateHeaderFooters( mXPagePropSet ); @@ -302,7 +302,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer mpPptEscherEx->CloseContainer(); // EPP_Drawing mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); SvMemoryStream aBinaryTagData10Atom; ImplExportComments( mXDrawPage, aBinaryTagData10Atom ); @@ -316,12 +316,12 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ { { EscherExAtom aMagic2( aBinaryTagData10Atom, 0x2eeb ); - aBinaryTagData10Atom << (sal_uInt32)0x01c45df9 - << (sal_uInt32)0xe1471b30; + aBinaryTagData10Atom.WriteUInt32( (sal_uInt32)0x01c45df9 ) + .WriteUInt32( (sal_uInt32)0xe1471b30 ); } { EscherExAtom aMagic( aBinaryTagData10Atom, 0x2b00 ); - aBinaryTagData10Atom << (sal_uInt32)0; + aBinaryTagData10Atom.WriteUInt32( (sal_uInt32)0 ); } aBinaryTagData10Atom.Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() ); { @@ -335,11 +335,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag ); { EscherExAtom aCString( *mpStrm, EPP_CString ); - *mpStrm << (sal_uInt32)0x5f005f - << (sal_uInt32)0x50005f - << (sal_uInt32)0x540050 - << (sal_uInt16)0x31 - << (sal_uInt16)0x30; + mpStrm->WriteUInt32( (sal_uInt32)0x5f005f ) + .WriteUInt32( (sal_uInt32)0x50005f ) + .WriteUInt32( (sal_uInt32)0x540050 ) + .WriteUInt16( (sal_uInt16)0x31 ) + .WriteUInt16( (sal_uInt16)0x30 ); } { EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData ); @@ -356,27 +356,27 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_MainMaster ); mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 ); - *mpStrm << (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide - << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID - << (sal_uInt32)0 // master ID (equals null at a master page) - << (sal_uInt32)0 // notes ID (equals null if no notes are present) - << (sal_uInt16)0 // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background - << (sal_uInt16)0; // padword + mpStrm->WriteInt32( (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE ) // slide layout -> title and body slide + .WriteUChar( (sal_uInt8)1 ).WriteUChar( (sal_uInt8)2 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ) // placeholderID + .WriteUInt32( (sal_uInt32)0 ) // master ID (equals null at a master page) + .WriteUInt32( (sal_uInt32)0 ) // notes ID (equals null if no notes are present) + .WriteUInt16( (sal_uInt16)0 ) // Bit 1: Follow master objects, Bit 2: Follow master scheme, Bit 3: Follow master background + .WriteUInt16( (sal_uInt16)0 ); // padword mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xff0000 << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x00ffff << (sal_uInt32)0x0099ff << (sal_uInt32)0xffff00 << (sal_uInt32)0x0000ff << (sal_uInt32)0x969696; + mpStrm->WriteUInt32( (sal_uInt32)0xff0000 ).WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x00ffff ).WriteUInt32( (sal_uInt32)0x0099ff ).WriteUInt32( (sal_uInt32)0xffff00 ).WriteUInt32( (sal_uInt32)0x0000ff ).WriteUInt32( (sal_uInt32)0x969696 ); mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xccffff << (sal_uInt32)0x000000 << (sal_uInt32)0x336666 << (sal_uInt32)0x008080 << (sal_uInt32)0x339933 << (sal_uInt32)0x000080 << (sal_uInt32)0xcc3300 << (sal_uInt32)0x66ccff; + mpStrm->WriteUInt32( (sal_uInt32)0xccffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x336666 ).WriteUInt32( (sal_uInt32)0x008080 ).WriteUInt32( (sal_uInt32)0x339933 ).WriteUInt32( (sal_uInt32)0x000080 ).WriteUInt32( (sal_uInt32)0xcc3300 ).WriteUInt32( (sal_uInt32)0x66ccff ); mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x333333 << (sal_uInt32)0x000000 << (sal_uInt32)0xdddddd << (sal_uInt32)0x808080 << (sal_uInt32)0x4d4d4d << (sal_uInt32)0xeaeaea; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x333333 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0xdddddd ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x4d4d4d ).WriteUInt32( (sal_uInt32)0xeaeaea ); mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x66ccff << (sal_uInt32)0xff0000 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xc0c0c0; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x66ccff ).WriteUInt32( (sal_uInt32)0xff0000 ).WriteUInt32( (sal_uInt32)0xcc00cc ).WriteUInt32( (sal_uInt32)0xc0c0c0 ); mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xc0c0c0 << (sal_uInt32)0xff6600 << (sal_uInt32)0x0000ff << (sal_uInt32)0x009900; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0xc0c0c0 ).WriteUInt32( (sal_uInt32)0xff6600 ).WriteUInt32( (sal_uInt32)0x0000ff ).WriteUInt32( (sal_uInt32)0x009900 ); mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 6 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0xff9933 << (sal_uInt32)0xccff99 << (sal_uInt32)0xcc00cc << (sal_uInt32)0xb2b2b2; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0xff9933 ).WriteUInt32( (sal_uInt32)0xccff99 ).WriteUInt32( (sal_uInt32)0xcc00cc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); for ( int nInstance = EPP_TEXTTYPE_Title; nInstance <= EPP_TEXTTYPE_QuarterBody; nInstance++ ) { @@ -394,7 +394,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS sal_Bool bFirst = sal_True; sal_Bool bSimpleText = sal_False; - *mpStrm << (sal_uInt16)5; // paragraph count + mpStrm->WriteUInt16( (sal_uInt16)5 ); // paragraph count for ( sal_uInt16 nLev = 0; nLev < 5; nLev++ ) { @@ -402,7 +402,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS { bFirst = sal_False; bSimpleText = sal_True; - *mpStrm << nLev; + mpStrm->WriteUInt16( nLev ); } mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); @@ -428,7 +428,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer mpPptEscherEx->CloseContainer(); // EPP_Drawing mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); if ( aBuExMasterStream.Tell() ) { @@ -469,22 +469,22 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() sal_uInt32 nLenOfUserName = strlen( pUserName ); sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 ); - *mpCurUserStrm << (sal_uInt16)0 << (sal_uInt16)EPP_CurrentUserAtom << nSizeOfRecord; - *mpCurUserStrm << (sal_uInt32)0x14 // Len - << (sal_uInt32)0xe391c05f; // Magic + mpCurUserStrm->WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16)EPP_CurrentUserAtom ).WriteUInt32( nSizeOfRecord ); + mpCurUserStrm->WriteUInt32( (sal_uInt32)0x14 ) // Len + .WriteUInt32( (sal_uInt32)0xe391c05f ); // Magic sal_uInt32 nEditPos = mpCurUserStrm->Tell(); - *mpCurUserStrm << (sal_uInt32)0x0 // OffsetToCurrentEdit; - << (sal_uInt16)nLenOfUserName // - << (sal_uInt16)0x3f4 // DocFileVersion - << (sal_uInt8)3 // MajorVersion - << (sal_uInt8)0 // MinorVersion - << (sal_uInt16)0; // Pad Word + mpCurUserStrm->WriteUInt32( (sal_uInt32)0x0 ) // OffsetToCurrentEdit; + .WriteUInt16( (sal_uInt16)nLenOfUserName ) // + .WriteUInt16( (sal_uInt16)0x3f4 ) // DocFileVersion + .WriteUChar( (sal_uInt8)3 ) // MajorVersion + .WriteUChar( (sal_uInt8)0 ) // MinorVersion + .WriteUInt16( (sal_uInt16)0 ); // Pad Word pUserName[ nLenOfUserName ] = 8; mpCurUserStrm->Write( pUserName, nLenOfUserName + 1 ); for ( sal_uInt32 i = 0x15 + nLenOfUserName; i < nSizeOfRecord; i++ ) { - *mpCurUserStrm << (sal_uInt8)0; // pad bytes + mpCurUserStrm->WriteUChar( (sal_uInt8)0 ); // pad bytes }; mpCurUserStrm->Seek( nEditPos ); return sal_True; @@ -549,11 +549,11 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa { if ( rSt.Tell() ) { - aBuExOutlineStream << (sal_uInt32)( ( EPP_PST_ExtendedParagraphHeaderAtom << 16 ) - | ( nRef << 4 ) ) - << (sal_uInt32)8 - << (sal_uInt32)nSlideId - << (sal_uInt32)nInstance; + aBuExOutlineStream.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphHeaderAtom << 16 ) + | ( nRef << 4 ) ) ) + .WriteUInt32( (sal_uInt32)8 ) + .WriteUInt32( (sal_uInt32)nSlideId ) + .WriteUInt32( (sal_uInt32)nInstance ); aBuExOutlineStream.Write( rSt.GetData(), rSt.Tell() ); } } @@ -662,7 +662,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 0 ); mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom ); - *mpStrm << nVal; + mpStrm->WriteUInt32( nVal ); ImplCreateHeaderFooterStrings( *mpStrm, rXPagePropSet ); mpPptEscherEx->CloseContainer(); } @@ -690,32 +690,32 @@ sal_Bool PPTWriter::ImplCreateDocument() mpPptEscherEx->OpenContainer( EPP_Document ); // CREATE DOCUMENT ATOM mpPptEscherEx->AddAtom( 40, EPP_DocumentAtom, 1 ); - *mpStrm << nWidth // Slide Size in Master coordinates X - << nHeight // " " " " " Y - << (sal_Int32)maNotesPageSize.Width // Notes Page Size X - << (sal_Int32)maNotesPageSize.Height // " " " Y - << (sal_Int32)1 << (sal_Int32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2 + mpStrm->WriteUInt32( nWidth ) // Slide Size in Master coordinates X + .WriteUInt32( nHeight ) // " " " " " Y + .WriteInt32( (sal_Int32)maNotesPageSize.Width ) // Notes Page Size X + .WriteInt32( (sal_Int32)maNotesPageSize.Height ) // " " " Y + .WriteInt32( (sal_Int32)1 ).WriteInt32( (sal_Int32)2 ); // the scale used when the Powerpoint document is embedded. the default is 1:2 mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() ); - *mpStrm << (sal_uInt32)0 // Reference to NotesMaster ( 0 if none ); - << (sal_uInt32)0 // Reference to HandoutMaster ( 0 if none ); - << (sal_Int16)1 // Number of the first slide; - << nSlideType // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN ) - << (sal_uInt8)0 // bool1 indicates if document was saved with embedded true type fonts - << (sal_uInt8)0 // bool1 indicates if the placeholders on the title slide are omitted - << (sal_uInt8)0 // bool1 right to left ( flag for Bidi version ) - << (sal_uInt8)1; // bool1 visibility of comments shapes + mpStrm->WriteUInt32( (sal_uInt32)0 ) // Reference to NotesMaster ( 0 if none ); + .WriteUInt32( (sal_uInt32)0 ) // Reference to HandoutMaster ( 0 if none ); + .WriteInt16( (sal_Int16)1 ) // Number of the first slide; + .WriteUInt16( nSlideType ) // Size of the document slides ( default: EPP_SLIDESIZETYPEONSCREEN ) + .WriteUChar( (sal_uInt8)0 ) // bool1 indicates if document was saved with embedded true type fonts + .WriteUChar( (sal_uInt8)0 ) // bool1 indicates if the placeholders on the title slide are omitted + .WriteUChar( (sal_uInt8)0 ) // bool1 right to left ( flag for Bidi version ) + .WriteUChar( (sal_uInt8)1 ); // bool1 visibility of comments shapes mpPptEscherEx->PtInsert( EPP_Persist_Document, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 3 ); //Master footer (default) mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom ); - *mpStrm << (sal_uInt32)0x25000d; + mpStrm->WriteUInt32( (sal_uInt32)0x25000d ); if ( GetPageByIndex( 0, MASTER ) ) ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet ); mpPptEscherEx->CloseContainer(); mpPptEscherEx->OpenContainer( EPP_HeadersFooters, 4 ); //NotesMaster footer (default) mpPptEscherEx->AddAtom( 4, EPP_HeadersFootersAtom ); - *mpStrm << (sal_uInt32)0x3d000d; + mpStrm->WriteUInt32( (sal_uInt32)0x3d000d ); if ( GetPageByIndex( 0, NOTICE ) ) ImplCreateHeaderFooterStrings( *mpStrm, mXPagePropSet ); mpPptEscherEx->CloseContainer(); @@ -726,11 +726,11 @@ sal_Bool PPTWriter::ImplCreateDocument() { mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom ); mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() ); - *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) - << (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders - << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects - << (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example - << (sal_uInt32)0; // reserved, usualy 0 + mpStrm->WriteUInt32( (sal_uInt32)0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) + .WriteUInt32( (sal_uInt32)4 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders + .WriteInt32( (sal_Int32)0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects + .WriteInt32( (sal_Int32)i + 0x100 ) // slideId - Unique slide identifier, used for OLE link monikers for example + .WriteUInt32( (sal_uInt32)0 ); // reserved, usualy 0 if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages return sal_False; @@ -751,11 +751,11 @@ sal_Bool PPTWriter::ImplCreateDocument() { mpPptEscherEx->AddAtom( 20, EPP_SlidePersistAtom ); mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() ); - *mpStrm << (sal_uInt32)0 - << (sal_uInt32)4 - << (sal_Int32)0 - << (sal_Int32)i + 0x100 - << (sal_uInt32)0; + mpStrm->WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)4 ) + .WriteInt32( (sal_Int32)0 ) + .WriteInt32( (sal_Int32)i + 0x100 ) + .WriteUInt32( (sal_uInt32)0 ); } mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText @@ -836,7 +836,7 @@ sal_Bool PPTWriter::ImplCreateDocument() } mpPptEscherEx->AddAtom( 80, EPP_SSDocInfoAtom, 1 ); - *mpStrm << nPenColor << nRestartTime << nStartSlide << nEndSlide; + mpStrm->WriteUInt32( nPenColor ).WriteInt32( nRestartTime ).WriteInt16( nStartSlide ).WriteInt16( nEndSlide ); sal_uInt32 nCustomShowNameLen = aCustomShow.getLength(); if ( nCustomShowNameLen > 31 ) @@ -846,12 +846,12 @@ sal_Bool PPTWriter::ImplCreateDocument() const sal_Unicode* pCustomShow = aCustomShow.getStr(); for ( i = 0; i < nCustomShowNameLen; i++ ) { - *mpStrm << (sal_uInt16)( pCustomShow[ i ] ); + mpStrm->WriteUInt16( (sal_uInt16)( pCustomShow[ i ] ) ); } } - for ( i = nCustomShowNameLen; i < 32; i++, *mpStrm << (sal_uInt16)0 ) ; + for ( i = nCustomShowNameLen; i < 32; i++, mpStrm->WriteUInt16( (sal_uInt16)0 ) ) ; - *mpStrm << nFlags; + mpStrm->WriteUInt32( nFlags ); ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XCustomPresentationSupplier > aXCPSup( mXModel, ::com::sun::star::uno::UNO_QUERY ); if ( aXCPSup.is() ) @@ -878,7 +878,7 @@ sal_Bool PPTWriter::ImplCreateDocument() nNamedShowLen = 31; mpPptEscherEx->AddAtom( nNamedShowLen << 1, EPP_CString ); const sal_Unicode* pCustomShowName = pUString[ i ].getStr(); - for ( sal_uInt32 k = 0; k < nNamedShowLen; *mpStrm << (sal_uInt16)( pCustomShowName[ k++ ] ) ) ; + for ( sal_uInt32 k = 0; k < nNamedShowLen; mpStrm->WriteUInt16( (sal_uInt16)( pCustomShowName[ k++ ] ) ) ) ; mAny = aXCont->getByName( pUString[ i ] ); if ( mAny.getValue() ) { @@ -910,7 +910,7 @@ sal_Bool PPTWriter::ImplCreateDocument() if (pIter != maSlideNameList.end()) { sal_uInt32 nPageNumber = pIter - maSlideNameList.begin(); - *mpStrm << (sal_uInt32)( nPageNumber + 0x100 ); // unique slide id + mpStrm->WriteUInt32( (sal_uInt32)( nPageNumber + 0x100 ) ); // unique slide id } } } @@ -941,18 +941,18 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0; nParaOfs = rStrm.Tell(); - rStrm << (sal_uInt32)0; // property size - rStrm << (sal_uInt32)0; // property count + rStrm.WriteUInt32( (sal_uInt32)0 ); // property size + rStrm.WriteUInt32( (sal_uInt32)0 ); // property count for ( std::vector<EPPTHyperlink>::const_iterator pIter = maHyperlink.begin(); pIter != maHyperlink.end(); ++pIter ) { nParaCount += 6; - rStrm << (sal_uInt32)3 // Type VT_I4 - << (sal_uInt32)7 // (VTI4 - Private1) - << (sal_uInt32)3 // Type VT_I4 - << (sal_uInt32)6 // (VTI4 - Private2) - << (sal_uInt32)3 // Type VT_I4 - << (sal_uInt32)0; // (VTI4 - Private3) + rStrm .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4 + .WriteUInt32( (sal_uInt32)7 ) // (VTI4 - Private1) + .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4 + .WriteUInt32( (sal_uInt32)6 ) // (VTI4 - Private2) + .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4 + .WriteUInt32( (sal_uInt32)0 ); // (VTI4 - Private3) // INFO // HIWORD: = 0 : do not change anything @@ -973,46 +973,46 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) sal_uInt32 nInfo = 7; - rStrm << (sal_uInt32)3 // Type VT_I4 - << nInfo; // Info + rStrm .WriteUInt32( (sal_uInt32)3 ) // Type VT_I4 + .WriteUInt32( nInfo ); // Info switch( pIter->nType & 0xff ) { case 1 : // click action to slidenumber { - rStrm << (sal_uInt32)0x1f << (sal_uInt32)1 << (sal_uInt32)0; // path - rStrm << (sal_uInt32)0x1f << (sal_uInt32)( nUrlLen + 1 ); + rStrm.WriteUInt32( (sal_uInt32)0x1f ).WriteUInt32( (sal_uInt32)1 ).WriteUInt32( (sal_uInt32)0 ); // path + rStrm.WriteUInt32( (sal_uInt32)0x1f ).WriteUInt32( (sal_uInt32)( nUrlLen + 1 ) ); for ( sal_Int32 i = 0; i < nUrlLen; i++ ) { - rStrm << rUrl[ i ]; + rStrm.WriteUInt16( rUrl[ i ] ); } - rStrm << (sal_uInt16)0; + rStrm.WriteUInt16( (sal_uInt16)0 ); } break; case 2 : { sal_Int32 i; - rStrm << (sal_uInt32)0x1f - << (sal_uInt32)( nUrlLen + 1 ); + rStrm .WriteUInt32( (sal_uInt32)0x1f ) + .WriteUInt32( (sal_uInt32)( nUrlLen + 1 ) ); for ( i = 0; i < nUrlLen; i++ ) { - rStrm << rUrl[ i ]; + rStrm.WriteUInt16( rUrl[ i ] ); } if ( ! ( i & 1 ) ) - rStrm << (sal_uInt16)0; - rStrm << (sal_uInt16)0 - << (sal_uInt32)0x1f - << (sal_uInt32)1 - << (sal_uInt32)0; + rStrm.WriteUInt16( (sal_uInt16)0 ); + rStrm .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt32( (sal_uInt32)0x1f ) + .WriteUInt32( (sal_uInt32)1 ) + .WriteUInt32( (sal_uInt32)0 ); } break; } } nCurrentOfs = rStrm.Tell(); rStrm.Seek( nParaOfs ); - rStrm << (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ); - rStrm << nParaCount; + rStrm.WriteUInt32( (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ) ); + rStrm.WriteUInt32( nParaCount ); rStrm.Seek( nCurrentOfs ); return sal_True; } @@ -1026,8 +1026,8 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainNotes, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_Notes ); mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 ); - *mpStrm << (sal_uInt32)0x80000001 // Number that identifies this slide - << (sal_uInt32)0; // follow nothing + mpStrm->WriteUInt32( (sal_uInt32)0x80000001 ) // Number that identifies this slide + .WriteUInt32( (sal_uInt32)0 ); // follow nothing mpPptEscherEx->OpenContainer( EPP_PPDrawing ); mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); @@ -1054,7 +1054,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer mpPptEscherEx->CloseContainer(); // EPP_Drawing mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); mpPptEscherEx->CloseContainer(); // EPP_Notes return sal_True; } @@ -1127,17 +1127,17 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr sal_Int16 nMilliSeconds = static_cast<sal_Int16>(::rtl::math::round(static_cast<double>(aDateTime.NanoSeconds) / 1000000000.0)); EscherExAtom aCommentAtom10( rBinaryTagData10Atom, EPP_CommentAtom10 ); - rBinaryTagData10Atom << nIndex++ - << aDateTime.Year - << aDateTime.Month - << aDateTime.Day // todo: day of week - << aDateTime.Day - << aDateTime.Hours - << aDateTime.Minutes - << aDateTime.Seconds - << nMilliSeconds - << static_cast< sal_Int32 >( aPoint.X() ) - << static_cast< sal_Int32 >( aPoint.Y() ); + rBinaryTagData10Atom.WriteInt32( nIndex++ ) + .WriteInt16( aDateTime.Year ) + .WriteUInt16( aDateTime.Month ) + .WriteUInt16( aDateTime.Day ) // todo: day of week + .WriteUInt16( aDateTime.Day ) + .WriteUInt16( aDateTime.Hours ) + .WriteUInt16( aDateTime.Minutes ) + .WriteUInt16( aDateTime.Seconds ) + .WriteInt16( nMilliSeconds ) + .WriteInt32( static_cast< sal_Int32 >( aPoint.X() ) ) + .WriteInt32( static_cast< sal_Int32 >( aPoint.Y() ) ); } } } @@ -1153,9 +1153,9 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum ) mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_Notes | nPageNum, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_Notes ); mpPptEscherEx->AddAtom( 8, EPP_NotesAtom, 1 ); - *mpStrm << (sal_uInt32)nPageNum + 0x100 - << (sal_uInt16)3 // follow master .... - << (sal_uInt16)0; + mpStrm->WriteUInt32( (sal_uInt32)nPageNum + 0x100 ) + .WriteUInt16( (sal_uInt16)3 ) // follow master .... + .WriteUInt16( (sal_uInt16)0 ); ImplCreateHeaderFooters( mXPagePropSet ); @@ -1187,7 +1187,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum ) mpPptEscherEx->CloseContainer(); // ESCHER_DgContainer mpPptEscherEx->CloseContainer(); // EPP_Drawing mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); - *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; + mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); mpPptEscherEx->CloseContainer(); // EPP_Notes }; @@ -1305,15 +1305,15 @@ void PPTWriter::ImplWriteOLE( ) // create a dummy content stream, the dummy content is necessary for ppt, but not for // doc files, so we can't share code. SotStorageStreamRef xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE ); - *xStm << (sal_uInt32)0 // no ClipboardId - << (sal_uInt32)4 // no target device - << (sal_uInt32)1 // aspect ratio - << (sal_Int32)-1 // L-Index - << (sal_uInt32)0 // Advanced Flags - << (sal_uInt32)0 // compression - << (sal_uInt32)0 // Size - << (sal_uInt32)0 // " - << (sal_uInt32)0; + xStm->WriteUInt32( (sal_uInt32)0 ) // no ClipboardId + .WriteUInt32( (sal_uInt32)4 ) // no target device + .WriteUInt32( (sal_uInt32)1 ) // aspect ratio + .WriteInt32( (sal_Int32)-1 ) // L-Index + .WriteUInt32( (sal_uInt32)0 ) // Advanced Flags + .WriteUInt32( (sal_uInt32)0 ) // compression + .WriteUInt32( (sal_uInt32)0 ) // Size + .WriteUInt32( (sal_uInt32)0 ) // " + .WriteUInt32( (sal_uInt32)0 ); pStrm = xCleanStorage->CreateMemoryStream(); } } @@ -1339,7 +1339,7 @@ void PPTWriter::ImplWriteOLE( ) mpPptEscherEx->BeginAtom(); pStrm->Seek( STREAM_SEEK_TO_END ); sal_uInt32 npStrmSize = pStrm->Tell(); - *mpStrm << npStrmSize; // uncompressed size + mpStrm->WriteUInt32( npStrmSize ); // uncompressed size pStrm->Seek( 0 ); ZCodec aZCodec( 0x8000, 0x8000 ); @@ -1362,18 +1362,18 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() sal_uInt32 i, nPos, nOfs, nPersistOfs = mpStrm->Tell(); sal_uInt32 nPersistEntrys = 0; - *mpStrm << (sal_uInt32)0 << (sal_uInt32)0 << (sal_uInt32)0; // skip record header and first entry + mpStrm->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); // skip record header and first entry // write document persist nPersistEntrys++; - *mpStrm << (sal_uInt32)0; + mpStrm->WriteUInt32( (sal_uInt32)0 ); // write MasterPages persists for ( i = 0; i < mnMasterPages; i++ ) { nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_MainMaster | i ); if ( nOfs ) { - *mpStrm << nOfs; + mpStrm->WriteUInt32( nOfs ); mpPptEscherEx->InsertAtPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, ++nPersistEntrys ); } } @@ -1381,7 +1381,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_MainNotes ); if ( nOfs ) { - *mpStrm << nOfs; + mpStrm->WriteUInt32( nOfs ); mpPptEscherEx->InsertAtPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, ++nPersistEntrys ); } // write slide persists -> we have to write a valid value into EPP_SlidePersistAtome too @@ -1390,7 +1390,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Slide | i ); if ( nOfs ) { - *mpStrm << nOfs; + mpStrm->WriteUInt32( nOfs ); mpPptEscherEx->InsertAtPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, ++nPersistEntrys ); } } @@ -1400,7 +1400,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Notes | i ); if ( nOfs ) { - *mpStrm << nOfs; + mpStrm->WriteUInt32( nOfs ); mpPptEscherEx->InsertAtPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, ++nPersistEntrys ); } } @@ -1412,11 +1412,11 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() if ( nOfs ) { nPersistEntrys++; - *mpStrm << pPtr->nOfsB; + mpStrm->WriteUInt32( pPtr->nOfsB ); sal_uInt32 nOldPos, nPersOfs = nOfs + pPtr->nOfsA + 16 + 8; // 8 bytes atom header, +16 to the persist entry nOldPos = mpStrm->Tell(); mpStrm->Seek( nPersOfs ); - *mpStrm << nPersistEntrys; + mpStrm->WriteUInt32( nPersistEntrys ); mpStrm->Seek( nOldPos ); } } @@ -1433,12 +1433,12 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() *mpVBA >> n1 >> n2; - *mpStrm << mnVBAOleOfs; + mpStrm->WriteUInt32( mnVBAOleOfs ); sal_uInt32 nOldPos = mpStrm->Tell(); mpStrm->Seek( nOfs ); // Fill the VBAInfoAtom with the correct index to the persisttable - *mpStrm << nPersistEntrys - << n1 - << sal_Int32(2); + mpStrm->WriteUInt32( nPersistEntrys ) + .WriteUInt32( n1 ) + .WriteInt32( sal_Int32(2) ); mpStrm->Seek( nOldPos ); } @@ -1446,19 +1446,19 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() nPos = mpStrm->Tell(); mpStrm->Seek( nPersistOfs ); mpPptEscherEx->AddAtom( ( nPersistEntrys + 1 ) << 2, EPP_PersistPtrIncrementalBlock ); // insert Record Header - *mpStrm << (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 ); + mpStrm->WriteUInt32( (sal_uInt32)( ( nPersistEntrys << 20 ) | 1 ) ); mpStrm->Seek( nPos ); - *mpCurUserStrm << (sal_uInt32)nPos; // set offset to current edit + mpCurUserStrm->WriteUInt32( (sal_uInt32)nPos ); // set offset to current edit mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom ); - *mpStrm << (sal_Int32)0x100 // last slide ID - << (sal_uInt32)0x03000dbc // minor and major app version that did the save - << (sal_uInt32)0 // offset last save, 0 after a full save - << nPersistOfs // File offset to persist pointers for this save operation - << (sal_uInt32)1 // Persist reference to the document persist object - << (sal_uInt32)nPersistEntrys // max persists written, Seed value for persist object id management - << (sal_Int16)EPP_LastViewTypeSlideView // last view type - << (sal_Int16)0x12; // padword + mpStrm->WriteInt32( (sal_Int32)0x100 ) // last slide ID + .WriteUInt32( (sal_uInt32)0x03000dbc ) // minor and major app version that did the save + .WriteUInt32( (sal_uInt32)0 ) // offset last save, 0 after a full save + .WriteUInt32( nPersistOfs ) // File offset to persist pointers for this save operation + .WriteUInt32( (sal_uInt32)1 ) // Persist reference to the document persist object + .WriteUInt32( (sal_uInt32)nPersistEntrys ) // max persists written, Seed value for persist object id management + .WriteInt16( (sal_Int16)EPP_LastViewTypeSlideView ) // last view type + .WriteInt16( (sal_Int16)0x12 ); // padword return sal_True; } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 45bf78b10647..501fa786f102 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -160,14 +160,14 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm ) sal_uInt32 nSize = 28; if ( pStrm ) { - *pStrm << (sal_uInt32)( 0x1f | ( EPP_VBAInfo << 16 ) ) - << (sal_uInt32)( nSize - 8 ) - << (sal_uInt32)( 2 | ( EPP_VBAInfoAtom << 16 ) ) - << (sal_uInt32)12; + pStrm->WriteUInt32( (sal_uInt32)( 0x1f | ( EPP_VBAInfo << 16 ) ) ) + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ) + .WriteUInt32( (sal_uInt32)( 2 | ( EPP_VBAInfoAtom << 16 ) ) ) + .WriteUInt32( (sal_uInt32)12 ); mpPptEscherEx->InsertPersistOffset( EPP_Persist_VBAInfoAtom, pStrm->Tell() ); - *pStrm << (sal_uInt32)0 - << (sal_uInt32)0 - << (sal_uInt32)1; + pStrm->WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)1 ); } return nSize; } @@ -201,24 +201,24 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream nPosition1 = 0xb40; nPosition2 = 0x870; } - *pStrm << (sal_uInt32)( 0xf | ( EPP_SlideViewInfo << 16 ) | ( nInstance << 4 ) ) - << (sal_uInt32)( nSize - 8 ) - << (sal_uInt32)( EPP_SlideViewInfoAtom << 16 ) << (sal_uInt32)3 - << bShowGuides << bSnapToGrid << bSnapToShape - << (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52 - << nScaling << (sal_Int32)100 << nScaling << (sal_Int32)100 // scaling atom - Keeps the current scale - << nScaling << (sal_Int32)100 << nScaling << (sal_Int32)100 // scaling atom - Keeps the previous scale - << (sal_Int32)0x17ac << nMasterCoordinate// Origin - Keeps the origin in master coordinates - << nXOrigin << nYOrigin // Origin - << (sal_uInt8)1 // Bool1 varScale - Set if zoom to fit is set - << (sal_uInt8)0 // bool1 draftMode - Not used - << (sal_uInt16)0 // padword - << (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) << (sal_uInt32)8 - << (sal_uInt32)0 // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. - << nPosition1 // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal. - << (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) << (sal_uInt32)8 - << (sal_Int32)1 // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. - << nPosition2; // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal. + pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_SlideViewInfo << 16 ) | ( nInstance << 4 ) ) ) + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ) + .WriteUInt32( (sal_uInt32)( EPP_SlideViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)3 ) + .WriteUChar( bShowGuides ).WriteUChar( bSnapToGrid ).WriteUChar( bSnapToShape ) + .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 ) + .WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ).WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ) // scaling atom - Keeps the current scale + .WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ).WriteInt32( nScaling ).WriteInt32( (sal_Int32)100 ) // scaling atom - Keeps the previous scale + .WriteInt32( (sal_Int32)0x17ac ).WriteInt32( nMasterCoordinate )// Origin - Keeps the origin in master coordinates + .WriteInt32( nXOrigin ).WriteInt32( nYOrigin ) // Origin + .WriteUChar( (sal_uInt8)1 ) // Bool1 varScale - Set if zoom to fit is set + .WriteUChar( (sal_uInt8)0 ) // bool1 draftMode - Not used + .WriteUInt16( (sal_uInt16)0 ) // padword + .WriteUInt32( (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( (sal_uInt32)8 ) + .WriteUInt32( (sal_uInt32)0 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. + .WriteInt32( nPosition1 ) // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal. + .WriteUInt32( (sal_uInt32)( ( 7 << 4 ) | ( EPP_GuideAtom << 16 ) ) ).WriteUInt32( (sal_uInt32)8 ) + .WriteInt32( (sal_Int32)1 ) // Type of the guide. If the guide is horizontal this value is zero. If it's vertical, it's one. + .WriteInt32( nPosition2 ); // Position of the guide in master coordinates. X coordinate if it's vertical, and Y coordinate if it's horizontal. } return nSize; } @@ -230,15 +230,15 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm ) sal_uInt32 nSize = 68; if ( pStrm ) { - *pStrm << (sal_uInt32)( 0xf | ( EPP_OutlineViewInfo << 16 ) ) << (sal_uInt32)( nSize - 8 ) - << (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52 - << (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the current scale - << (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 << (sal_Int32)200 // scaling atom - Keeps the previous scale - << (sal_Int32)0x17ac << (sal_Int32)0xdda // Origin - Keeps the origin in master coordinates - << (sal_Int32)-780 << (sal_Int32)-84 // Origin - << (sal_uInt8)1 // bool1 varScale - Set if zoom to fit is set - << (sal_uInt8)0 // bool1 draftMode - Not used - << (sal_uInt16)0; // padword + pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_OutlineViewInfo << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) ) + .WriteUInt32( (sal_uInt32)( EPP_ViewInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)52 ) + .WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ).WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ) // scaling atom - Keeps the current scale + .WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ).WriteInt32( (sal_Int32)170 ).WriteInt32( (sal_Int32)200 ) // scaling atom - Keeps the previous scale + .WriteInt32( (sal_Int32)0x17ac ).WriteInt32( (sal_Int32)0xdda ) // Origin - Keeps the origin in master coordinates + .WriteInt32( (sal_Int32)-780 ).WriteInt32( (sal_Int32)-84 ) // Origin + .WriteUChar( (sal_uInt8)1 ) // bool1 varScale - Set if zoom to fit is set + .WriteUChar( (sal_uInt8)0 ) // bool1 draftMode - Not used + .WriteUInt16( (sal_uInt16)0 ); // padword } return nSize; } @@ -259,15 +259,15 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm ) if ( pStrm ) { - *pStrm << (sal_uInt32)( EPP_BinaryTagData << 16 ) << (sal_uInt32)( nSize - 8 ); + pStrm->WriteUInt32( (sal_uInt32)( EPP_BinaryTagData << 16 ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) ); if ( nPictureStreamSize ) { - *pStrm << (sal_uInt32)( 0xf | ( EPP_PST_ExtendedBuGraContainer << 16 ) ) << nPictureStreamSize; + pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_PST_ExtendedBuGraContainer << 16 ) ) ).WriteUInt32( nPictureStreamSize ); pStrm->Write( aBuExPictureStream.GetData(), nPictureStreamSize ); } if ( nOutlineStreamSize ) { - *pStrm << (sal_uInt32)( 0xf | ( EPP_PST_ExtendedPresRuleContainer << 16 ) ) << nOutlineStreamSize; + pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_PST_ExtendedPresRuleContainer << 16 ) ) ).WriteUInt32( nOutlineStreamSize ); pStrm->Write( aBuExOutlineStream.GetData(), nOutlineStreamSize ); } } @@ -281,16 +281,16 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea sal_uInt32 nSize = 8 + 8 + 14; if ( pStrm ) { - *pStrm << (sal_uInt32)( 0xf | ( EPP_ProgBinaryTag << 16 ) ) << (sal_uInt32)0 - << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)14 - << (sal_uInt32)0x5f005f << (sal_uInt32)0x50005f - << (sal_uInt32)0x540050 << (sal_uInt16)0x39; + pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ProgBinaryTag << 16 ) ) ).WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)14 ) + .WriteUInt32( (sal_uInt32)0x5f005f ).WriteUInt32( (sal_uInt32)0x50005f ) + .WriteUInt32( (sal_uInt32)0x540050 ).WriteUInt16( (sal_uInt16)0x39 ); } if ( pBinTagStrm ) { sal_uInt32 nLen = pBinTagStrm->Tell(); nSize += nLen + 8; - *pStrm << (sal_uInt32)( EPP_BinaryTagData << 16 ) << nLen; + pStrm->WriteUInt32( (sal_uInt32)( EPP_BinaryTagData << 16 ) ).WriteUInt32( nLen ); pStrm->Write( pBinTagStrm->GetData(), nLen ); } else @@ -299,7 +299,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea if ( pStrm ) { pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) ); - *pStrm << (sal_uInt32)( nSize - 8 ); + pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) ); pStrm->SeekRel( nSize - 8 ); } return nSize; @@ -315,13 +315,13 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi nSize = 8; if ( pStrm ) { - *pStrm << (sal_uInt32)( 0xf | ( EPP_ProgTags << 16 ) ) << (sal_uInt32)0; + pStrm->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ProgTags << 16 ) ) ).WriteUInt32( (sal_uInt32)0 ); } nSize += ImplProgBinaryTagContainer( pStrm, pBinTagStrm ); if ( pStrm ) { pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) ); - *pStrm << (sal_uInt32)( nSize - 8 ); + pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) ); pStrm->SeekRel( nSize - 8 ); } } @@ -335,7 +335,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm ) sal_uInt32 nSize = 8; if ( pStrm ) { - *pStrm << (sal_uInt32)( ( EPP_List << 16 ) | 0xf ) << (sal_uInt32)0; + pStrm->WriteUInt32( (sal_uInt32)( ( EPP_List << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)0 ); } nSize += ImplVBAInfoContainer( pStrm ); @@ -347,7 +347,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm ) if ( pStrm ) { pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) ); - *pStrm << (sal_uInt32)( nSize - 8 ); + pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) ); pStrm->SeekRel( nSize - 8 ); } return nSize; @@ -360,17 +360,17 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm ) sal_uInt32 i, nSize = 28 * mnMasterPages + 8; if ( pStrm ) { - *pStrm << (sal_uInt32)( 0x1f | ( EPP_SlideListWithText << 16 ) ) << (sal_uInt32)( nSize - 8 ); + pStrm->WriteUInt32( (sal_uInt32)( 0x1f | ( EPP_SlideListWithText << 16 ) ) ).WriteUInt32( (sal_uInt32)( nSize - 8 ) ); for ( i = 0; i < mnMasterPages; i++ ) { - *pStrm << (sal_uInt32)( EPP_SlidePersistAtom << 16 ) << (sal_uInt32)20; + pStrm->WriteUInt32( (sal_uInt32)( EPP_SlidePersistAtom << 16 ) ).WriteUInt32( (sal_uInt32)20 ); mpPptEscherEx->InsertPersistOffset( EPP_MAINMASTER_PERSIST_KEY | i, pStrm->Tell() ); - *pStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINMASTER_PERSIST_KEY ) - << (sal_uInt32)0 // flags - only bit 3 used, if set then slide contains shapes other than placeholders - << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects - << (sal_Int32)( 0x80000000 | i ) // slideId - Unique slide identifier, used for OLE link monikers for example - << (sal_uInt32)0; // reserved, usualy 0 + pStrm->WriteUInt32( (sal_uInt32)0 ) // psrReference - logical reference to the slide persist object ( EPP_MAINMASTER_PERSIST_KEY ) + .WriteUInt32( (sal_uInt32)0 ) // flags - only bit 3 used, if set then slide contains shapes other than placeholders + .WriteInt32( (sal_Int32)0 ) // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects + .WriteInt32( (sal_Int32)( 0x80000000 | i ) ) // slideId - Unique slide identifier, used for OLE link monikers for example + .WriteUInt32( (sal_uInt32)0 ); // reserved, usualy 0 } } return nSize; @@ -395,14 +395,14 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const } maHyperlink.push_back( EPPTHyperlink( sBookmarkURL, nType ) ); - *mpExEmbed << (sal_uInt16)0xf - << (sal_uInt16)EPP_ExHyperlink - << (sal_uInt32)0; + mpExEmbed->WriteUInt16( (sal_uInt16)0xf ) + .WriteUInt16( (sal_uInt16)EPP_ExHyperlink ) + .WriteUInt32( (sal_uInt32)0 ); sal_uInt32 nHyperSize, nHyperStart = mpExEmbed->Tell(); - *mpExEmbed << (sal_uInt16)0 - << (sal_uInt16)EPP_ExHyperlinkAtom - << (sal_uInt32)4 - << nHyperId; + mpExEmbed->WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)EPP_ExHyperlinkAtom ) + .WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( nHyperId ); PPTWriter::WriteCString( *mpExEmbed, rStringVer0, 0 ); PPTWriter::WriteCString( *mpExEmbed, rStringVer1, 1 ); @@ -411,7 +411,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const nHyperSize = mpExEmbed->Tell() - nHyperStart; mpExEmbed->SeekRel( - ( (sal_Int32)nHyperSize + 4 ) ); - *mpExEmbed << nHyperSize; + mpExEmbed->WriteUInt32( nHyperSize ); mpExEmbed->SeekRel( nHyperSize ); return nHyperId; } @@ -430,7 +430,7 @@ sal_Bool PPTWriter::ImplCloseDocument() SvMemoryStream aTxMasterStyleAtomStrm( 0x200, 0x200 ); { EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other ); - aTxMasterStyleAtomStrm << (sal_uInt16)5; // paragraph count + aTxMasterStyleAtomStrm.WriteUInt16( (sal_uInt16)5 ); // paragraph count sal_uInt16 nLev; sal_Bool bFirst = sal_True; for ( nLev = 0; nLev < 5; nLev++ ) @@ -468,27 +468,27 @@ sal_Bool PPTWriter::ImplCloseDocument() // CREATE HYPERLINK CONTAINER if ( nExEmbedSize ) { - *mpStrm << (sal_uInt16)0xf - << (sal_uInt16)EPP_ExObjList - << (sal_uInt32)( nExEmbedSize + 12 ) - << (sal_uInt16)0 - << (sal_uInt16)EPP_ExObjListAtom - << (sal_uInt32)4 - << (sal_uInt32)mnExEmbed; + mpStrm->WriteUInt16( (sal_uInt16)0xf ) + .WriteUInt16( (sal_uInt16)EPP_ExObjList ) + .WriteUInt32( (sal_uInt32)( nExEmbedSize + 12 ) ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)EPP_ExObjListAtom ) + .WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( (sal_uInt32)mnExEmbed ); mpPptEscherEx->InsertPersistOffset( EPP_Persist_ExObj, mpStrm->Tell() ); mpStrm->Write( mpExEmbed->GetData(), nExEmbedSize ); } // CREATE ENVIRONMENT - *mpStrm << (sal_uInt16)0xf << (sal_uInt16)EPP_Environment << (sal_uInt32)nEnvironment; + mpStrm->WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_Environment ).WriteUInt32( (sal_uInt32)nEnvironment ); // Open Container ( EPP_SrKinsoku ) - *mpStrm << (sal_uInt16)0x2f << (sal_uInt16)EPP_SrKinsoku << (sal_uInt32)12; + mpStrm->WriteUInt16( (sal_uInt16)0x2f ).WriteUInt16( (sal_uInt16)EPP_SrKinsoku ).WriteUInt32( (sal_uInt32)12 ); mpPptEscherEx->AddAtom( 4, EPP_SrKinsokuAtom, 0, 3 ); - *mpStrm << (sal_Int32)0; // SrKinsoku Level 0 + mpStrm->WriteInt32( (sal_Int32)0 ); // SrKinsoku Level 0 // Open Container ( EPP_FontCollection ) - *mpStrm << (sal_uInt16)0xf << (sal_uInt16)EPP_FontCollection << (sal_uInt32)maFontCollection.GetCount() * 76; + mpStrm->WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_FontCollection ).WriteUInt32( (sal_uInt32)maFontCollection.GetCount() * 76 ); for ( sal_uInt32 i = 0; i < maFontCollection.GetCount(); i++ ) { @@ -502,7 +502,7 @@ sal_Bool PPTWriter::ImplCloseDocument() sal_Unicode nUniCode = 0; if ( n < nFontLen ) nUniCode = pDesc->Name[n]; - *mpStrm << nUniCode; + mpStrm->WriteUInt16( nUniCode ); } sal_uInt8 lfCharSet = ANSI_CHARSET; sal_uInt8 lfClipPrecision = 0; @@ -548,18 +548,18 @@ sal_Bool PPTWriter::ImplCloseDocument() lfPitchAndFamily |= DEFAULT_PITCH; break; } - *mpStrm << lfCharSet - << lfClipPrecision - << lfQuality - << lfPitchAndFamily; + mpStrm->WriteUChar( lfCharSet ) + .WriteUChar( lfClipPrecision ) + .WriteUChar( lfQuality ) + .WriteUChar( lfPitchAndFamily ); } mpStyleSheet->WriteTxCFStyleAtom( *mpStrm ); // create style that is used for new standard objects mpPptEscherEx->AddAtom( 10, EPP_TxSIStyleAtom ); - *mpStrm << (sal_uInt32)7 // ? - << (sal_Int16)2 // ? - << (sal_uInt8)9 // ? - << (sal_uInt8)8 // ? - << (sal_Int16)0; // ? + mpStrm->WriteUInt32( (sal_uInt32)7 ) // ? + .WriteInt16( (sal_Int16)2 ) // ? + .WriteUChar( (sal_uInt8)9 ) // ? + .WriteUChar( (sal_uInt8)8 ) // ? + .WriteInt16( (sal_Int16)0 ); // ? mpStrm->Write( aTxMasterStyleAtomStrm.GetData(), aTxMasterStyleAtomStrm.Tell() ); maSoundCollection.Write( *mpStrm ); @@ -774,18 +774,18 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) FontCollectionEntry aFontDescEntry( pPara->aFontDesc.Name, pPara->aFontDesc.Family, pPara->aFontDesc.Pitch, pPara->aFontDesc.CharSet ); sal_uInt16 nFontId = (sal_uInt16)maFontCollection.GetId( aFontDescEntry ); - rOut << nCharCount - << nDepth // Level - << (sal_uInt32)nPropertyFlags; // Paragraph Attribut Set + rOut.WriteUInt32( nCharCount ) + .WriteUInt16( nDepth ) // Level + .WriteUInt32( (sal_uInt32)nPropertyFlags ); // Paragraph Attribut Set if ( nPropertyFlags & 0xf ) - rOut << nBulletFlags; + rOut.WriteInt16( nBulletFlags ); if ( nPropertyFlags & 0x80 ) - rOut << (sal_uInt16)( pPara->cBulletId ); + rOut.WriteUInt16( (sal_uInt16)( pPara->cBulletId ) ); if ( nPropertyFlags & 0x10 ) - rOut << nFontId; + rOut.WriteUInt16( nFontId ); if ( nPropertyFlags & 0x40 ) - rOut << (sal_Int16)nBuRealSize; + rOut.WriteInt16( (sal_Int16)nBuRealSize ); if ( nPropertyFlags & 0x20 ) { sal_uInt32 nBulletColor = pPara->nBulletColor; @@ -799,20 +799,20 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) } nBulletColor &= 0xffffff; nBulletColor |= 0xfe000000; - rOut << nBulletColor; + rOut.WriteUInt32( nBulletColor ); } if ( nPropertyFlags & 0x00000800 ) - rOut << (sal_uInt16)( pPara->mnTextAdjust ); + rOut.WriteUInt16( (sal_uInt16)( pPara->mnTextAdjust ) ); if ( nPropertyFlags & 0x00001000 ) - rOut << (sal_uInt16)( nLineSpacing ); + rOut.WriteUInt16( (sal_uInt16)( nLineSpacing ) ); if ( nPropertyFlags & 0x00002000 ) - rOut << (sal_uInt16)( pPara->mnLineSpacingTop ); + rOut.WriteUInt16( (sal_uInt16)( pPara->mnLineSpacingTop ) ); if ( nPropertyFlags & 0x00004000 ) - rOut << (sal_uInt16)( pPara->mnLineSpacingBottom ); + rOut.WriteUInt16( (sal_uInt16)( pPara->mnLineSpacingBottom ) ); if ( nPropertyFlags & 0x100 ) - rOut << (sal_uInt16)(pPara->nTextOfs); + rOut.WriteUInt16( (sal_uInt16)(pPara->nTextOfs) ); if ( nPropertyFlags & 0x400 ) - rOut << (sal_uInt16)(pPara->nBulletOfs); + rOut.WriteUInt16( (sal_uInt16)(pPara->nBulletOfs) ); if ( nPropertyFlags & 0x000e0000 ) { sal_uInt16 nAsianSettings = 0; @@ -820,10 +820,10 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) nAsianSettings |= 1; if ( pPara->mbParagraphPunctation ) nAsianSettings |= 4; - rOut << nAsianSettings; + rOut.WriteUInt16( nAsianSettings ); } if ( nPropertyFlags & 0x200000 ) - rOut << pPara->mnBiDi; + rOut.WriteUInt16( pPara->mnBiDi ); } } @@ -994,21 +994,21 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) sal_uInt32 nCharCount = pPortion->Count(); - rOut << nCharCount - << nPropertyFlags; //PropertyFlags + rOut.WriteUInt32( nCharCount ) + .WriteUInt32( nPropertyFlags ); //PropertyFlags if ( nPropertyFlags & 0xffff ) - rOut << (sal_uInt16)( nCharAttr ); + rOut.WriteUInt16( (sal_uInt16)( nCharAttr ) ); if ( nPropertyFlags & 0x00010000 ) - rOut << pPortion->mnFont; + rOut.WriteUInt16( pPortion->mnFont ); if ( nPropertyFlags & 0x00200000 ) - rOut << pPortion->mnAsianOrComplexFont; + rOut.WriteUInt16( pPortion->mnAsianOrComplexFont ); if ( nPropertyFlags & 0x00020000 ) - rOut << (sal_uInt16)( pPortion->mnCharHeight ); + rOut.WriteUInt16( (sal_uInt16)( pPortion->mnCharHeight ) ); if ( nPropertyFlags & 0x00040000 ) - rOut << (sal_uInt32)nCharColor; + rOut.WriteUInt32( (sal_uInt32)nCharColor ); if ( nPropertyFlags & 0x00080000 ) - rOut << pPortion->mnCharEscapement; + rOut.WriteInt16( pPortion->mnCharEscapement ); } } } @@ -1111,8 +1111,8 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u { PPTExParaSheet& rParaSheet = mpStyleSheet->GetParaSheet( nTextInstance ); - rOut << (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) << (sal_uInt32)4 - << sal_Int32(nTextInstance); + rOut.WriteUInt32( (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4 ) ) ).WriteUInt32( (sal_uInt32)4 ) + .WriteInt32( sal_Int32(nTextInstance) ); if ( mbEmptyPresObj ) mnTextSize = 0; @@ -1131,12 +1131,12 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u sal_uInt32 nSize, nPos = rOut.Tell(); - rOut << (sal_uInt32)( EPP_StyleTextPropAtom << 16 ) << (sal_uInt32)0; + rOut.WriteUInt32( (sal_uInt32)( EPP_StyleTextPropAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 ); ImplWriteParagraphs( rOut, aTextObj ); ImplWritePortions( rOut, aTextObj ); nSize = rOut.Tell() - nPos; rOut.SeekRel( - ( (sal_Int32)nSize - 4 ) ); - rOut << (sal_uInt32)( nSize - 8 ); + rOut.WriteUInt32( (sal_uInt32)( nSize - 8 ) ); rOut.SeekRel( nSize - 8 ); for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i ) @@ -1154,16 +1154,16 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u case 1 : case 2 : { - rOut << (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) << (sal_uInt32)8 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ) // TxtOffset to TxtField; - << (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) // Type - << (sal_uInt8)0 << (sal_uInt16)0; // PadBytes + rOut.WriteUInt32( (sal_uInt32)( EPP_DateTimeMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ) // TxtOffset to TxtField; + .WriteUChar( (sal_uInt8)( pFieldEntry->nFieldType & 0xff ) ) // Type + .WriteUChar( (sal_uInt8)0 ).WriteUInt16( (sal_uInt16)0 ); // PadBytes } break; case 3 : { - rOut << (sal_uInt32)( EPP_SlideNumberMCAtom << 16 ) << (sal_uInt32 ) 4 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ); + rOut.WriteUInt32( (sal_uInt32)( EPP_SlideNumberMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ); } break; case 4 : @@ -1206,37 +1206,37 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u else nHyperId = ImplInsertBookmarkURL( pFieldEntry->aFieldUrl, 2 | ( nHyperId << 8 ), aFile, aTarget, "", "" ); - rOut << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24 - << (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16 - << (sal_uInt32)0 // soundref - << nHyperId // hyperlink id - << (sal_uInt8)4 // hyperlink action - << (sal_uInt8)0 // ole verb - << (sal_uInt8)0 // jump - << (sal_uInt8)0 // flags - << (sal_uInt8)8 // hyperlink type ? - << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 - << (sal_uInt32)( EPP_TxInteractiveInfoAtom << 16 ) << (sal_uInt32)8 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ) - << (sal_uInt32)( pFieldEntry->nFieldEndPos ); + rOut.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)24 ) + .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)16 ) + .WriteUInt32( (sal_uInt32)0 ) // soundref + .WriteUInt32( nHyperId ) // hyperlink id + .WriteUChar( (sal_uInt8)4 ) // hyperlink action + .WriteUChar( (sal_uInt8)0 ) // ole verb + .WriteUChar( (sal_uInt8)0 ) // jump + .WriteUChar( (sal_uInt8)0 ) // flags + .WriteUChar( (sal_uInt8)8 ) // hyperlink type ? + .WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ) + .WriteUInt32( (sal_uInt32)( EPP_TxInteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldEndPos ) ); } break; case 5 : { - rOut << (sal_uInt32)( EPP_GenericDateMCAtom << 16 ) << (sal_uInt32)4 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ); + rOut.WriteUInt32( (sal_uInt32)( EPP_GenericDateMCAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ); } break; case 6 : { - rOut << (sal_uInt32)( EPP_HeaderMCAtom << 16 ) << (sal_uInt32 ) 4 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ); + rOut.WriteUInt32( (sal_uInt32)( EPP_HeaderMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ); } break; case 7 : { - rOut << (sal_uInt32)( EPP_FooterMCAtom << 16 ) << (sal_uInt32 ) 4 - << (sal_uInt32)( pFieldEntry->nFieldStartPos ); + rOut.WriteUInt32( (sal_uInt32)( EPP_FooterMCAtom << 16 ) ).WriteUInt32( (sal_uInt32 ) 4 ) + .WriteUInt32( (sal_uInt32)( pFieldEntry->nFieldStartPos ) ); } break; default: @@ -1314,11 +1314,11 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u pRuleOut = pTextRule->pOut = new SvMemoryStream( 0x100, 0x100 ); sal_uInt32 nRulePos = pRuleOut->Tell(); - *pRuleOut << (sal_uInt32)( EPP_TextRulerAtom << 16 ) << (sal_uInt32)0; - *pRuleOut << nTextRulerAtomFlags; + pRuleOut->WriteUInt32( (sal_uInt32)( EPP_TextRulerAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 ); + pRuleOut->WriteUInt32( nTextRulerAtomFlags ); if ( nTextRulerAtomFlags & 4 ) { - *pRuleOut << (sal_uInt16)nTabCount; + pRuleOut->WriteUInt16( (sal_uInt16)nTabCount ); for ( i = 0; i < nTabs; i++ ) { sal_uInt16 nPosition = (sal_uInt16)( ( pTabStop[ i ].Position / 4.40972 ) + nTextOfs ); @@ -1332,8 +1332,8 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u case ::com::sun::star::style::TabAlign_LEFT : default: nType = 0; }; - *pRuleOut << nPosition - << nType; + pRuleOut->WriteUInt16( nPosition ) + .WriteUInt16( nType ); } sal_uInt32 nWidth = 1; @@ -1341,18 +1341,18 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u nWidth += (sal_Int32)( ( ( pTabStop[ nTabs - 1 ].Position / 4.40972 + nTextOfs ) / nDefaultTabSize ) ); nWidth *= nDefaultTabSize; for ( i = 0; i < nDefaultTabs; i++, nWidth += nDefaultTabSize ) - *pRuleOut << nWidth; + pRuleOut->WriteUInt32( nWidth ); } for ( i = 0; i < 5; i++ ) { if ( nTextRulerAtomFlags & ( 8 << i ) ) - *pRuleOut << nNumberingRule[ i << 1 ]; + pRuleOut->WriteInt16( nNumberingRule[ i << 1 ] ); if ( nTextRulerAtomFlags & ( 256 << i ) ) - *pRuleOut << nNumberingRule[ ( i << 1 ) + 1 ]; + pRuleOut->WriteInt16( nNumberingRule[ ( i << 1 ) + 1 ] ); } sal_uInt32 nBufSize = pRuleOut->Tell() - nRulePos; pRuleOut->SeekRel( - ( (sal_Int32)nBufSize - 4 ) ); - *pRuleOut << (sal_uInt32)( nBufSize - 8 ); + pRuleOut->WriteUInt32( (sal_uInt32)( nBufSize - 8 ) ); pRuleOut->SeekRel( nBufSize - 8 ); } } @@ -1364,7 +1364,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u sal_uInt32 nBulletFlags = 0; sal_uInt32 nNumberingType = 0, nPos2 = rExtBuStr.Tell(); - rExtBuStr << (sal_uInt32)( EPP_PST_ExtendedParagraphAtom << 16 ) << (sal_uInt32)0; + rExtBuStr.WriteUInt32( (sal_uInt32)( EPP_PST_ExtendedParagraphAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 ); for ( sal_uInt32 i = 0; i < aTextObj.ParagraphCount(); ++i ) { @@ -1377,10 +1377,10 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u if ( pBulletPara->nNumberingType != SVX_NUM_BITMAP ) nBulletFlags = 0x3000000; } - rExtBuStr << (sal_uInt32)nBulletFlags; + rExtBuStr.WriteUInt32( (sal_uInt32)nBulletFlags ); if ( nBulletFlags & 0x800000 ) - rExtBuStr << nBulletId; + rExtBuStr.WriteUInt16( nBulletId ); if ( nBulletFlags & 0x1000000 ) { switch( pBulletPara->nNumberingType ) @@ -1409,15 +1409,15 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u break; } - rExtBuStr << (sal_uInt32)nNumberingType; + rExtBuStr.WriteUInt32( (sal_uInt32)nNumberingType ); } if ( nBulletFlags & 0x2000000 ) - rExtBuStr << (sal_uInt16)pBulletPara->nStartWith; - rExtBuStr << (sal_uInt32)0 << (sal_uInt32)0; + rExtBuStr.WriteUInt16( (sal_uInt16)pBulletPara->nStartWith ); + rExtBuStr.WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 ); } sal_uInt32 nBulletSize = ( rExtBuStr.Tell() - nPos2 ) - 8; rExtBuStr.SeekRel( - ( (sal_Int32)nBulletSize + 4 ) ); - rExtBuStr << nBulletSize; + rExtBuStr.WriteUInt32( nBulletSize ); rExtBuStr.SeekRel( nBulletSize ); } } @@ -1936,11 +1936,11 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, if ( ImplGetPropertyValue( OUString( "DimColor" ) ) ) nDimColor = mpPptEscherEx->GetColor( *((sal_uInt32*)mAny.getValue()) ) | 0xfe000000; - rSt << nDimColor << nFlags << nSoundRef << nDelayTime - << nOrder // order of build ( 1.. ) - << nSlideCount << nBuildType << nFlyMethod << nFlyDirection - << nAfterEffect << nSubEffect << nOleVerb - << (sal_uInt16)0; // PadWord + rSt.WriteUInt32( nDimColor ).WriteUInt32( nFlags ).WriteUInt32( nSoundRef ).WriteUInt32( nDelayTime ) + .WriteUInt16( nOrder ) // order of build ( 1.. ) + .WriteUInt16( nSlideCount ).WriteUChar( nBuildType ).WriteUChar( nFlyMethod ).WriteUChar( nFlyDirection ) + .WriteUChar( nAfterEffect ).WriteUChar( nSubEffect ).WriteUChar( nOleVerb ) + .WriteUInt16( (sal_uInt16)0 ); // PadWord } // ----------------------------------------------------------------------- @@ -2076,27 +2076,27 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat sal_uInt32 nContainerSize = 24; if ( nAction == 2 ) nContainerSize += ( aFile.getLength() * 2 ) + 8; - rSt << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)nContainerSize - << (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) << (sal_uInt32)16 - << nSoundRef - << nHyperLinkID - << nAction - << nOleVerb - << nJump - << nFlags - << (sal_uInt32)nHyperLinkType; + rSt.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)nContainerSize ) + .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfoAtom << 16 ) ).WriteUInt32( (sal_uInt32)16 ) + .WriteUInt32( nSoundRef ) + .WriteUInt32( nHyperLinkID ) + .WriteUChar( nAction ) + .WriteUChar( nOleVerb ) + .WriteUChar( nJump ) + .WriteUChar( nFlags ) + .WriteUInt32( (sal_uInt32)nHyperLinkType ); if ( nAction == 2 ) // run program Action { sal_Int32 nLen = aFile.getLength(); - rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) << (sal_uInt32)( nLen * 2 ); + rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 0x20 ) ).WriteUInt32( (sal_uInt32)( nLen * 2 ) ); for ( sal_Int32 i = 0; i < nLen; i++ ) - rSt << aFile[i]; + rSt.WriteUInt16( aFile[i] ); } - rSt << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0x1f ) << (sal_uInt32)24 // Mouse Over Action - << (sal_uInt32)( EPP_InteractiveInfo << 16 ) << (sal_uInt32)16; - for ( int i = 0; i < 4; i++, rSt << (sal_uInt32)0 ) ; + rSt.WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0x1f ) ).WriteUInt32( (sal_uInt32)24 ) // Mouse Over Action + .WriteUInt32( (sal_uInt32)( EPP_InteractiveInfo << 16 ) ).WriteUInt32( (sal_uInt32)16 ); + for ( int i = 0; i < 4; i++, rSt.WriteUInt32( (sal_uInt32)0 ) ) ; } // ----------------------------------------------------------------------- @@ -2159,19 +2159,19 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag aPropOpt.CreateShapeProperties( mXShape ); aPropOpt.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // oben, links, rechts, unten ???? + mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // oben, links, rechts, unten ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); - *mpStrm << (sal_uInt32)0 // PlacementID - << (sal_uInt8)nPlaceHolderId // PlaceHolderID - << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) - << (sal_uInt16)0; // padword + mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID + .WriteUChar( (sal_uInt8)nPlaceHolderId ) // PlaceHolderID + .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) + .WriteUInt16( (sal_uInt16)0 ); // padword mpPptEscherEx->CloseContainer(); // ESCHER_ClientData if ( aClientTextBox.Tell() ) { - *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) - << (sal_uInt32)aClientTextBox.Tell(); + mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) ) + .WriteUInt32( (sal_uInt32)aClientTextBox.Tell() ); mpStrm->Write( aClientTextBox.GetData(), aClientTextBox.Tell() ); } @@ -2520,8 +2520,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a catch( ::com::sun::star::uno::Exception& ) {} - *mpExEmbed << (sal_uInt32)( 0xf | ( EPP_ExControl << 16 ) ) - << (sal_uInt32)0; // Size of this container + mpExEmbed->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ExControl << 16 ) ) ) + .WriteUInt32( (sal_uInt32)0 ); // Size of this container sal_uInt32 nSize, nOldPos = mpExEmbed->Tell(); @@ -2530,9 +2530,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nPageId |= 0x80000000; else nPageId += 0x100; - *mpExEmbed << (sal_uInt32)( EPP_ExControlAtom << 16 ) - << (sal_uInt32)4 - << nPageId; + mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_ExControlAtom << 16 ) ) + .WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( nPageId ); PPTExOleObjEntry* pEntry = new PPTExOleObjEntry( OCX_CONTROL, mpExEmbed->Tell() ); pEntry->xControlModel = aXControlModel; pEntry->xShape = mXShape; @@ -2540,14 +2540,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mnExEmbed++; - *mpExEmbed << (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) - << (sal_uInt32)24 - << (sal_uInt32)nAspect - << (sal_uInt32)2 - << (sal_uInt32)mnExEmbed - << (sal_uInt32)0 - << (sal_uInt32)4 // index to the persist table - << (sal_uInt32)0x0012de00; + mpExEmbed->WriteUInt32( (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) ) + .WriteUInt32( (sal_uInt32)24 ) + .WriteUInt32( (sal_uInt32)nAspect ) + .WriteUInt32( (sal_uInt32)2 ) + .WriteUInt32( (sal_uInt32)mnExEmbed ) + .WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)4 ) // index to the persist table + .WriteUInt32( (sal_uInt32)0x0012de00 ); ::com::sun::star::awt::Size aSize; OUString aControlName; @@ -2595,7 +2595,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } nSize = mpExEmbed->Tell() - nOldPos; mpExEmbed->Seek( nOldPos - 4 ); - *mpExEmbed << nSize; + mpExEmbed->WriteUInt32( nSize ); mpExEmbed->Seek( STREAM_SEEK_TO_END ); nOlePictureId = mnExEmbed; @@ -2861,17 +2861,17 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt ); aPropertyOptions.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // top, left, right, bottom ???? + mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); - *mpStrm << (sal_uInt32)0 // PlacementID - << (sal_uInt8)EPP_PLACEHOLDER_MASTERTITLE // PlaceHolderID - << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) - << (sal_uInt16)0; // padword + mpStrm->WriteUInt32( (sal_uInt32)0 ) // PlacementID + .WriteUChar( (sal_uInt8)EPP_PLACEHOLDER_MASTERTITLE ) // PlaceHolderID + .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) + .WriteUInt16( (sal_uInt16)0 ); // padword mpPptEscherEx->CloseContainer(); // ESCHER_ClientData mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox ); mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom ); - *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Title; + mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_Title ); mpPptEscherEx->AddAtom( mnTextSize << 1, EPP_TextCharsAtom ); const sal_Unicode* pString = aUString.getStr(); for ( sal_uInt32 i = 0; i < mnTextSize; i++ ) @@ -2879,12 +2879,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nChar = pString[ i ]; // 0xa -> 0xb soft newline if ( nChar == 0xa ) nChar++; // 0xd -> 0xd hard newline - *mpStrm << nChar; + mpStrm->WriteUInt16( nChar ); } mpPptEscherEx->AddAtom( 6, EPP_BaseTextPropAtom ); - *mpStrm << (sal_uInt32)( mnTextSize + 1 ) << (sal_uInt16)0; + mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt16( (sal_uInt16)0 ); mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom ); - *mpStrm << (sal_uInt32)( mnTextSize + 1 ) << (sal_uInt32)1 << (sal_uInt16)0; + mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize + 1 ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( (sal_uInt16)0 ); mpPptEscherEx->CloseContainer(); // ESCHER_ClientTextBox mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer } @@ -2953,21 +2953,21 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 ); aPropOpt2.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor ); - *mpStrm << (sal_Int16)maRect.Top() << (sal_Int16)maRect.Left() << (sal_Int16)maRect.Right() << (sal_Int16)maRect.Bottom(); // top, left, right, bottom ???? + mpStrm->WriteInt16( (sal_Int16)maRect.Top() ).WriteInt16( (sal_Int16)maRect.Left() ).WriteInt16( (sal_Int16)maRect.Right() ).WriteInt16( (sal_Int16)maRect.Bottom() ); // top, left, right, bottom ???? mpPptEscherEx->OpenContainer( ESCHER_ClientData ); mpPptEscherEx->AddAtom( 8, EPP_OEPlaceholderAtom ); sal_uInt8 PlaceHolderID = ( mType == "presentation.Subtitle") ? EPP_PLACEHOLDER_MASTERSUBTITLE:EPP_PLACEHOLDER_MASTERBODY; - *mpStrm << (sal_uInt32)1 // PlacementID - << PlaceHolderID/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */ // PlaceHolderID - << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) - << (sal_uInt16)0; // padword + mpStrm->WriteUInt32( (sal_uInt32)1 ) // PlacementID + .WriteUChar( PlaceHolderID )/*(sal_uInt8)EPP_PLACEHOLDER_MASTERBODY */ // PlaceHolderID + .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) + .WriteUInt16( (sal_uInt16)0 ); // padword mpPptEscherEx->CloseContainer(); // ESCHER_ClientData mpPptEscherEx->OpenContainer( ESCHER_ClientTextbox ); // printf mpPptEscherEx->AddAtom( 4, EPP_TextHeaderAtom ); if ( mType == "presentation.Subtitle") - *mpStrm << (sal_uInt32)EPP_TEXTTYPE_CenterBody; + mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_CenterBody ); else - *mpStrm << (sal_uInt32)EPP_TEXTTYPE_Body; + mpStrm->WriteUInt32( (sal_uInt32)EPP_TEXTTYPE_Body ); mnTextSize = aTextObj.Count(); aTextObj.Write( mpStrm ); mpPptEscherEx->BeginAtom(); @@ -2979,12 +2979,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( nDepth > 4) nDepth = 4; - *mpStrm << nCharCount - << nDepth; + mpStrm->WriteUInt32( nCharCount ) + .WriteUInt16( nDepth ); } mpPptEscherEx->EndAtom( EPP_BaseTextPropAtom ); mpPptEscherEx->AddAtom( 10, EPP_TextSpecInfoAtom ); - *mpStrm << (sal_uInt32)( mnTextSize ) << (sal_uInt32)1 << (sal_uInt16)0; + mpStrm->WriteUInt32( (sal_uInt32)( mnTextSize ) ).WriteUInt32( (sal_uInt32)1 ).WriteUInt16( (sal_uInt16)0 ); mpPptEscherEx->CloseContainer(); // ESCHER_ClientTextBox mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer @@ -3057,20 +3057,20 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - *mpExEmbed << (sal_uInt32)( 0xf | ( EPP_ExEmbed << 16 ) ) - << (sal_uInt32)0; // Size of this container + mpExEmbed->WriteUInt32( (sal_uInt32)( 0xf | ( EPP_ExEmbed << 16 ) ) ) + .WriteUInt32( (sal_uInt32)0 ); // Size of this container sal_uInt32 nSize, nOldPos = mpExEmbed->Tell(); - *mpExEmbed << (sal_uInt32)( EPP_ExEmbedAtom << 16 ) - << (sal_uInt32)8 - << (sal_uInt32)0 // follow colorscheme : 0->do not follow + mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_ExEmbedAtom << 16 ) ) + .WriteUInt32( (sal_uInt32)8 ) + .WriteUInt32( (sal_uInt32)0 ) // follow colorscheme : 0->do not follow // 1->follow collorscheme // 2->follow text and background scheme - << (sal_uInt8)1 // (bool)set if embedded server can not be locked - << (sal_uInt8)0 // (bool)do not need to send dimension - << (sal_uInt8)0 // (bool)is object a world table - << (sal_uInt8)0; // pad byte + .WriteUChar( (sal_uInt8)1 ) // (bool)set if embedded server can not be locked + .WriteUChar( (sal_uInt8)0 ) // (bool)do not need to send dimension + .WriteUChar( (sal_uInt8)0 ) // (bool)is object a world table + .WriteUChar( (sal_uInt8)0 ); // pad byte PPTExOleObjEntry* pE = new PPTExOleObjEntry( NORMAL_OLE_OBJECT, mpExEmbed->Tell() ); pE->xShape = mXShape; @@ -3089,18 +3089,18 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a catch( ::com::sun::star::uno::Exception& ) {} - *mpExEmbed << (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) - << (sal_uInt32)24 - << (sal_uInt32)nAspect // Aspect - << (sal_uInt32)0 - << (sal_uInt32)mnExEmbed // index to the persist table - << (sal_uInt32)0 // subtype - << (sal_uInt32)0 - << (sal_uInt32)0x0012b600; + mpExEmbed->WriteUInt32( (sal_uInt32)( 1 | ( EPP_ExOleObjAtom << 16 ) ) ) + .WriteUInt32( (sal_uInt32)24 ) + .WriteUInt32( (sal_uInt32)nAspect ) // Aspect + .WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)mnExEmbed ) // index to the persist table + .WriteUInt32( (sal_uInt32)0 ) // subtype + .WriteUInt32( (sal_uInt32)0 ) + .WriteUInt32( (sal_uInt32)0x0012b600 ); nSize = mpExEmbed->Tell() - nOldPos; mpExEmbed->Seek( nOldPos - 4 ); - *mpExEmbed << nSize; + mpExEmbed->WriteUInt32( nSize ); mpExEmbed->Seek( STREAM_SEEK_TO_END ); nOlePictureId = mnExEmbed; @@ -3186,58 +3186,58 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // SJ: creating the Media RefObj sal_uInt32 nRefId = ++mnExEmbed; - *mpExEmbed << (sal_uInt16)0xf - << (sal_uInt16)EPP_ExMCIMovie // PPT_PST_ExAviMovie - << (sal_uInt32)0; + mpExEmbed->WriteUInt16( (sal_uInt16)0xf ) + .WriteUInt16( (sal_uInt16)EPP_ExMCIMovie ) // PPT_PST_ExAviMovie + .WriteUInt32( (sal_uInt32)0 ); sal_uInt32 nSize, nStart = mpExEmbed->Tell(); - *mpExEmbed << (sal_uInt16)0 - << (sal_uInt16)EPP_ExObjRefAtom - << (sal_uInt32)4 - << nRefId; - *mpExEmbed << (sal_uInt16)0xf - << (sal_uInt16)EPP_ExVideo - << (sal_uInt32)0; - - *mpExEmbed << (sal_uInt16)0 - << (sal_uInt16)EPP_ExMediaAtom - << (sal_uInt32)8 - << nRefId - << (sal_uInt16)0 - << (sal_uInt16)0x435; + mpExEmbed->WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)EPP_ExObjRefAtom ) + .WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( nRefId ); + mpExEmbed->WriteUInt16( (sal_uInt16)0xf ) + .WriteUInt16( (sal_uInt16)EPP_ExVideo ) + .WriteUInt32( (sal_uInt32)0 ); + + mpExEmbed->WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)EPP_ExMediaAtom ) + .WriteUInt32( (sal_uInt32)8 ) + .WriteUInt32( nRefId ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)0x435 ); sal_uInt16 i, nStringLen = (sal_uInt16)aMediaURL.getLength(); - *mpExEmbed << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)( nStringLen * 2 ); + mpExEmbed->WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nStringLen * 2 ) ); for ( i = 0; i < nStringLen; i++ ) { sal_Unicode nChar = aMediaURL[ i ]; - *mpExEmbed << nChar; + mpExEmbed->WriteUInt16( nChar ); } nSize = mpExEmbed->Tell() - nStart; mpExEmbed->SeekRel( - ( (sal_Int32)nSize + 4 ) ); - *mpExEmbed << nSize; // size of PPT_PST_ExMCIMovie + mpExEmbed->WriteUInt32( nSize ); // size of PPT_PST_ExMCIMovie mpExEmbed->SeekRel( 0x10 ); nSize -= 20; - *mpExEmbed << nSize; // PPT_PST_ExMediaAtom + mpExEmbed->WriteUInt32( nSize ); // PPT_PST_ExMediaAtom mpExEmbed->SeekRel( nSize ); if ( !pClientData ) pClientData = new SvMemoryStream( 0x200, 0x200 ); - *pClientData << (sal_uInt16)0 - << (sal_uInt16)EPP_ExObjRefAtom - << (sal_uInt32)4 - << nRefId; + pClientData->WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)EPP_ExObjRefAtom ) + .WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( nRefId ); // write EPP_InteractiveInfo container for no_action - *pClientData << (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) << (sal_uInt32)24; - *pClientData << (sal_uInt16)0 - << (sal_uInt16)EPP_InteractiveInfoAtom - << (sal_uInt32)16 - << (sal_uInt32) 0 - << (sal_uInt32) 0 - << (sal_uInt8) 6 - << (sal_uInt8) 0 - << (sal_uInt8) 0 - << (sal_uInt8) 0 - << (sal_uInt32) 0; + pClientData->WriteUInt32( (sal_uInt32)( ( EPP_InteractiveInfo << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)24 ); + pClientData->WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)EPP_InteractiveInfoAtom ) + .WriteUInt32( (sal_uInt32)16 ) + .WriteUInt32( (sal_uInt32) 0 ) + .WriteUInt32( (sal_uInt32) 0 ) + .WriteUChar( (sal_uInt8) 6 ) + .WriteUChar( (sal_uInt8) 0 ) + .WriteUChar( (sal_uInt8) 0 ) + .WriteUChar( (sal_uInt8) 0 ) + .WriteUInt32( (sal_uInt32) 0 ); } } } @@ -3299,19 +3299,19 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientData ) pClientData = new SvMemoryStream( 0x200, 0x200 ); - *pClientData << (sal_uInt32)( EPP_OEPlaceholderAtom << 16 ) << (sal_uInt32)8 - << nPlacementID // PlacementID - << (sal_uInt8)nPlaceHolderAtom // PlaceHolderID - << (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) - << (sal_uInt16)0; // padword + pClientData->WriteUInt32( (sal_uInt32)( EPP_OEPlaceholderAtom << 16 ) ).WriteUInt32( (sal_uInt32)8 ) + .WriteInt32( nPlacementID ) // PlacementID + .WriteUChar( (sal_uInt8)nPlaceHolderAtom ) // PlaceHolderID + .WriteUChar( (sal_uInt8)0 ) // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER ) + .WriteUInt16( (sal_uInt16)0 ); // padword } if ( nOlePictureId ) { if ( !pClientData ) pClientData = new SvMemoryStream( 0x200, 0x200 ); - *pClientData << (sal_uInt32)( EPP_ExObjRefAtom << 16 ) << (sal_uInt32)4 - << nOlePictureId; + pClientData->WriteUInt32( (sal_uInt32)( EPP_ExObjRefAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( nOlePictureId ); nOlePictureId = 0; } if ( bEffect ) @@ -3418,8 +3418,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 12 ); - *pClientTextBox << (sal_uInt32)( EPP_TextHeaderAtom << 16 ) << (sal_uInt32)4 - << (sal_uInt32)7; + pClientTextBox->WriteUInt32( (sal_uInt32)( EPP_TextHeaderAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 ) + .WriteUInt32( (sal_uInt32)7 ); } } } @@ -3437,16 +3437,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( pClientData ) { - *mpStrm << (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) - << (sal_uInt32)pClientData->Tell(); + mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) ) + .WriteUInt32( (sal_uInt32)pClientData->Tell() ); mpStrm->Write( pClientData->GetData(), pClientData->Tell() ); delete pClientData, pClientData = NULL; } if ( pClientTextBox ) { - *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) - << (sal_uInt32)pClientTextBox->Tell(); + mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) ) + .WriteUInt32( (sal_uInt32)pClientTextBox->Tell() ); mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() ); delete pClientTextBox, pClientTextBox = NULL; @@ -3510,8 +3510,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else mpPptEscherEx->AddClientAnchor( maRect ); - *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) - << (sal_uInt32)pClientTextBox->Tell(); + mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) ) + .WriteUInt32( (sal_uInt32)pClientTextBox->Tell() ); mpStrm->Write( pClientTextBox->GetData(), pClientTextBox->Tell() ); delete pClientTextBox, pClientTextBox = NULL; @@ -3564,10 +3564,10 @@ sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int aPropOptSp.AddOpt( ESCHER_Prop_fc3DLightFace, 0x80000 ); aPropOptSp.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor ); - *mpStrm << nX1 - << nY1 - << nX2 - << nY2; + mpStrm ->WriteInt32( nX1 ) + .WriteInt32( nY1 ) + .WriteInt32( nX2 ) + .WriteInt32( nY2 ); mpPptEscherEx->CloseContainer(); return sal_True; } @@ -3614,10 +3614,10 @@ void PPTWriter::WriteCString( SvStream& rSt, const OUString& rString, sal_uInt32 sal_Int32 nLen = rString.getLength(); if ( nLen ) { - rSt << (sal_uInt32)( ( nInstance << 4 ) | ( EPP_CString << 16 ) ) - << (sal_uInt32)( nLen << 1 ); + rSt.WriteUInt32( (sal_uInt32)( ( nInstance << 4 ) | ( EPP_CString << 16 ) ) ) + .WriteUInt32( (sal_uInt32)( nLen << 1 ) ); for ( sal_Int32 i = 0; i < nLen; i++ ) - rSt << rString[i]; + rSt.WriteUInt16( rString[i] ); } } @@ -3671,10 +3671,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer ); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 ); - *mpStrm << (sal_Int32)maRect.Left() // Bounding box for the grouped shapes to which they are attached - << (sal_Int32)maRect.Top() - << (sal_Int32)maRect.Right() - << (sal_Int32)maRect.Bottom(); + mpStrm ->WriteInt32( (sal_Int32)maRect.Left() ) // Bounding box for the grouped shapes to which they are attached + .WriteInt32( (sal_Int32)maRect.Top() ) + .WriteInt32( (sal_Int32)maRect.Right() ) + .WriteInt32( (sal_Int32)maRect.Bottom() ); sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId(); mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch @@ -3685,13 +3685,13 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc { SvMemoryStream aMemStrm; aMemStrm.ObjectOwnsMemory( sal_False ); - aMemStrm << nRowCount - << nRowCount - << (sal_uInt16)4; + aMemStrm.WriteUInt16( nRowCount ) + .WriteUInt16( nRowCount ) + .WriteUInt16( (sal_uInt16)4 ); std::vector< std::pair< sal_Int32, sal_Int32 > >::const_iterator aIter( aRows.begin() ); while( aIter != aRows.end() ) - aMemStrm << (*aIter++).second; + aMemStrm.WriteInt32( (*aIter++).second ); aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x1000100 ); aPropOpt2.AddOpt( ESCHER_Prop_tableProperties, 1 ); @@ -3745,8 +3745,8 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc { SvMemoryStream* pClientData = new SvMemoryStream( 0x200, 0x200 ); ImplProgTagContainer( pClientData, &aExtBu ); - *mpStrm << (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) - << (sal_uInt32)pClientData->Tell(); + mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) ) + .WriteUInt32( (sal_uInt32)pClientData->Tell() ); mpStrm->Write( pClientData->GetData(), pClientData->Tell() ); delete pClientData, pClientData = NULL; @@ -3754,13 +3754,13 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc aPropOptSp.Commit( *mpStrm ); mpPptEscherEx->AddAtom( 16, ESCHER_ChildAnchor ); - *mpStrm << nLeft - << nTop - << nRight - << nBottom; + mpStrm ->WriteInt32( nLeft ) + .WriteInt32( nTop ) + .WriteInt32( nRight ) + .WriteInt32( nBottom ); - *mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) - << (sal_uInt32)aClientTextBox.Tell(); + mpStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf ) ) + .WriteUInt32( (sal_uInt32)aClientTextBox.Tell() ); mpStrm->Write( aClientTextBox.GetData(), aClientTextBox.Tell() ); mpPptEscherEx->CloseContainer(); @@ -3896,12 +3896,12 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc void TextObjBinary::Write( SvStream* pStrm ) { sal_uInt32 nSize, nPos = pStrm->Tell(); - *pStrm << (sal_uInt32)( EPP_TextCharsAtom << 16 ) << (sal_uInt32)0; + pStrm->WriteUInt32( (sal_uInt32)( EPP_TextCharsAtom << 16 ) ).WriteUInt32( (sal_uInt32)0 ); for ( sal_uInt32 i = 0; i < ParagraphCount(); ++i ) GetParagraph(i)->Write( pStrm ); nSize = pStrm->Tell() - nPos; pStrm->SeekRel( - ( (sal_Int32)nSize - 4 ) ); - *pStrm << (sal_uInt32)( nSize - 8 ); + pStrm->WriteUInt32( (sal_uInt32)( nSize - 8 ) ); pStrm->SeekRel( nSize - 8 ); } @@ -3920,15 +3920,15 @@ void TextObjBinary::WriteTextSpecInfo( SvStream* pStrm ) sal_Int32 nPortionSize = pPortion->mnTextSize >= nCharactersLeft ? nCharactersLeft : pPortion->mnTextSize; sal_Int32 nFlags = 7; nCharactersLeft -= nPortionSize; - *pStrm << static_cast< sal_uInt32 >( nPortionSize ) - << nFlags - << static_cast< sal_Int16 >( 1 ) // spellinfo -> needs rechecking - << static_cast< sal_Int16 >( LanguageTag( pPortion->meCharLocale ).makeFallback().getLanguageType() ) - << static_cast< sal_Int16 >( 0 ); // alt language + pStrm ->WriteUInt32( static_cast< sal_uInt32 >( nPortionSize ) ) + .WriteInt32( nFlags ) + .WriteInt16( static_cast< sal_Int16 >( 1 ) ) // spellinfo -> needs rechecking + .WriteInt16( static_cast< sal_Int16 >( LanguageTag( pPortion->meCharLocale ).makeFallback().getLanguageType() ) ) + .WriteInt16( static_cast< sal_Int16 >( 0 ) ); // alt language } } if ( nCharactersLeft ) - *pStrm << nCharactersLeft << static_cast< sal_Int32 >( 1 ) << static_cast< sal_Int16 >( 1 ); + pStrm->WriteUInt32( nCharactersLeft ).WriteInt32( static_cast< sal_Int32 >( 1 ) ).WriteInt16( static_cast< sal_Int16 >( 1 ) ); } } diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index e8df344b228e..d2c78b64374b 100644 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -40,8 +40,8 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize() void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) { sal_uInt32 nSize = DrawingGroupContainerSize(); - rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup - << (sal_uInt32)( nSize - 8 ); + rSt.WriteUInt32( (sal_uInt32)( 0xf | ( 1035 << 16 ) ) ) // EPP_PPDrawingGroup + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ); ImplWriteDggContainer( rSt ); } @@ -65,8 +65,8 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt ) sal_uInt32 nSize = ImplDggContainerSize(); if ( nSize ) { - rSt << (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) ) - << (sal_uInt32)( nSize - 8 ); + rSt.WriteUInt32( (sal_uInt32)( 0xf | ( ESCHER_DggContainer << 16 ) ) ) + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ); mxGlobal->SetDggContainer(); mxGlobal->WriteDggAtom( rSt ); @@ -93,14 +93,14 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt ) sal_uInt32 nSize = ImplOptAtomSize(); if ( nSize ) { - rSt << (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) - << (sal_uInt32)( nSize - 8 ) - << (sal_uInt16)ESCHER_Prop_fillColor << (sal_uInt32)0xffb800 - << (sal_uInt16)ESCHER_Prop_fillBackColor << (sal_uInt32)0 - << (sal_uInt16)ESCHER_Prop_fNoFillHitTest << (sal_uInt32)0x00100010 - << (sal_uInt16)ESCHER_Prop_lineColor << (sal_uInt32)0x8000001 - << (sal_uInt16)ESCHER_Prop_fNoLineDrawDash << (sal_uInt32)0x00080008 - << (sal_uInt16)ESCHER_Prop_shadowColor << (sal_uInt32)0x8000002; + rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_OPT << 16 ) | ( ESCHER_OPT_COUNT << 4 ) | 0x3 ) ) + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ) + .WriteUInt16( (sal_uInt16)ESCHER_Prop_fillColor ) .WriteUInt32( (sal_uInt32)0xffb800 ) + .WriteUInt16( (sal_uInt16)ESCHER_Prop_fillBackColor ) .WriteUInt32( (sal_uInt32)0 ) + .WriteUInt16( (sal_uInt16)ESCHER_Prop_fNoFillHitTest ) .WriteUInt32( (sal_uInt32)0x00100010 ) + .WriteUInt16( (sal_uInt16)ESCHER_Prop_lineColor ) .WriteUInt32( (sal_uInt32)0x8000001 ) + .WriteUInt16( (sal_uInt16)ESCHER_Prop_fNoLineDrawDash ) .WriteUInt32( (sal_uInt32)0x00080008 ) + .WriteUInt16( (sal_uInt16)ESCHER_Prop_shadowColor ) .WriteUInt32( (sal_uInt32)0x8000002 ); } } @@ -121,12 +121,12 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt ) sal_uInt32 nSize = ImplSplitMenuColorsAtomSize(); if ( nSize ) { - rSt << (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) - << (sal_uInt32)( nSize - 8 ) - << (sal_uInt32)0x08000004 - << (sal_uInt32)0x08000001 - << (sal_uInt32)0x08000002 - << (sal_uInt32)0x100000f7; + rSt.WriteUInt32( (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) ) + .WriteUInt32( (sal_uInt32)( nSize - 8 ) ) + .WriteUInt32( (sal_uInt32)0x08000004 ) + .WriteUInt32( (sal_uInt32)0x08000001 ) + .WriteUInt32( (sal_uInt32)0x08000002 ) + .WriteUInt32( (sal_uInt32)0x100000f7 ); } } @@ -141,7 +141,7 @@ PptEscherEx::~PptEscherEx() void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance ) { - *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (sal_uInt32)0; + mpOutStrm->WriteUInt16( (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) ).WriteUInt16( n_EscherContainer ).WriteUInt32( (sal_uInt32)0 ); mOffsets.push_back( mpOutStrm->Tell() - 4 ); mRecTypes.push_back( n_EscherContainer ); @@ -155,8 +155,8 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance mnCurrentDg = mxGlobal->GenerateDrawingId(); AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg ); PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() ); - *mpOutStrm << (sal_uInt32)0 // The number of shapes in this drawing - << (sal_uInt32)0; // The last MSOSPID given to an SP in this DG + mpOutStrm->WriteUInt32( (sal_uInt32)0 ) // The number of shapes in this drawing + .WriteUInt32( (sal_uInt32)0 ); // The last MSOSPID given to an SP in this DG } } break; @@ -188,7 +188,7 @@ void PptEscherEx::CloseContainer() sal_uInt32 nSize, nPos = mpOutStrm->Tell(); nSize = ( nPos - mOffsets.back() ) - 4; mpOutStrm->Seek( mOffsets.back() ); - *mpOutStrm << nSize; + mpOutStrm->WriteUInt32( nSize ); switch( mRecTypes.back() ) { @@ -198,7 +198,7 @@ void PptEscherEx::CloseContainer() { mbEscherDg = sal_False; if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) ) - *mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg ); + mpOutStrm->WriteUInt32( mxGlobal->GetDrawingShapeCount( mnCurrentDg ) ).WriteUInt32( mxGlobal->GetLastShapeId( mnCurrentDg ) ); } } break; @@ -241,10 +241,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie OpenContainer( ESCHER_SpContainer ); AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (sal_Int32)aRect.Left() // bounding box for the grouped shapes to which they are attached - << (sal_Int32)aRect.Top() - << (sal_Int32)aRect.Right() - << (sal_Int32)aRect.Bottom(); + mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) // bounding box for the grouped shapes to which they are attached + .WriteInt32( (sal_Int32)aRect.Top() ) + .WriteInt32( (sal_Int32)aRect.Right() ) + .WriteInt32( (sal_Int32)aRect.Bottom() ); nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) @@ -256,16 +256,16 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie { AddAtom( 8, ESCHER_ClientAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() << (sal_Int16)aRect.Right() << (sal_Int16)aRect.Bottom(); + mpOutStrm->WriteInt16( (sal_Int16)aRect.Top() ).WriteInt16( (sal_Int16)aRect.Left() ).WriteInt16( (sal_Int16)aRect.Right() ).WriteInt16( (sal_Int16)aRect.Bottom() ); } else { AddAtom( 16, ESCHER_ChildAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (sal_Int32)aRect.Left() - << (sal_Int32)aRect.Top() - << (sal_Int32)aRect.Right() - << (sal_Int32)aRect.Bottom(); + mpOutStrm ->WriteInt32( (sal_Int32)aRect.Left() ) + .WriteInt32( (sal_Int32)aRect.Top() ) + .WriteInt32( (sal_Int32)aRect.Right() ) + .WriteInt32( (sal_Int32)aRect.Bottom() ); } } if ( pClientData ) @@ -274,8 +274,8 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie sal_uInt32 nSize = pClientData->Tell(); if ( nSize ) { - *mpOutStrm << (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) - << nSize; + mpOutStrm->WriteUInt32( (sal_uInt32)( ( ESCHER_ClientData << 16 ) | 0xf ) ) + .WriteUInt32( nSize ); mpOutStrm->Write( pClientData->GetData(), nSize ); } } diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 6ad06d633759..3a9d5d0ee136 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -254,14 +254,14 @@ const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, co SvStream& operator<<(SvStream& rOut, AnimationNode& rNode ) { - rOut << rNode.mnU1; - rOut << rNode.mnRestart; - rOut << rNode.mnGroupType; - rOut << rNode.mnFill; - rOut << rNode.mnU3; - rOut << rNode.mnU4; - rOut << rNode.mnDuration; - rOut << rNode.mnNodeType; + rOut.WriteInt32( rNode.mnU1 ); + rOut.WriteInt32( rNode.mnRestart ); + rOut.WriteInt32( rNode.mnGroupType ); + rOut.WriteInt32( rNode.mnFill ); + rOut.WriteInt32( rNode.mnU3 ); + rOut.WriteInt32( rNode.mnU4 ); + rOut.WriteInt32( rNode.mnDuration ); + rOut.WriteInt32( rNode.mnNodeType ); return rOut; } @@ -679,7 +679,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, 1 ); { EscherExAtom aAnimTrigger( rStrm, DFF_msofbtAnimTrigger ); - rStrm << nU1 << nTrigger << nU3 << nBegin; + rStrm.WriteInt32( nU1 ).WriteInt32( nTrigger ).WriteInt32( nU3 ).WriteInt32( nBegin ); } } nU1 = 1; @@ -689,7 +689,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, 2 ); { EscherExAtom aAnimTrigger( rStrm, DFF_msofbtAnimTrigger ); - rStrm << nU1 << nTrigger << nU3 << nBegin; + rStrm.WriteInt32( nU1 ).WriteInt32( nTrigger ).WriteInt32( nU3 ).WriteInt32( nBegin ); } } EscherExContainer aAnimateTargetElement( rStrm, DFF_msofbtAnimateTargetElement ); @@ -701,7 +701,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > sal_Int32 end = -1; EscherExAtom aAnimReference( rStrm, DFF_msofbtAnimReference ); - rStrm << nRefMode << nRefType << nRefId << begin << end; + rStrm.WriteUInt32( nRefMode ).WriteUInt32( nRefType ).WriteUInt32( nRefId ).WriteInt32( begin ).WriteInt32( end ); } } } @@ -1195,7 +1195,7 @@ void AnimationExporter::exportAnimPropertyString( SvStream& rStrm, const sal_uIn { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); sal_uInt8 nType = DFF_ANIM_PROP_TYPE_UNISTRING; - rStrm << nType; + rStrm.WriteUChar( nType ); OUString aStr( rVal ); if ( eTranslateMode != TRANSLATE_NONE ) ImplTranslateAttribute( aStr, eTranslateMode ); @@ -1207,32 +1207,32 @@ void AnimationExporter::exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); sal_uInt8 nType = DFF_ANIM_PROP_TYPE_FLOAT; float fFloat = (float)rVal; - rStrm << nType - << fFloat; + rStrm.WriteUChar( nType ) + .WriteFloat( fFloat ); } void AnimationExporter::exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode ) { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); sal_uInt8 nType = DFF_ANIM_PROP_TYPE_INT32 ; - rStrm << nType - << nVal; + rStrm.WriteUChar( nType ) + .WriteUInt32( nVal ); } void AnimationExporter::exportAnimPropertyByte( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt8 nVal, const TranslateMode ) { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimAttributeValue, nPropertyId ); sal_uInt8 nType = DFF_ANIM_PROP_TYPE_BYTE; - rStrm << nType - << nVal; + rStrm.WriteUChar( nType ) + .WriteUChar( nVal ); } void AnimationExporter::writeZString( SvStream& rStrm, const OUString& rVal ) { sal_Int32 i; for ( i = 0; i < rVal.getLength(); i++ ) - rStrm << rVal[ i ]; - rStrm << (sal_Unicode)0; + rStrm.WriteUInt16( rVal[ i ] ); + rStrm.WriteUInt16( (sal_Unicode)0 ); } void AnimationExporter::exportAnimAction( SvStream& rStrm, const Reference< XAnimationNode >& xNode ) @@ -1251,11 +1251,11 @@ void AnimationExporter::exportAnimAction( SvStream& rStrm, const Reference< XAni if ( nAnimationEndSync == AnimationEndSync::ALL ) nEndSync = 1; } - rStrm << nConcurrent - << nNextAction - << nEndSync - << nU4 - << nU5; + rStrm.WriteInt32( nConcurrent ) + .WriteInt32( nNextAction ) + .WriteInt32( nEndSync ) + .WriteInt32( nU4 ) + .WriteInt32( nU5 ); } @@ -1389,10 +1389,10 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim EscherExContainer aAnimEvent( rStrm, DFF_msofbtAnimEvent, i + 1 ); { EscherExAtom aAnimTrigger( rStrm, DFF_msofbtAnimTrigger ); - rStrm << nU1 - << nTrigger - << nU3 - << nBegin; + rStrm.WriteInt32( nU1 ) + .WriteInt32( nTrigger ) + .WriteInt32( nU3 ) + .WriteInt32( nBegin ); } exportAnimateTargetElement( rStrm, aSource, ( nFlags & ( 1 << i ) ) != 0 ); } @@ -1539,7 +1539,7 @@ void AnimationExporter::exportAnimateSet( SvStream& rStrm, const Reference< XAni EscherExAtom aAnimateSetData( rStrm, DFF_msofbtAnimateSetData ); sal_uInt32 nId1 = 1; // ?? sal_uInt32 nId2 = 1; // ?? - rStrm << nId1 << nId2; + rStrm.WriteUInt32( nId1 ).WriteUInt32( nId2 ); } Any aConvertedValue( convertAnimateValue( xSet->getTo(), xSet->getAttributeName() ) ); if ( aConvertedValue.hasValue() ) @@ -1624,9 +1624,9 @@ void AnimationExporter::exportAnimate( SvStream& rStrm, const Reference< XAnimat if ( aTo.hasValue() ) nBits |= 4; - rStrm << nCalcMode - << nBits - << nValueType; + rStrm.WriteUInt32( nCalcMode ) + .WriteUInt32( nBits ) + .WriteUInt32( nValueType ); } if ( aBy.hasValue() ) exportAnimProperty( rStrm, 1, aBy, TRANSLATE_NUMBER_TO_STRING | TRANSLATE_MEASURE ); @@ -1678,10 +1678,10 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X nAccumulate = 1; } } - rStrm << nBits - << nAdditive - << nAccumulate - << nTransformType; + rStrm.WriteUInt32( nBits ) + .WriteUInt32( nAdditive ) + .WriteUInt32( nAccumulate ) + .WriteUInt32( nTransformType ); } if ( !xAnimate->getAttributeName().isEmpty() || nForceAttributeNames ) { @@ -1790,16 +1790,16 @@ void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any a sal_uInt32 nRefType = 1; // TODO: nRefType == 2 -> Sound; sal_uInt32 nRefId = ((EscherSolverContainer&)mrSolverContainer).GetShapeId( xShape ); - rStrm << nRefMode - << nRefType - << nRefId - << begin - << end; + rStrm.WriteUInt32( nRefMode ) + .WriteUInt32( nRefType ) + .WriteUInt32( nRefId ) + .WriteInt32( begin ) + .WriteInt32( end ); } if ( bCreate2b01Atom ) { EscherExAtom a2b01Atom( rStrm, 0x2b01 ); - rStrm << (sal_uInt32)1; // ? + rStrm.WriteUInt32( (sal_uInt32)1 ); // ? } } } @@ -1818,7 +1818,7 @@ void AnimationExporter::exportAnimateKeyPoints( SvStream& rStrm, const Reference { EscherExAtom aAnimKeyTime( rStrm, DFF_msofbtAnimKeyTime ); sal_Int32 nKeyTime = (sal_Int32)( aKeyTimes[ i ] * 1000.0 ); - rStrm << nKeyTime; + rStrm.WriteInt32( nKeyTime ); } Any aAny[ 2 ]; if ( aValues[ i ].hasValue() ) @@ -1864,8 +1864,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue ); sal_uInt32 nType = 0; - rStrm << nType - << fRepeatCount; + rStrm.WriteUInt32( nType ) + .WriteFloat( fRepeatCount ); } // accelerate (3) float fAccelerate = (float)xNode->getAcceleration(); @@ -1873,8 +1873,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue ); sal_uInt32 nType = 3; - rStrm << nType - << fAccelerate; + rStrm.WriteUInt32( nType ) + .WriteFloat( fAccelerate ); } // decelerate (4) @@ -1883,8 +1883,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue ); sal_uInt32 nType = 4; - rStrm << nType - << fDecelerate; + rStrm.WriteUInt32( nType ) + .WriteFloat( fDecelerate ); } // autoreverse (5) @@ -1894,8 +1894,8 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue ); sal_uInt32 nType = 5; sal_uInt32 nVal = bAutoReverse ? 1 : 0; - rStrm << nType - << nVal; + rStrm.WriteUInt32( nType ) + .WriteUInt32( nVal ); } } @@ -1911,8 +1911,8 @@ void AnimationExporter::exportTransitionFilter( SvStream& rStrm, const Reference // bit 1 -> use nTransition sal_uInt32 nTransition = xFilter->getMode() ? 0 : 1; - rStrm << nBits - << nTransition; + rStrm.WriteUInt32( nBits ) + .WriteUInt32( nTransition ); } const sal_Char* pFilter = FindTransitionName( xFilter->getTransition(), xFilter->getSubtype(), xFilter->getDirection() ); if ( pFilter ) @@ -1941,7 +1941,7 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X float fFromY = 0.0; // nBits&2 float fToX = 100.0; // nBits&4 float fToY = 100.0; // nBits&4 - rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nOrigin; + rStrm.WriteUInt32( nBits ).WriteFloat( fByX ).WriteFloat( fByY ).WriteFloat( fFromX ).WriteFloat( fFromY ).WriteFloat( fToX ).WriteFloat( fToY ).WriteUInt32( nOrigin ); } OUString aStr; @@ -2008,7 +2008,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference //if( nBits & 8 ) //( fprintf( mpFile, " zoomContents=\"%s\"", nZoomContents ? "true" : "false" ); - rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nZoomContents; + rStrm.WriteUInt32( nBits ).WriteFloat( fByX ).WriteFloat( fByY ).WriteFloat( fFromX ).WriteFloat( fFromY ).WriteFloat( fToX ).WriteFloat( fToY ).WriteUInt32( nZoomContents ); } exportAnimateTarget( rStrm, xNode ); } @@ -2039,7 +2039,7 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference nBits |= 4; fTo = (float)fVal; } - rStrm << nBits << fBy << fFrom << fTo << nU1; + rStrm.WriteUInt32( nBits ).WriteFloat( fBy ).WriteFloat( fFrom ).WriteFloat( fTo ).WriteUInt32( nU1 ); } exportAnimateTarget( rStrm, xNode, 1 ); } @@ -2112,10 +2112,10 @@ void AnimationExporter::exportAnimateColor( SvStream& rStrm, const Reference< XA if ( getColorAny( aAny, nColorSpace, nToMode, nToA, nToB, nToC ) ) nBits |= 0x14; } - rStrm << nBits - << nByMode << nByA << nByB << nByC - << nFromMode << nFromA << nFromB << nFromC - << nToMode << nToA << nToB << nToC; + rStrm .WriteUInt32( nBits ) + .WriteInt32( nByMode ).WriteInt32( nByA ).WriteInt32( nByB ).WriteInt32( nByC ) + .WriteInt32( nFromMode ).WriteInt32( nFromA ).WriteInt32( nFromB ).WriteInt32( nFromC ) + .WriteInt32( nToMode ).WriteInt32( nToA ).WriteInt32( nToB ).WriteInt32( nToC ); } exportAnimateTarget( rStrm, xNode, 0, nAfterEffectType ); } @@ -2173,7 +2173,7 @@ void AnimationExporter::exportIterate( SvStream& rStrm, const Reference< XAnimat if( fDuration ) fInterval = (float)(100.0 * fInterval / fDuration); - rStrm << fInterval << nTextUnitEffect << nU1 << nU2 << nU3; + rStrm.WriteFloat( fInterval ).WriteInt32( nTextUnitEffect ).WriteInt32( nU1 ).WriteInt32( nU2 ).WriteInt32( nU3 ); aTarget = xIterate->getTarget(); } } diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 5978dc8f23dc..dea8b243d456 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -97,34 +97,34 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const comphelper::getProcessComponentContext() ); // create SoundContainer - rSt << (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) << (sal_uInt32)( GetSize( nId ) - 8 ); + rSt.WriteUInt32( (sal_uInt32)( ( EPP_Sound << 16 ) | 0xf ) ).WriteUInt32( (sal_uInt32)( GetSize( nId ) - 8 ) ); OUString aSoundName( ImplGetName() ); sal_Int32 i, nSoundNameLen = aSoundName.getLength(); if ( nSoundNameLen ) { // name of sound ( instance 0 ) - rSt << (sal_uInt32)( EPP_CString << 16 ) << (sal_uInt32)( nSoundNameLen * 2 ); + rSt.WriteUInt32( (sal_uInt32)( EPP_CString << 16 ) ).WriteUInt32( (sal_uInt32)( nSoundNameLen * 2 ) ); for ( i = 0; i < nSoundNameLen; ++i ) - rSt << aSoundName[i]; + rSt.WriteUInt16( aSoundName[i] ); } OUString aExtension( ImplGetExtension() ); sal_Int32 nExtensionLen = aExtension.getLength(); if ( nExtensionLen ) { // extension of sound ( instance 1 ) - rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 16 ) << (sal_uInt32)( nExtensionLen * 2 ); + rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 16 ) ).WriteUInt32( (sal_uInt32)( nExtensionLen * 2 ) ); for ( i = 0; i < nExtensionLen; ++i ) - rSt << aExtension[i]; + rSt.WriteUInt16( aExtension[i] ); } // id of sound ( instance 2 ) OUString aId( OUString::number(nId ) ); sal_Int32 nIdLen = aId.getLength(); - rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) << (sal_uInt32)( nIdLen * 2 ); + rSt.WriteUInt32( (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) ).WriteUInt32( (sal_uInt32)( nIdLen * 2 ) ); for ( i = 0; i < nIdLen; ++i ) - rSt << aId[i]; + rSt.WriteUInt16( aId[i] ); - rSt << (sal_uInt32)( EPP_SoundData << 16 ) << (sal_uInt32)( nFileSize ); + rSt.WriteUInt32( (sal_uInt32)( EPP_SoundData << 16 ) ).WriteUInt32( (sal_uInt32)( nFileSize ) ); sal_uInt32 nBytesLeft = nFileSize; SvStream* pSourceFile = ::utl::UcbStreamHelper::CreateStream( aSoundURL, STREAM_READ ); if ( pSourceFile ) @@ -198,10 +198,10 @@ void ExSoundCollection::Write( SvStream& rSt ) const sal_uInt32 nSoundCount = maEntries.size(); // create SoundCollection Container - rSt << (sal_uInt16)0xf << (sal_uInt16)EPP_SoundCollection << (sal_uInt32)( GetSize() - 8 ); + rSt.WriteUInt16( (sal_uInt16)0xf ).WriteUInt16( (sal_uInt16)EPP_SoundCollection ).WriteUInt32( (sal_uInt32)( GetSize() - 8 ) ); // create SoundCollAtom ( reference to the next free SoundId ); - rSt << (sal_uInt32)( EPP_SoundCollAtom << 16 ) << (sal_uInt32)4 << nSoundCount; + rSt.WriteUInt32( (sal_uInt32)( EPP_SoundCollAtom << 16 ) ).WriteUInt32( (sal_uInt32)4 ).WriteUInt32( nSoundCount ); boost::ptr_vector<ExSoundEntry>::const_iterator iter; for ( iter = maEntries.begin(); iter != maEntries.end(); ++iter, ++i) diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index f35762cbae5f..b99755e9ab8e 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -99,9 +99,9 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo if ( bSimpleText ) nCharFlags = 0x7ffff; - rSt << nCharFlags - << rLev.mnFlags - << rLev.mnFont; + rSt.WriteUInt32( nCharFlags ) + .WriteUInt16( rLev.mnFlags ) + .WriteUInt16( rLev.mnFont ); sal_uInt32 nFontColor = rLev.mnFontColor; if ( nFontColor == COL_AUTO ) @@ -116,17 +116,17 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo nFontColor |= 0xfe000000; if ( bSimpleText ) { - rSt << rLev.mnFontHeight - << nFontColor; + rSt.WriteUInt16( rLev.mnFontHeight ) + .WriteUInt32( nFontColor ); } else { - rSt << rLev.mnAsianOrComplexFont - << (sal_uInt16)0xffff // unknown - << (sal_uInt16)0xffff // unknown - << rLev.mnFontHeight - << nFontColor - << rLev.mnEscapement; + rSt.WriteUInt16( rLev.mnAsianOrComplexFont ) + .WriteUInt16( (sal_uInt16)0xffff ) // unknown + .WriteUInt16( (sal_uInt16)0xffff ) // unknown + .WriteUInt16( rLev.mnFontHeight ) + .WriteUInt32( nFontColor ) + .WriteUInt16( rLev.mnEscapement ); } } @@ -325,18 +325,18 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo SvStream& rOut = rBuProv.aBuExMasterStream; if ( !nLev ) { - rOut << (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) ) - << (sal_uInt32)( 5 * 16 + 2 ) - << (sal_uInt16)5; // depth + rOut.WriteUInt32( (sal_uInt32)( ( EPP_PST_ExtendedParagraphMasterAtom << 16 ) | ( mnInstance << 4 ) ) ) + .WriteUInt32( (sal_uInt32)( 5 * 16 + 2 ) ) + .WriteUInt16( (sal_uInt16)5 ); // depth } sal_uInt16 nBulletId = rLev.mnBulletId; if ( rLev.mnNumberingType != SVX_NUM_BITMAP ) nBulletId = 0xffff; - rOut << (sal_uInt32)0x03800000 - << (sal_uInt16)nBulletId - << (sal_uInt32)rLev.mnMappedNumType - << (sal_uInt16)rLev.mnBulletStart - << (sal_uInt32)0; + rOut.WriteUInt32( (sal_uInt32)0x03800000 ) + .WriteUInt16( (sal_uInt16)nBulletId ) + .WriteUInt32( (sal_uInt32)rLev.mnMappedNumType ) + .WriteUInt16( (sal_uInt16)rLev.mnBulletStart ) + .WriteUInt32( (sal_uInt32)0 ); } sal_uInt32 nParaFlags = 0x3ffdff; @@ -357,31 +357,31 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo } nBulletColor &= 0xffffff; nBulletColor |= 0xfe000000; - rSt << nParaFlags - << nBulletFlags - << rLev.mnBulletChar - << rLev.mnBulletFont - << rLev.mnBulletHeight - << nBulletColor - << rLev.mnAdjust - << rLev.mnLineFeed - << rLev.mnUpperDist - << rLev.mnLowerDist - << rLev.mnTextOfs - << rLev.mnBulletOfs; + rSt.WriteUInt32( nParaFlags ) + .WriteUInt16( nBulletFlags ) + .WriteUInt16( rLev.mnBulletChar ) + .WriteUInt16( rLev.mnBulletFont ) + .WriteUInt16( rLev.mnBulletHeight ) + .WriteUInt32( nBulletColor ) + .WriteUInt16( rLev.mnAdjust ) + .WriteUInt16( rLev.mnLineFeed ) + .WriteUInt16( rLev.mnUpperDist ) + .WriteUInt16( rLev.mnLowerDist ) + .WriteUInt16( rLev.mnTextOfs ) + .WriteUInt16( rLev.mnBulletOfs ); if ( bSimpleText || nLev ) { if ( nParaFlags & 0x200000 ) - rSt << rLev.mnBiDi; + rSt.WriteUInt16( rLev.mnBiDi ); } else { - rSt << rLev.mnDefaultTab - << (sal_uInt16)0 - << (sal_uInt16)0 - << rLev.mnAsianSettings - << rLev.mnBiDi; + rSt.WriteUInt16( rLev.mnDefaultTab ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( rLev.mnAsianSettings ) + .WriteUInt16( rLev.mnBiDi ); } } @@ -485,14 +485,14 @@ void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt ) sal_uInt32 nCharFlags = rCharStyle.mnFlags; nCharFlags &= CharAttr_Italic | CharAttr_Bold | CharAttr_Underline | CharAttr_Shadow; - rSt << (sal_uInt32)( EPP_TxCFStyleAtom << 16 ) // recordheader - << SizeOfTxCFStyleAtom() - 8 - << (sal_uInt16)( 0x80 | nCharFlags ) - << (sal_uInt16)nFlags - << (sal_uInt16)nCharFlags - << (sal_Int32)-1 // ? - << rCharStyle.mnFontHeight - << rCharStyle.mnFontColor; + rSt.WriteUInt32( (sal_uInt32)( EPP_TxCFStyleAtom << 16 ) ) // recordheader + .WriteUInt32( SizeOfTxCFStyleAtom() - 8 ) + .WriteUInt16( (sal_uInt16)( 0x80 | nCharFlags ) ) + .WriteUInt16( (sal_uInt16)nFlags ) + .WriteUInt16( (sal_uInt16)nCharFlags ) + .WriteInt32( (sal_Int32)-1 ) // ? + .WriteUInt16( rCharStyle.mnFontHeight ) + .WriteUInt32( rCharStyle.mnFontColor ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 0a45ad0358b2..7759f980090f 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -214,7 +214,7 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) if ( bLast && mbLastPortion ) nCount--; for ( sal_uInt32 i = 0; i < nCount; i++ ) - *pStrm << (sal_uInt16)mpText[ i ]; + pStrm->WriteUInt16( (sal_uInt16)mpText[ i ] ); } void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue ) diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index eb166b21ac1f..193b50997c6d 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1109,7 +1109,7 @@ bool HtmlExport::WriteHtml( const OUString& rFileName, bool bAddExtension, const { OString aStr(OUStringToOString(rHtmlData, RTL_TEXTENCODING_UTF8)); - *pStr << aStr.getStr(); + pStr->WriteCharPtr( aStr.getStr() ); nErr = aFile.close(); } @@ -2754,7 +2754,7 @@ OUString HtmlExport::StringToHTMLString( const OUString& rString ) { SvMemoryStream aMemStm; HTMLOutFuncs::Out_String( aMemStm, rString, RTL_TEXTENCODING_UTF8 ); - aMemStm << (char) 0; + aMemStm.WriteChar( (char) 0 ); sal_Int32 nLength = strlen((char*)aMemStm.GetData()); return OUString( (char*)aMemStm.GetData(), nLength, RTL_TEXTENCODING_UTF8 ); } @@ -2832,7 +2832,7 @@ bool HtmlExport::CopyScript( const OUString& rPath, const OUString& rSource, con { OString aStr(OUStringToOString(aScript, RTL_TEXTENCODING_UTF8)); - *pStr << aStr.getStr(); + pStr->WriteCharPtr( aStr.getStr() ); nErr = aFile.close(); } @@ -2922,7 +2922,7 @@ bool HtmlExport::CreateImageNumberFile() sal_uLong nErr = aFile.createStream(aFull, pStr); if(nErr == 0) { - *pStr << (const char *)"1"; + pStr->WriteCharPtr( (const char *)"1" ); nErr = aFile.close(); } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 31076f6bda70..0b0dede074c3 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -304,13 +304,13 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) 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; + rOut.WriteUInt16( (sal_uInt16)rDesign.m_eMode ); + rOut.WriteUChar( rDesign.m_bContentPage ); + rOut.WriteUChar( rDesign.m_bNotes ); + rOut.WriteUInt16( rDesign.m_nResolution ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCompression, RTL_TEXTENCODING_UTF8); - rOut << (sal_uInt16)rDesign.m_eFormat; + rOut.WriteUInt16( (sal_uInt16)rDesign.m_eFormat ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aEMail, @@ -319,29 +319,29 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aMisc, RTL_TEXTENCODING_UTF8); - rOut << rDesign.m_bDownload; - rOut << rDesign.m_bCreated; // not used - rOut << rDesign.m_nButtonThema; - rOut << rDesign.m_bUserAttr; + rOut.WriteUChar( rDesign.m_bDownload ); + rOut.WriteUChar( rDesign.m_bCreated ); // not used + rOut.WriteInt16( rDesign.m_nButtonThema ); + rOut.WriteUChar( rDesign.m_bUserAttr ); rOut << rDesign.m_aBackColor; rOut << rDesign.m_aTextColor; rOut << rDesign.m_aLinkColor; rOut << rDesign.m_aVLinkColor; rOut << rDesign.m_aALinkColor; - rOut << rDesign.m_bUseAttribs; - rOut << rDesign.m_bUseColor; + rOut.WriteUChar( rDesign.m_bUseAttribs ); + rOut.WriteUChar( rDesign.m_bUseColor ); - rOut << (sal_uInt16)rDesign.m_eScript; + rOut.WriteUInt16( (sal_uInt16)rDesign.m_eScript ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aURL, RTL_TEXTENCODING_UTF8); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, rDesign.m_aCGI, RTL_TEXTENCODING_UTF8); - rOut << rDesign.m_bAutoSlide; - rOut << rDesign.m_nSlideDuration; - rOut << rDesign.m_bEndless; - rOut << rDesign.m_bSlideSound; - rOut << rDesign.m_bHiddenSlides; + rOut.WriteUChar( rDesign.m_bAutoSlide ); + rOut.WriteUInt32( rDesign.m_nSlideDuration ); + rOut.WriteUChar( rDesign.m_bEndless ); + rOut.WriteUChar( rDesign.m_bSlideSound ); + rOut.WriteUChar( rDesign.m_bHiddenSlides ); return rOut; } @@ -1558,14 +1558,14 @@ sal_Bool SdPublishingDlg::Save() return( sal_False ); sal_uInt16 aCheck = nMagic; - *pStream << aCheck; + pStream->WriteUInt16( aCheck ); // Destroys the SdIOCompat before the Stream is being destributed { SdIOCompat aIO(*pStream, STREAM_WRITE, 0); sal_uInt16 nDesigns = (sal_uInt16) m_aDesignList.size(); - *pStream << nDesigns; + pStream->WriteUInt16( nDesigns ); for( sal_uInt16 nIndex = 0; pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns; diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index af95d5904ebf..0559dda21ba4 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -100,9 +100,9 @@ void MorphDlg::SaveSettings() const { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (sal_uInt16) m_pMtfSteps->GetValue() - << m_pCbxOrientation->IsChecked() - << m_pCbxAttributes->IsChecked(); + xOStm->WriteUInt16( (sal_uInt16) m_pMtfSteps->GetValue() ) + .WriteUChar( m_pCbxOrientation->IsChecked() ) + .WriteUChar( m_pCbxAttributes->IsChecked() ); } } diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 5abbec90594d..85fac7688b9b 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -335,8 +335,8 @@ void SdVectorizeDlg::SaveSettings() const if( xOStm.Is() ) { SdIOCompat aCompat( *xOStm, STREAM_WRITE, 1 ); - *xOStm << (sal_uInt16) m_pNmLayers->GetValue() << (sal_uInt16) m_pMtReduce->GetValue(); - *xOStm << (sal_uInt16) m_pMtFillHoles->GetValue() << m_pCbFillHoles->IsChecked(); + xOStm->WriteUInt16( (sal_uInt16) m_pNmLayers->GetValue() ).WriteUInt16( (sal_uInt16) m_pMtReduce->GetValue() ); + xOStm->WriteUInt16( (sal_uInt16) m_pMtFillHoles->GetValue() ).WriteUChar( m_pCbFillHoles->IsChecked() ); } } diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 1112a4dd1e36..a58c90f028ee 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -364,24 +364,24 @@ void SfxOleStringHelper::ImplSaveString8( SvStream& rStrm, const OUString& rValu OString aEncoded(OUStringToOString(rValue, GetTextEncoding())); // write size field (including trailing NUL character) sal_Int32 nSize = aEncoded.getLength() + 1; - rStrm << nSize; + rStrm.WriteInt32( nSize ); // write character array with trailing NUL character rStrm.Write(aEncoded.getStr(), aEncoded.getLength()); - rStrm << sal_uInt8( 0 ); + rStrm.WriteUChar( sal_uInt8( 0 ) ); } void SfxOleStringHelper::ImplSaveString16( SvStream& rStrm, const OUString& rValue ) const { // write size field (including trailing NUL character) sal_Int32 nSize = static_cast< sal_Int32 >( rValue.getLength() + 1 ); - rStrm << nSize; + rStrm.WriteInt32( nSize ); // write character array with trailing NUL character for( sal_Int32 nIdx = 0; nIdx < rValue.getLength(); ++nIdx ) - rStrm << static_cast< sal_uInt16 >( rValue[ nIdx ] ); - rStrm << sal_uInt16( 0 ); + rStrm.WriteUInt16( static_cast< sal_uInt16 >( rValue[ nIdx ] ) ); + rStrm.WriteUInt16( sal_uInt16( 0 ) ); // stream is always padded to 32-bit boundary, add 2 bytes on odd character count if( (nSize & 1) == 1 ) - rStrm << sal_uInt16( 0 ); + rStrm.WriteUInt16( sal_uInt16( 0 ) ); } // ---------------------------------------------------------------------------- @@ -434,7 +434,7 @@ void SfxOleCodePageProperty::ImplLoad( SvStream& rStrm ) void SfxOleCodePageProperty::ImplSave( SvStream& rStrm ) { // property type is signed int16, but we use always unsigned int16 for codepages - rStrm << GetCodePage(); + rStrm.WriteUInt16( GetCodePage() ); } // ---------------------------------------------------------------------------- @@ -452,7 +452,7 @@ void SfxOleInt32Property::ImplLoad( SvStream& rStrm ) void SfxOleInt32Property::ImplSave( SvStream& rStrm ) { - rStrm << mnValue; + rStrm.WriteInt32( mnValue ); } // ---------------------------------------------------------------------------- @@ -490,7 +490,7 @@ void SfxOleBoolProperty::ImplLoad( SvStream& rStrm ) void SfxOleBoolProperty::ImplSave( SvStream& rStrm ) { - rStrm << static_cast< sal_Int16 >( mbValue ? -1 : 0 ); + rStrm.WriteInt16( static_cast< sal_Int16 >( mbValue ? -1 : 0 ) ); } // ---------------------------------------------------------------------------- @@ -613,7 +613,7 @@ void SfxOleFileTimeProperty::ImplSave( SvStream& rStrm ) } sal_uInt32 nLower, nUpper; aDateTimeUtc.GetWin32FileDateTime( nLower, nUpper ); - rStrm << nLower << nUpper; + rStrm.WriteUInt32( nLower ).WriteUInt32( nUpper ); } SfxOleDateProperty::SfxOleDateProperty( sal_Int32 nPropId ) : @@ -683,7 +683,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm ) { // clipboard size: clip_format_tag + data_format_tag + bitmap_len sal_Int32 nClipSize = static_cast< sal_Int32 >( 4 + 4 + mData.getLength() ); - rStrm << nClipSize << CLIPFMT_WIN << CLIPDATAFMT_DIB; + rStrm.WriteInt32( nClipSize ).WriteInt32( CLIPFMT_WIN ).WriteInt32( CLIPDATAFMT_DIB ); rStrm.Write( mData.getConstArray(), mData.getLength() ); } else @@ -759,7 +759,7 @@ void SfxOleDictionaryProperty::ImplSave( SvStream& rStrm ) // write property ID/name pairs for( SfxOlePropNameMap::const_iterator aIt = maPropNameMap.begin(), aEnd = maPropNameMap.end(); aIt != aEnd; ++aIt ) { - rStrm << aIt->first; + rStrm.WriteInt32( aIt->first ); // name always stored as byte string SaveString8( rStrm, aIt->second ); } @@ -1067,7 +1067,7 @@ void SfxOleSection::ImplSave( SvStream& rStrm ) sal_Int32 nPropCount = static_cast< sal_Int32 >( maPropMap.size() + 1 ); if( maDictProp.HasPropertyNames() ) ++nPropCount; - rStrm << sal_uInt32( 0 ) << nPropCount; + rStrm.WriteUInt32( sal_uInt32( 0 ) ).WriteInt32( nPropCount ); // write placeholders for property ID/position pairs sal_Size nPropPosPos = rStrm.Tell(); @@ -1086,7 +1086,7 @@ void SfxOleSection::ImplSave( SvStream& rStrm ) rStrm.Seek( STREAM_SEEK_TO_END ); sal_uInt32 nSectSize = static_cast< sal_uInt32 >( rStrm.Tell() - mnStartPos ); rStrm.Seek( mnStartPos ); - rStrm << nSectSize; + rStrm.WriteUInt32( nSectSize ); } bool SfxOleSection::SeekToPropertyPos( SvStream& rStrm, sal_uInt32 nPropPos ) const @@ -1139,15 +1139,15 @@ void SfxOleSection::SaveProperty( SvStream& rStrm, SfxOlePropertyBase& rProp, sa rStrm.Seek( STREAM_SEEK_TO_END ); sal_uInt32 nPropPos = static_cast< sal_uInt32 >( rStrm.Tell() - mnStartPos ); // property data type - rStrm << rProp.GetPropType(); + rStrm.WriteInt32( rProp.GetPropType() ); // write property contents SaveObject( rStrm, rProp ); // align to 32-bit while( (rStrm.Tell() & 3) != 0 ) - rStrm << sal_uInt8( 0 ); + rStrm.WriteUChar( sal_uInt8( 0 ) ); // write property ID/position pair rStrm.Seek( rnPropPosPos ); - rStrm << rProp.GetPropId() << nPropPos; + rStrm.WriteInt32( rProp.GetPropId() ).WriteUInt32( nPropPos ); rnPropPosPos = rStrm.Tell(); } @@ -1251,12 +1251,12 @@ void SfxOlePropertySet::ImplSave( SvStream& rStrm ) // write property set header SvGlobalName aGuid; sal_Int32 nSectCount = static_cast< sal_Int32 >( maSectionMap.size() ); - rStrm << sal_uInt16( 0xFFFE ) // byte order - << sal_uInt16( 0 ) // version - << sal_uInt16( 1 ) // OS minor version - << sal_uInt16( 2 ) // OS type always windows for text encoding - << aGuid // unused guid - << nSectCount; // number of sections + rStrm .WriteUInt16( sal_uInt16( 0xFFFE ) ) // byte order + .WriteUInt16( sal_uInt16( 0 ) ) // version + .WriteUInt16( sal_uInt16( 1 ) ) // OS minor version + .WriteUInt16( sal_uInt16( 2 ) ); // OS type always windows for text encoding + rStrm << aGuid; // unused guid + rStrm .WriteInt32( nSectCount ); // number of sections // write placeholders for section guid/position pairs sal_Size nSectPosPos = rStrm.Tell(); @@ -1272,7 +1272,8 @@ void SfxOlePropertySet::ImplSave( SvStream& rStrm ) SaveObject( rStrm, rSection ); // write section guid/position pair rStrm.Seek( nSectPosPos ); - rStrm << aIt->first << nSectPos; + rStrm << aIt->first; + rStrm.WriteUInt32( nSectPos ); nSectPosPos = rStrm.Tell(); } } diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index e5520c7d767d..c3614a2087de 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -86,9 +86,9 @@ SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) con SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const { - rStrm << (sal_uInt16)GetValue() - << nValueSet - << (sal_Int8)eType; + rStrm.WriteUInt16( (sal_uInt16)GetValue() ) + .WriteUInt16( nValueSet ) + .WriteSChar( (sal_Int8)eType ); return rStrm; } diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 4299994acc72..46083e0ee462 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -54,17 +54,17 @@ SvStream& operator >>( SvStream& r, ClsId& rId ) SvStream& operator <<( SvStream& r, const ClsId& rId ) { return - r << (sal_Int32) rId.n1 - << (sal_Int16) rId.n2 - << (sal_Int16) rId.n3 - << (sal_uInt8) rId.n4 - << (sal_uInt8) rId.n5 - << (sal_uInt8) rId.n6 - << (sal_uInt8) rId.n7 - << (sal_uInt8) rId.n8 - << (sal_uInt8) rId.n9 - << (sal_uInt8) rId.n10 - << (sal_uInt8) rId.n11; + r .WriteInt32( (sal_Int32) rId.n1 ) + .WriteInt16( (sal_Int16) rId.n2 ) + .WriteInt16( (sal_Int16) rId.n3 ) + .WriteUChar( (sal_uInt8) rId.n4 ) + .WriteUChar( (sal_uInt8) rId.n5 ) + .WriteUChar( (sal_uInt8) rId.n6 ) + .WriteUChar( (sal_uInt8) rId.n7 ) + .WriteUChar( (sal_uInt8) rId.n8 ) + .WriteUChar( (sal_uInt8) rId.n9 ) + .WriteUChar( (sal_uInt8) rId.n10 ) + .WriteUChar( (sal_uInt8) rId.n11 ); } ///////////////////////////// class StgHeader //////////////////////////// @@ -159,22 +159,22 @@ bool StgHeader::Store( StgIo& rIo ) SvStream& r = *rIo.GetStrm(); r.Seek( 0L ); r.Write( cSignature, 8 ); - r << aClsId // 08 Class ID - << nVersion // 1A version number - << nByteOrder // 1C Unicode byte order indicator - << nPageSize // 1E 1 << nPageSize = block size - << nDataPageSize // 20 1 << this size == data block size - << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int16) 0 - << nFATSize // 2C total number of FAT pages - << nTOCstrm // 30 starting page for the TOC stream - << nReserved // 34 - << nThreshold // 38 minimum file size for big data - << nDataFAT // 3C page # of 1st data FAT block - << nDataFATSize // 40 # of data FAT pages - << nMasterChain // 44 chain to the next master block - << nMaster; // 48 # of additional master blocks + r << aClsId; // 08 Class ID + r.WriteInt32( nVersion ) // 1A version number + .WriteUInt16( nByteOrder ) // 1C Unicode byte order indicator + .WriteInt16( nPageSize ) // 1E 1 << nPageSize = block size + .WriteInt16( nDataPageSize ) // 20 1 << this size == data block size + .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt16( (sal_Int16) 0 ) + .WriteInt32( nFATSize ) // 2C total number of FAT pages + .WriteInt32( nTOCstrm ) // 30 starting page for the TOC stream + .WriteInt32( nReserved ) // 34 + .WriteInt32( nThreshold ) // 38 minimum file size for big data + .WriteInt32( nDataFAT ) // 3C page # of 1st data FAT block + .WriteInt32( nDataFATSize ) // 40 # of data FAT pages + .WriteInt32( nMasterChain ) // 44 chain to the next master block + .WriteInt32( nMaster ); // 48 # of additional master blocks for( short i = 0; i < cFATPagesInHeader; i++ ) - r << nMasterFAT[ i ]; + r.WriteInt32( nMasterFAT[ i ] ); bDirty = !rIo.Good(); return !bDirty; } @@ -420,22 +420,22 @@ void StgEntry::Store( void* pTo ) { SvMemoryStream r( (sal_Char *)pTo, 128, STREAM_WRITE ); for( short i = 0; i < 32; i++ ) - r << nName[ i ]; // 00 name as WCHAR - r << nNameLen // 40 size of name in bytes including 00H - << cType // 42 entry type - << cFlags // 43 0 or 1 (tree balance?) - << nLeft // 44 left node entry - << nRight // 48 right node entry - << nChild // 4C 1st child entry if storage; - << aClsId // 50 class ID (optional) - << nFlags // 60 state flags(?) - << nMtime[ 0 ] // 64 modification time - << nMtime[ 1 ] // 64 modification time - << nAtime[ 0 ] // 6C creation and access time - << nAtime[ 1 ] // 6C creation and access time - << nPage1 // 74 starting block (either direct or translated) - << nSize // 78 file size - << nUnknown; // 7C unknown + r.WriteUInt16( nName[ i ] ); // 00 name as WCHAR + r.WriteUInt16( nNameLen ) // 40 size of name in bytes including 00H + .WriteUChar( cType ) // 42 entry type + .WriteUChar( cFlags ) // 43 0 or 1 (tree balance?) + .WriteInt32( nLeft ) // 44 left node entry + .WriteInt32( nRight ) // 48 right node entry + .WriteInt32( nChild ); // 4C 1st child entry if storage; + r << aClsId; // 50 class ID (optional) + r.WriteInt32( nFlags ) // 60 state flags(?) + .WriteInt32( nMtime[ 0 ] ) // 64 modification time + .WriteInt32( nMtime[ 1 ] ) // 64 modification time + .WriteInt32( nAtime[ 0 ] ) // 6C creation and access time + .WriteInt32( nAtime[ 1 ] ) // 6C creation and access time + .WriteInt32( nPage1 ) // 74 starting block (either direct or translated) + .WriteInt32( nSize ) // 78 file size + .WriteInt32( nUnknown ); // 7C unknown } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index c6dc60e056b8..1e83d36deec8 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -144,16 +144,16 @@ bool StgCompObjStream::Store() return false; Seek( 0L ); OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252)); - *this << (sal_Int16) 1 // Version? - << (sal_Int16) -2 // 0xFFFE = Byte Order Indicator - << (sal_Int32) 0x0A03 // Windows 3.10 - << (sal_Int32) -1L - << aClsId // Class ID - << (sal_Int32) (aAsciiUserName.getLength() + 1) - << (const char *)aAsciiUserName.getStr() - << (sal_uInt8) 0; // string terminator + WriteInt16( (sal_Int16) 1 ); // Version? + WriteInt16( (sal_Int16) -2 ); // 0xFFFE = Byte Order Indicator + WriteInt32( (sal_Int32) 0x0A03 ); // Windows 3.10 + WriteInt32( (sal_Int32) -1L ); + *this << aClsId; // Class ID + WriteInt32( (sal_Int32) (aAsciiUserName.getLength() + 1) ); + WriteCharPtr( (const char *)aAsciiUserName.getStr() ); + WriteUChar( (sal_uInt8) 0 ); // string terminator WriteClipboardFormat( *this, nCbFormat ); - *this << (sal_Int32) 0; // terminator + WriteInt32( (sal_Int32) 0 ); // terminator Commit(); return GetError() == SVSTREAM_OK; } @@ -184,11 +184,11 @@ bool StgOleStream::Store() return false; Seek( 0L ); - *this << (sal_Int32) 0x02000001 // OLE version, format - << (sal_Int32) nFlags // Object flags - << (sal_Int32) 0 // Update Options - << (sal_Int32) 0 // reserved - << (sal_Int32) 0; // Moniker 1 + WriteInt32( (sal_Int32) 0x02000001 ); // OLE version, format + WriteInt32( (sal_Int32) nFlags ); // Object flags + WriteInt32( (sal_Int32) 0 ); // Update Options + WriteInt32( (sal_Int32) 0 ); // reserved + WriteInt32( (sal_Int32) 0 ); // Moniker 1 Commit(); return GetError() == SVSTREAM_OK; } diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index d4115e5e4724..29a5daecd70d 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -1241,7 +1241,7 @@ void StgTmpStrm::SetSize( sal_uLong n ) { sal_uLong nCur = Tell(); Seek( nEndOfData - 1 ); - *this << (sal_uInt8) 0; + WriteUChar( (sal_uInt8) 0 ); Seek( nCur ); } else diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index bd785d96902d..f412319bfa55 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -73,18 +73,18 @@ void WriteClipboardFormat( SvStream & rStm, sal_uLong nFormat ) { OString aAsciiCbFmt(OUStringToOString(aCbFmt, RTL_TEXTENCODING_ASCII_US)); - rStm << (sal_Int32) (aAsciiCbFmt.getLength() + 1); - rStm << (const char *)aAsciiCbFmt.getStr(); - rStm << (sal_uInt8) 0; + rStm.WriteInt32( (sal_Int32) (aAsciiCbFmt.getLength() + 1) ); + rStm.WriteCharPtr( (const char *)aAsciiCbFmt.getStr() ); + rStm.WriteUChar( (sal_uInt8) 0 ); } else if( nFormat ) { - rStm << (sal_Int32) -1 // for Windows - << (sal_Int32) nFormat; + rStm.WriteInt32( (sal_Int32) -1 ) // for Windows + .WriteInt32( (sal_Int32) nFormat ); } else { - rStm << (sal_Int32) 0; // no clipboard format + rStm.WriteInt32( (sal_Int32) 0 ); // no clipboard format } } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 9c431434f15b..800134e3910b 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3184,7 +3184,7 @@ OUString UCBStorage::CreateLinkFile( const OUString& rName ) SvStream* pStream = pTempFile->GetStream( STREAM_STD_READWRITE | STREAM_TRUNC ); // write header - *pStream << ( sal_uInt32 ) 0x04034b50; + pStream->WriteUInt32( ( sal_uInt32 ) 0x04034b50 ); // assemble a new folder name in the destination folder INetURLObject aObj( rName ); diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index b1158c9ff345..94e0de1ad8c2 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -1937,16 +1937,16 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium ) pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); pS->SeekRel(EQNOLEFILEHDR_SIZE); //Skip 28byte Header and fill it in later - *pS << sal_uInt8(0x03); - *pS << sal_uInt8(0x01); - *pS << sal_uInt8(0x01); - *pS << sal_uInt8(0x03); - *pS << sal_uInt8(0x00); + pS->WriteUChar( sal_uInt8(0x03) ); + pS->WriteUChar( sal_uInt8(0x01) ); + pS->WriteUChar( sal_uInt8(0x01) ); + pS->WriteUChar( sal_uInt8(0x03) ); + pS->WriteUChar( sal_uInt8(0x00) ); sal_uInt32 nSize = pS->Tell(); nPendingAttributes=0; HandleNodes(pTree); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); nSize = pS->Tell()-nSize; pS->Seek(0); @@ -2021,25 +2021,25 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel) break; case NLINE: { - *pS << sal_uInt8(0x0a); - *pS << sal_uInt8(LINE); + pS->WriteUChar( sal_uInt8(0x0a) ); + pS->WriteUChar( sal_uInt8(LINE) ); sal_uInt16 nSize = pNode->GetNumSubNodes(); for (sal_uInt16 i = 0; i < nSize; i++) if (SmNode *pTemp = pNode->GetSubNode(i)) HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } break; case NALIGN: HandleMAlign(pNode,nLevel); break; case NBLANK: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x98); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x98) ); if (pNode->GetToken().eType == TSBLANK) - *pS << sal_uInt16(0xEB04); + pS->WriteUInt16( sal_uInt16(0xEB04) ); else - *pS << sal_uInt16(0xEB05); + pS->WriteUInt16( sal_uInt16(0xEB05) ); break; default: { @@ -2057,11 +2057,11 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel) int MathType::StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation) { int nOldPending=nPendingAttributes; - *pS << sal_uInt8(TMPL); //Template - *pS << sal_uInt8(nSelector); //selector - *pS << sal_uInt8(nVariation); //variation - *pS << sal_uInt8(0x00); //options - *pS << sal_uInt8(LINE); + pS->WriteUChar( sal_uInt8(TMPL) ); //Template + pS->WriteUChar( sal_uInt8(nSelector) ); //selector + pS->WriteUChar( sal_uInt8(nVariation) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options + pS->WriteUChar( sal_uInt8(LINE) ); //theres just no way we can now handle any character //attributes (from mathtypes perspective) centered //over an expression but above template attribute @@ -2073,39 +2073,39 @@ int MathType::StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation) void MathType::EndTemplate(int nOldPendingAttributes) { - *pS << sal_uInt8(END); //end line - *pS << sal_uInt8(END); //end template + pS->WriteUChar( sal_uInt8(END) ); //end line + pS->WriteUChar( sal_uInt8(END) ); //end template nPendingAttributes=nOldPendingAttributes; } void MathType::HandleSmMatrix(SmMatrixNode *pMatrix,int nLevel) { - *pS << sal_uInt8(MATRIX); - *pS << sal_uInt8(0x00); //vAlign ? - *pS << sal_uInt8(0x00); //h_just - *pS << sal_uInt8(0x00); //v_just - *pS << sal_uInt8(pMatrix->GetNumRows()); //v_just - *pS << sal_uInt8(pMatrix->GetNumCols()); //v_just + pS->WriteUChar( sal_uInt8(MATRIX) ); + pS->WriteUChar( sal_uInt8(0x00) ); //vAlign ? + pS->WriteUChar( sal_uInt8(0x00) ); //h_just + pS->WriteUChar( sal_uInt8(0x00) ); //v_just + pS->WriteUChar( sal_uInt8(pMatrix->GetNumRows()) ); //v_just + pS->WriteUChar( sal_uInt8(pMatrix->GetNumCols()) ); //v_just int nBytes=(pMatrix->GetNumRows()+1)*2/8; if (((pMatrix->GetNumRows()+1)*2)%8) nBytes++; for (sal_uInt16 j = 0; j < nBytes; j++) - *pS << sal_uInt8(0x00); //row_parts + pS->WriteUChar( sal_uInt8(0x00) ); //row_parts nBytes=(pMatrix->GetNumCols()+1)*2/8; if (((pMatrix->GetNumCols()+1)*2)%8) nBytes++; for (sal_uInt16 k = 0; k < nBytes; k++) - *pS << sal_uInt8(0x00); //col_parts + pS->WriteUChar( sal_uInt8(0x00) ); //col_parts sal_uInt16 nSize = pMatrix->GetNumSubNodes(); for (sal_uInt16 i = 0; i < nSize; i++) if (SmNode *pTemp = pMatrix->GetSubNode(i)) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //end line + pS->WriteUChar( sal_uInt8(END) ); //end line } - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } @@ -2121,57 +2121,57 @@ void MathType::HandleTable(SmNode *pNode,int nLevel) //without bound in a multi step conversion if (nLevel == 0) - *pS << sal_uInt8(0x0A); //initial size + pS->WriteUChar( sal_uInt8(0x0A) ); //initial size if ( nLevel || (nSize >1)) { - *pS << sal_uInt8(PILE); - *pS << sal_uInt8(nHAlign); //vAlign ? - *pS << sal_uInt8(0x01); //hAlign + pS->WriteUChar( sal_uInt8(PILE) ); + pS->WriteUChar( sal_uInt8(nHAlign) ); //vAlign ? + pS->WriteUChar( sal_uInt8(0x01) ); //hAlign } for (sal_uInt16 i = 0; i < nSize; i++) if (SmNode *pTemp = pNode->GetSubNode(i)) { - *pS << sal_uInt8(LINE); + pS->WriteUChar( sal_uInt8(LINE) ); HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } if (nLevel || (nSize>1)) - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } void MathType::HandleRoot(SmNode *pNode,int nLevel) { SmNode *pTemp; - *pS << sal_uInt8(TMPL); //Template - *pS << sal_uInt8(0x0D); //selector + pS->WriteUChar( sal_uInt8(TMPL) ); //Template + pS->WriteUChar( sal_uInt8(0x0D) ); //selector if (pNode->GetSubNode(0)) - *pS << sal_uInt8(0x01); //variation + pS->WriteUChar( sal_uInt8(0x01) ); //variation else - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options if (NULL != (pTemp = pNode->GetSubNode(2))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } if (NULL != (pTemp = pNode->GetSubNode(0))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } else - *pS << sal_uInt8(LINE|0x10); //dummy line + pS->WriteUChar( sal_uInt8(LINE|0x10) ); //dummy line - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel, @@ -2192,39 +2192,39 @@ sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel, { if (pPos) *pPos = pS->Tell(); - *pS << sal_uInt8(TMPL); //Template - *pS << sal_uInt8(0x2B); //selector - *pS << nVariation2; - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(TMPL) ); //Template + pS->WriteUChar( sal_uInt8(0x2B) ); //selector + pS->WriteUChar( nVariation2 ); + pS->WriteUChar( sal_uInt8(0x00) ); //options if (pContent) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pContent,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); - *pS << sal_uInt8(0x0B); + pS->WriteUChar( sal_uInt8(0x0B) ); SmNode *pTemp; if (NULL != (pTemp = pNode->GetSubNode(CSUB+1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); if (bTest && NULL != (pTemp = pNode->GetSubNode(CSUP+1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); } return nVariation2; } @@ -2253,29 +2253,29 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel) if (nVariation!=0xff) { - *pS << sal_uInt8(TMPL); //Template - *pS << sal_uInt8(0x2c); //selector - *pS << nVariation; - *pS << sal_uInt8(0x00); //options - *pS << sal_uInt8(0x0B); + pS->WriteUChar( sal_uInt8(TMPL) ); //Template + pS->WriteUChar( sal_uInt8(0x2c) ); //selector + pS->WriteUChar( nVariation ); + pS->WriteUChar( sal_uInt8(0x00) ); //options + pS->WriteUChar( sal_uInt8(0x0B) ); if (NULL != (pTemp = pNode->GetSubNode(LSUB+1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); if (NULL != (pTemp = pNode->GetSubNode(LSUP+1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); + pS->WriteUChar( sal_uInt8(END) ); nVariation=0xff; } @@ -2288,7 +2288,7 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel) } if (nVariation2 != 0xff) - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); if (NULL != (pNode->GetSubNode(RSUP+1))) { @@ -2301,58 +2301,58 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel) if (nVariation!=0xff) { - *pS << sal_uInt8(TMPL); //Template - *pS << sal_uInt8(0x0F); //selector - *pS << nVariation; - *pS << sal_uInt8(0x00); //options - *pS << sal_uInt8(0x0B); + pS->WriteUChar( sal_uInt8(TMPL) ); //Template + pS->WriteUChar( sal_uInt8(0x0F) ); //selector + pS->WriteUChar( nVariation ); + pS->WriteUChar( sal_uInt8(0x00) ); //options + pS->WriteUChar( sal_uInt8(0x0B) ); if (NULL != (pTemp = pNode->GetSubNode(RSUB+1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); if (NULL != (pTemp = pNode->GetSubNode(RSUP+1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(END) ); //line } else - *pS << sal_uInt8(LINE|0x10); - *pS << sal_uInt8(END); //line + pS->WriteUChar( sal_uInt8(LINE|0x10) ); + pS->WriteUChar( sal_uInt8(END) ); //line } //After subscript mathtype will keep the size of //normal text at the subscript size, sigh. - *pS << sal_uInt8(0x0A); + pS->WriteUChar( sal_uInt8(0x0A) ); } void MathType::HandleFractions(SmNode *pNode,int nLevel) { SmNode *pTemp; - *pS << sal_uInt8(TMPL); //Template - *pS << sal_uInt8(0x0E); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(TMPL) ); //Template + pS->WriteUChar( sal_uInt8(0x0E) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(LINE) ); //line if (NULL != (pTemp = pNode->GetSubNode(0))) HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(LINE) ); //line if (NULL != (pTemp = pNode->GetSubNode(2))) HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } @@ -2362,7 +2362,7 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel) SmNode *pLeft=pNode->GetSubNode(0); SmNode *pRight=pNode->GetSubNode(2); - *pS << sal_uInt8(TMPL); //Template + pS->WriteUChar( sal_uInt8(TMPL) ); //Template bIsReInterpBrace=0; sal_uInt8 nBSpec=0x10; sal_uLong nLoc = pS->Tell(); @@ -2371,42 +2371,42 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel) switch (pLeft->GetToken().eType) { case TLANGLE: - *pS << sal_uInt8(tmANGLE); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmANGLE) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options break; case TLBRACE: - *pS << sal_uInt8(tmBRACE); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmBRACE) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options nBSpec+=3; break; case TLBRACKET: - *pS << sal_uInt8(tmBRACK); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmBRACK) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options nBSpec+=3; break; case TLFLOOR: - *pS << sal_uInt8(tmFLOOR); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmFLOOR) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options break; case TLLINE: - *pS << sal_uInt8(tmBAR); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmBAR) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options nBSpec+=3; break; case TLDLINE: - *pS << sal_uInt8(tmDBAR); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmDBAR) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options break; default: - *pS << sal_uInt8(tmPAREN); //selector - *pS << sal_uInt8(0x00); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmPAREN) ); //selector + pS->WriteUChar( sal_uInt8(0x00) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options nBSpec+=3; break; } @@ -2414,9 +2414,9 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel) if (NULL != (pTemp = pNode->GetSubNode(1))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //options + pS->WriteUChar( sal_uInt8(END) ); //options } nSpec=nBSpec; if (pLeft) @@ -2425,45 +2425,45 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel) { sal_uLong nLoc2 = pS->Tell(); pS->Seek(nLoc); - *pS << sal_uInt8(0x2D); + pS->WriteUChar( sal_uInt8(0x2D) ); pS->Seek(nLoc2); - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x96); - *pS << sal_uInt16(0xEC07); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x96) ); + pS->WriteUInt16( sal_uInt16(0xEC07) ); bIsReInterpBrace=0; } if (pRight) HandleNodes(pRight,nLevel+1); nSpec=0x0; - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } void MathType::HandleVerticalBrace(SmNode *pNode,int nLevel) { SmNode *pTemp; - *pS << sal_uInt8(TMPL); //Template + pS->WriteUChar( sal_uInt8(TMPL) ); //Template if (pNode->GetToken().eType == TUNDERBRACE) - *pS << sal_uInt8(tmLHBRACE); //selector + pS->WriteUChar( sal_uInt8(tmLHBRACE) ); //selector else - *pS << sal_uInt8(tmUHBRACE); //selector - *pS << sal_uInt8(0x01); //variation - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(tmUHBRACE) ); //selector + pS->WriteUChar( sal_uInt8(0x01) ); //variation + pS->WriteUChar( sal_uInt8(0x00) ); //options if (NULL != (pTemp = pNode->GetSubNode(0))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //options + pS->WriteUChar( sal_uInt8(END) ); //options } if (NULL != (pTemp = pNode->GetSubNode(2))) { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pTemp,nLevel+1); - *pS << sal_uInt8(END); //options + pS->WriteUChar( sal_uInt8(END) ); //options } - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); } void MathType::HandleOperator(SmNode *pNode,int nLevel) @@ -2513,142 +2513,142 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel) nVariation = 2; nIntVariation=0; } - *pS << sal_uInt8(TMPL); + pS->WriteUChar( sal_uInt8(TMPL) ); switch(pNode->GetToken().eType) { case TINT: if (nOldVariation != 0xff) - *pS << sal_uInt8(0x18); //selector + pS->WriteUChar( sal_uInt8(0x18) ); //selector else - *pS << sal_uInt8(0x15); //selector - *pS << nIntVariation; //variation + pS->WriteUChar( sal_uInt8(0x15) ); //selector + pS->WriteUChar( nIntVariation ); //variation break; case TIINT: if (nOldVariation != 0xff) { - *pS << sal_uInt8(0x19); - *pS << sal_uInt8(0x01); + pS->WriteUChar( sal_uInt8(0x19) ); + pS->WriteUChar( sal_uInt8(0x01) ); } else { - *pS << sal_uInt8(0x16); - *pS << sal_uInt8(0x00); + pS->WriteUChar( sal_uInt8(0x16) ); + pS->WriteUChar( sal_uInt8(0x00) ); } break; case TIIINT: if (nOldVariation != 0xff) { - *pS << sal_uInt8(0x1a); - *pS << sal_uInt8(0x01); + pS->WriteUChar( sal_uInt8(0x1a) ); + pS->WriteUChar( sal_uInt8(0x01) ); } else { - *pS << sal_uInt8(0x17); - *pS << sal_uInt8(0x00); + pS->WriteUChar( sal_uInt8(0x17) ); + pS->WriteUChar( sal_uInt8(0x00) ); } break; case TLINT: if (nOldVariation != 0xff) { - *pS << sal_uInt8(0x18); - *pS << sal_uInt8(0x02); + pS->WriteUChar( sal_uInt8(0x18) ); + pS->WriteUChar( sal_uInt8(0x02) ); } else { - *pS << sal_uInt8(0x15); - *pS << sal_uInt8(0x03); + pS->WriteUChar( sal_uInt8(0x15) ); + pS->WriteUChar( sal_uInt8(0x03) ); } break; case TLLINT: if (nOldVariation != 0xff) { - *pS << sal_uInt8(0x19); - *pS << sal_uInt8(0x00); + pS->WriteUChar( sal_uInt8(0x19) ); + pS->WriteUChar( sal_uInt8(0x00) ); } else { - *pS << sal_uInt8(0x16); - *pS << sal_uInt8(0x02); + pS->WriteUChar( sal_uInt8(0x16) ); + pS->WriteUChar( sal_uInt8(0x02) ); } break; case TLLLINT: if (nOldVariation != 0xff) { - *pS << sal_uInt8(0x1a); - *pS << sal_uInt8(0x00); + pS->WriteUChar( sal_uInt8(0x1a) ); + pS->WriteUChar( sal_uInt8(0x00) ); } else { - *pS << sal_uInt8(0x17); - *pS << sal_uInt8(0x02); + pS->WriteUChar( sal_uInt8(0x17) ); + pS->WriteUChar( sal_uInt8(0x02) ); } break; case TSUM: default: - *pS << sal_uInt8(0x1d); - *pS << nVariation; + pS->WriteUChar( sal_uInt8(0x1d) ); + pS->WriteUChar( nVariation ); break; case TPROD: - *pS << sal_uInt8(0x1f); - *pS << nVariation; + pS->WriteUChar( sal_uInt8(0x1f) ); + pS->WriteUChar( nVariation ); break; case TCOPROD: - *pS << sal_uInt8(0x21); - *pS << nVariation; + pS->WriteUChar( sal_uInt8(0x21) ); + pS->WriteUChar( nVariation ); break; } - *pS << sal_uInt8(0x00); //options + pS->WriteUChar( sal_uInt8(0x00) ); //options if (nPos2) pS->Seek(nPos2); else { - *pS << sal_uInt8(LINE); //line + pS->WriteUChar( sal_uInt8(LINE) ); //line HandleNodes(pNode->GetSubNode(1),nLevel+1); - *pS << sal_uInt8(END); //line - *pS << sal_uInt8(LINE|0x10); - *pS << sal_uInt8(LINE|0x10); + pS->WriteUChar( sal_uInt8(END) ); //line + pS->WriteUChar( sal_uInt8(LINE|0x10) ); + pS->WriteUChar( sal_uInt8(LINE|0x10) ); } - *pS << sal_uInt8(0x0D); + pS->WriteUChar( sal_uInt8(0x0D) ); switch(pNode->GetToken().eType) { case TSUM: default: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x86); - *pS << sal_uInt16(0x2211); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x86) ); + pS->WriteUInt16( sal_uInt16(0x2211) ); break; case TPROD: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x86); - *pS << sal_uInt16(0x220F); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x86) ); + pS->WriteUInt16( sal_uInt16(0x220F) ); break; case TCOPROD: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x8B); - *pS << sal_uInt16(0x2210); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x8B) ); + pS->WriteUInt16( sal_uInt16(0x2210) ); break; case TIIINT: case TLLLINT: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x86); - *pS << sal_uInt16(0x222B); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x86) ); + pS->WriteUInt16( sal_uInt16(0x222B) ); case TIINT: case TLLINT: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x86); - *pS << sal_uInt16(0x222B); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x86) ); + pS->WriteUInt16( sal_uInt16(0x222B) ); case TINT: case TLINT: - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x86); - *pS << sal_uInt16(0x222B); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x86) ); + pS->WriteUInt16( sal_uInt16(0x222B) ); break; } - *pS << sal_uInt8(END); - *pS << sal_uInt8(0x0A); + pS->WriteUChar( sal_uInt8(END) ); + pS->WriteUChar( sal_uInt8(0x0A) ); } @@ -2977,60 +2977,60 @@ sal_Bool MathType::HandleLim(SmNode *pNode,int nLevel) sal_uInt8 nVariation2=HandleCScript(pNode->GetSubNode(0),NULL, nLevel); - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(LINE); //line - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('l'); - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('i'); - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('m'); + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(LINE) ); //line + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('l') ); + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('i') ); + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('m') ); if (pNode->GetToken().eType == TLIMSUP) { - *pS << sal_uInt8(CHAR); //some space - *pS << sal_uInt8(0x98); - *pS << sal_uInt16(0xEB04); - - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('s'); - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('u'); - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('p'); + pS->WriteUChar( sal_uInt8(CHAR) ); //some space + pS->WriteUChar( sal_uInt8(0x98) ); + pS->WriteUInt16( sal_uInt16(0xEB04) ); + + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('s') ); + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('u') ); + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('p') ); } else if (pNode->GetToken().eType == TLIMINF) { - *pS << sal_uInt8(CHAR); //some space - *pS << sal_uInt8(0x98); - *pS << sal_uInt16(0xEB04); - - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('i'); - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('n'); - *pS << sal_uInt8(CHAR|0x10); - *pS << sal_uInt8(0x82); - *pS << sal_uInt16('f'); + pS->WriteUChar( sal_uInt8(CHAR) ); //some space + pS->WriteUChar( sal_uInt8(0x98) ); + pS->WriteUInt16( sal_uInt16(0xEB04) ); + + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('i') ); + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('n') ); + pS->WriteUChar( sal_uInt8(CHAR|0x10) ); + pS->WriteUChar( sal_uInt8(0x82) ); + pS->WriteUInt16( sal_uInt16('f') ); } - *pS << sal_uInt8(CHAR); //some space - *pS << sal_uInt8(0x98); - *pS << sal_uInt16(0xEB04); + pS->WriteUChar( sal_uInt8(CHAR) ); //some space + pS->WriteUChar( sal_uInt8(0x98) ); + pS->WriteUInt16( sal_uInt16(0xEB04) ); if (nVariation2 != 0xff) { - *pS << sal_uInt8(END); - *pS << sal_uInt8(END); + pS->WriteUChar( sal_uInt8(END) ); + pS->WriteUChar( sal_uInt8(END) ); } HandleNodes(pNode->GetSubNode(1),nLevel+1); //*pS << sal_uInt8(END); //options @@ -3066,8 +3066,8 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/) { if (pNode->GetToken().eType == TMLINE) { - *pS << sal_uInt8(END); - *pS << sal_uInt8(LINE); + pS->WriteUChar( sal_uInt8(END) ); + pS->WriteUChar( sal_uInt8(LINE) ); bIsReInterpBrace=1; return; } @@ -3078,15 +3078,15 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/) if ((nArse == 0x2224) || (nArse == 0x2288) || (nArse == 0x2285) || (nArse == 0x2289)) { - *pS << sal_uInt8(CHAR|0x20); + pS->WriteUChar( sal_uInt8(CHAR|0x20) ); } else if ((nPendingAttributes) && (i == ((pTemp->GetText().getLength()+1)/2)-1)) { - *pS << sal_uInt8(0x22); + pS->WriteUChar( sal_uInt8(0x22) ); } else - *pS << sal_uInt8(CHAR); //char without formula recognition + pS->WriteUChar( sal_uInt8(CHAR) ); //char without formula recognition //The typeface seems to be MTEXTRA for unicode characters, //though how to determine when mathtype chooses one over //the other is unknown. This should do the trick @@ -3110,62 +3110,62 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/) else nBias = 0x3; //typeface - *pS << sal_uInt8(nSpec+nBias+128); //typeface + pS->WriteUChar( sal_uInt8(nSpec+nBias+128) ); //typeface if (nArse == 0x2224) { - *pS << sal_uInt16(0x7C); - *pS << sal_uInt8(EMBEL); - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(END); //end embel - *pS << sal_uInt8(END); //end embel + pS->WriteUInt16( sal_uInt16(0x7C) ); + pS->WriteUChar( sal_uInt8(EMBEL) ); + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(END) ); //end embel + pS->WriteUChar( sal_uInt8(END) ); //end embel } else if (nArse == 0x2225) - *pS << sal_uInt16(0xEC09); + pS->WriteUInt16( sal_uInt16(0xEC09) ); else if (nArse == 0xE421) - *pS << sal_uInt16(0x2265); + pS->WriteUInt16( sal_uInt16(0x2265) ); else if (nArse == 0x230A) - *pS << sal_uInt16(0xF8F0); + pS->WriteUInt16( sal_uInt16(0xF8F0) ); else if (nArse == 0x230B) - *pS << sal_uInt16(0xF8FB); + pS->WriteUInt16( sal_uInt16(0xF8FB) ); else if (nArse == 0xE425) - *pS << sal_uInt16(0x2264); + pS->WriteUInt16( sal_uInt16(0x2264) ); else if (nArse == 0x226A) { - *pS << sal_uInt16(0x3C); - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x98); - *pS << sal_uInt16(0xEB01); - *pS << sal_uInt8(CHAR); - *pS << sal_uInt8(0x86); - *pS << sal_uInt16(0x3c); + pS->WriteUInt16( sal_uInt16(0x3C) ); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x98) ); + pS->WriteUInt16( sal_uInt16(0xEB01) ); + pS->WriteUChar( sal_uInt8(CHAR) ); + pS->WriteUChar( sal_uInt8(0x86) ); + pS->WriteUInt16( sal_uInt16(0x3c) ); } else if (nArse == 0x2288) { - *pS << sal_uInt16(0x2286); - *pS << sal_uInt8(EMBEL); - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(END); //end embel - *pS << sal_uInt8(END); //end embel + pS->WriteUInt16( sal_uInt16(0x2286) ); + pS->WriteUChar( sal_uInt8(EMBEL) ); + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(END) ); //end embel + pS->WriteUChar( sal_uInt8(END) ); //end embel } else if (nArse == 0x2289) { - *pS << sal_uInt16(0x2287); - *pS << sal_uInt8(EMBEL); - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(END); //end embel - *pS << sal_uInt8(END); //end embel + pS->WriteUInt16( sal_uInt16(0x2287) ); + pS->WriteUChar( sal_uInt8(EMBEL) ); + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(END) ); //end embel + pS->WriteUChar( sal_uInt8(END) ); //end embel } else if (nArse == 0x2285) { - *pS << sal_uInt16(0x2283); - *pS << sal_uInt8(EMBEL); - *pS << sal_uInt8(0x0A); - *pS << sal_uInt8(END); //end embel - *pS << sal_uInt8(END); //end embel + pS->WriteUInt16( sal_uInt16(0x2283) ); + pS->WriteUChar( sal_uInt8(EMBEL) ); + pS->WriteUChar( sal_uInt8(0x0A) ); + pS->WriteUChar( sal_uInt8(END) ); //end embel + pS->WriteUChar( sal_uInt8(END) ); //end embel } else - *pS << nArse; + pS->WriteUInt16( nArse ); } nPendingAttributes = 0; } @@ -3248,33 +3248,33 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) case TCIRCLE: //Not Exportable break; case TCDOT: - *pS << sal_uInt8(2); + pS->WriteUChar( sal_uInt8(2) ); break; case TDDOT: - *pS << sal_uInt8(3); + pS->WriteUChar( sal_uInt8(3) ); break; case TDDDOT: - *pS << sal_uInt8(4); + pS->WriteUChar( sal_uInt8(4) ); break; case TTILDE: - *pS << sal_uInt8(8); + pS->WriteUChar( sal_uInt8(8) ); break; case THAT: - *pS << sal_uInt8(9); + pS->WriteUChar( sal_uInt8(9) ); break; case TVEC: - *pS << sal_uInt8(11); + pS->WriteUChar( sal_uInt8(11) ); break; case TOVERSTRIKE: - *pS << sal_uInt8(16); + pS->WriteUChar( sal_uInt8(16) ); break; case TOVERLINE: if ((pIsText->GetToken().eType == TTEXT) && (pIsText->GetText().getLength() == 1)) - *pS << sal_uInt8(17); + pS->WriteUChar( sal_uInt8(17) ); break; case TBREVE: - *pS << sal_uInt8(20); + pS->WriteUChar( sal_uInt8(20) ); break; case TWIDEVEC: case TUNDERLINE: @@ -3282,10 +3282,10 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel) case TWIDEHAT: break; case TBAR: - *pS << sal_uInt8(17); + pS->WriteUChar( sal_uInt8(17) ); break; default: - *pS << sal_uInt8(0x2); + pS->WriteUChar( sal_uInt8(0x2) ); break; } pS->Seek(nPos); @@ -3301,20 +3301,20 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/) if ((nPendingAttributes) && (i == ((pTemp->GetText().getLength()+1)/2)-1)) { - *pS << sal_uInt8(0x22); //char, with attributes right + pS->WriteUChar( sal_uInt8(0x22) ); //char, with attributes right //after the character } else - *pS << sal_uInt8(CHAR); + pS->WriteUChar( sal_uInt8(CHAR) ); sal_uInt8 nFace = 0x1; if (pNode->GetFont().GetItalic() == ITALIC_NORMAL) nFace = 0x3; else if (pNode->GetFont().GetWeight() == WEIGHT_BOLD) nFace = 0x7; - *pS << sal_uInt8(nFace+128); //typeface + pS->WriteUChar( sal_uInt8(nFace+128) ); //typeface sal_uInt16 nChar = pTemp->GetText()[i]; - *pS << SmTextNode::ConvertSymbolToUnicode(nChar); + pS->WriteUInt16( SmTextNode::ConvertSymbolToUnicode(nChar) ); //Mathtype can only have these sort of character //attributes on a single character, starmath can put them @@ -3331,17 +3331,17 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/) if ((nPendingAttributes) && (i == ((pTemp->GetText().getLength()+1)/2)-1)) { - *pS << sal_uInt8(EMBEL); + pS->WriteUChar( sal_uInt8(EMBEL) ); while (nPendingAttributes) { - *pS << sal_uInt8(2); + pS->WriteUChar( sal_uInt8(2) ); //wedge the attributes in here and clear //the pending stack nPendingAttributes--; } nInsertion=pS->Tell(); - *pS << sal_uInt8(END); //end embel - *pS << sal_uInt8(END); //end embel + pS->WriteUChar( sal_uInt8(END) ); //end embel + pS->WriteUChar( sal_uInt8(END) ); //end embel } } } diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 697c5229e910..a38a3466a282 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -41,14 +41,18 @@ um Calls zu sparen. */ -#define SFX_REC_MINI_HEADER(nPreTag,nStartPos,nEndPos) \ - ( sal_uInt32(nPreTag) | \ - sal_uInt32(nEndPos-nStartPos-SFX_REC_HEADERSIZE_MINI) << 8 ) +static void lclWriteMiniHeader(SvStream *p, sal_uInt32 nPreTag, sal_uInt32 nStartPos, sal_uInt32 nEndPos) +{ + (*p) << ( sal_uInt32(nPreTag) | + sal_uInt32(nEndPos-nStartPos-SFX_REC_HEADERSIZE_MINI) << 8 ); +} -#define SFX_REC_HEADER(nRecType,nContentTag,nContentVer) \ - ( sal_uInt32(nRecType) | \ - ( sal_uInt32(nContentVer) << 8 ) | \ - ( sal_uInt32(nContentTag) << 16 ) ) +static void lclWriteHeader(SvStream *p, sal_uInt32 nRecType, sal_uInt32 nContentTag, sal_uInt32 nContentVer) +{ + (*p) << ( sal_uInt32(nRecType) | + ( sal_uInt32(nContentVer) << 8 ) | + ( sal_uInt32(nContentTag) << 16 ) ); +} #define SFX_REC_CONTENT_HEADER(nContentVer,n1StStartPos,nCurStartPos) \ ( sal_uInt32(nContentVer) | \ @@ -94,7 +98,7 @@ sal_uInt32 SfxMiniRecordWriter::Close // Header an den Anfang des Records schreiben sal_uInt32 nEndPos = _pStream->Tell(); _pStream->Seek( _nStartPos ); - *_pStream << SFX_REC_MINI_HEADER( _nPreTag, _nStartPos, nEndPos ); + lclWriteMiniHeader(_pStream, _nPreTag, _nStartPos, nEndPos ); // je nachdem ans Ende des Records seeken oder hinter Header bleiben if ( bSeekToEndOfRec ) @@ -241,7 +245,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter : SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT ) { // Erweiterten Header hiner den des SfxMiniRec schreiben - *pStream << SFX_REC_HEADER(nRecordType, nContentTag, nContentVer); + lclWriteHeader(pStream, nRecordType, nContentTag, nContentVer); } @@ -376,8 +380,8 @@ sal_uInt32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec ) sal_uInt32 nEndPos = SfxSingleRecordWriter::Close( sal_False ); // gegen"uber SfxSingleRecord erweiterten Header schreiben - *_pStream << _nContentCount; - *_pStream << _nContentSize; + _pStream->WriteUInt16( _nContentCount ); + _pStream->WriteUInt32( _nContentSize ); // je nachdem ans Ende des Records seeken oder hinter Header bleiben if ( bSeekToEndOfRec ) @@ -500,18 +504,18 @@ sal_uInt32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec ) sal_uInt32 nContentOfsPos = _pStream->Tell(); //! darf man das so einr"ucken? for ( sal_uInt16 n = 0; n < _nContentCount; ++n ) - *_pStream << _aContentOfs[n]; + _pStream->WriteUInt32( _aContentOfs[n] ); // SfxMultiFixRecordWriter::Close() "uberspringen! sal_uInt32 nEndPos = SfxSingleRecordWriter::Close( sal_False ); // eigenen Header schreiben - *_pStream << _nContentCount; + _pStream->WriteUInt16( _nContentCount ); if ( SFX_REC_TYPE_VARSIZE_RELOC == _nPreTag || SFX_REC_TYPE_MIXTAGS_RELOC == _nPreTag ) - *_pStream << static_cast<sal_uInt32>(nContentOfsPos - ( _pStream->Tell() + sizeof(sal_uInt32) )); + _pStream->WriteUInt32( static_cast<sal_uInt32>(nContentOfsPos - ( _pStream->Tell() + sizeof(sal_uInt32) )) ); else - *_pStream << nContentOfsPos; + _pStream->WriteUInt32( nContentOfsPos ); // ans Ende des Records seeken bzw. am Ende des Headers bleiben if ( bSeekToEndOfRec ) @@ -545,7 +549,7 @@ void SfxMultiMixRecordWriter::NewContent // Tag vor den Content schreiben, Version und Startposition merken _nContentStartPos = _pStream->Tell(); ++_nContentCount; - *_pStream << nContentTag; + _pStream->WriteUInt16( nContentTag ); _nContentVer = nContentVer; } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 9e11d7102860..1fb59d5363ee 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -136,7 +136,7 @@ TYPEINIT1(SfxEnumItem, SfxEnumItemInterface) // virtual SvStream & SfxEnumItem::Store(SvStream & rStream, sal_uInt16) const { - rStream << m_nValue; + rStream.WriteUInt16( m_nValue ); return rStream; } @@ -229,7 +229,7 @@ SfxPoolItem * SfxBoolItem::Create(SvStream & rStream, sal_uInt16) const // virtual SvStream & SfxBoolItem::Store(SvStream & rStream, sal_uInt16) const { - rStream << static_cast<sal_Bool>(m_bValue); // not bool for serialization! + rStream.WriteUChar( static_cast<sal_Bool>(m_bValue) ); // not bool for serialization! return rStream; } diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index c8b35b97bdc6..5cdf1fb45c2e 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -96,7 +96,7 @@ SfxPoolItem * CntByteItem::Create(SvStream & rStream, sal_uInt16) const SvStream & CntByteItem::Store(SvStream & rStream, sal_uInt16) const { DBG_CHKTHIS(CntByteItem, 0); - rStream << short(m_nValue); + rStream.WriteInt16( short(m_nValue) ); return rStream; } @@ -215,7 +215,7 @@ SfxPoolItem * CntUInt16Item::Create(SvStream & rStream, sal_uInt16) const SvStream & CntUInt16Item::Store(SvStream &rStream, sal_uInt16) const { DBG_CHKTHIS(CntUInt16Item, 0); - rStream << sal_uInt16(m_nValue); + rStream.WriteUInt16( sal_uInt16(m_nValue) ); return rStream; } @@ -331,7 +331,7 @@ SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const { DBG_CHKTHIS(CntInt32Item, 0); //fdo#39428 SvStream no longer supports operator<<(long) - rStream << m_nValue; + rStream.WriteInt32( m_nValue ); return rStream; } @@ -451,7 +451,7 @@ SfxPoolItem * CntUInt32Item::Create(SvStream & rStream, sal_uInt16) const SvStream & CntUInt32Item::Store(SvStream &rStream, sal_uInt16) const { DBG_CHKTHIS(CntUInt32Item, 0); - rStream << static_cast<sal_uInt32>(m_nValue); + rStream.WriteUInt32( static_cast<sal_uInt32>(m_nValue) ); return rStream; } diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index cf9c5a5f3b71..1e5253aeeebe 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -62,7 +62,7 @@ SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) : SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const { DBG_CHKTHIS(SfxFlagItem, 0); - rStream << nVal; + rStream.WriteUInt16( nVal ); return rStream; } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index b8cd293f108b..bd4e4af7bf1f 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -122,7 +122,7 @@ SfxPoolItem * SfxInt16Item::Create(SvStream & rStream, sal_uInt16) const SvStream & SfxInt16Item::Store(SvStream & rStream, sal_uInt16) const { DBG_CHKTHIS(SfxInt16Item, 0); - rStream << short(m_nValue); + rStream.WriteInt16( short(m_nValue) ); return rStream; } diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index f275a55d529b..761d781b5a2e 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1512,7 +1512,7 @@ SvStream &SfxItemSet::Store // Position des Counts merken, um ggf. zu korrigieren sal_uLong nCountPos = rStream.Tell(); - rStream << _nCount; + rStream.WriteUInt16( _nCount ); // wenn nichts zu speichern ist, auch keinen ItemIter aufsetzen! if ( _nCount ) @@ -1540,7 +1540,7 @@ SvStream &SfxItemSet::Store // tats"achlichen Count im Stream ablegen sal_uLong nPos = rStream.Tell(); rStream.Seek( nCountPos ); - rStream << nWrittenCount; + rStream.WriteUInt16( nWrittenCount ); rStream.Seek( nPos ); } } diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index f5cc1fa36b45..1563c375f9f8 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -105,8 +105,8 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const sal_uInt32 nSize = aLockBytesStream.Seek( STREAM_SEEK_TO_END ); aLockBytesStream.Seek( 0L ); - rStream << nSize; - rStream << aLockBytesStream; + rStream.WriteUInt32( nSize ); + rStream.WriteStream( aLockBytesStream ); return rStream; } diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 9f17f125a479..a84ca7afa7b3 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -132,20 +132,20 @@ SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const : SVX_MACROTBL_AKTVERSION; if( SVX_MACROTBL_VERSION40 <= nVersion ) - rStream << nVersion; + rStream.WriteUInt16( nVersion ); - rStream << (sal_uInt16)aSvxMacroTable.size(); + rStream.WriteUInt16( (sal_uInt16)aSvxMacroTable.size() ); SvxMacroTable::const_iterator it = aSvxMacroTable.begin(); while( it != aSvxMacroTable.end() && rStream.GetError() == SVSTREAM_OK ) { const SvxMacro& rMac = it->second; - rStream << it->first; + rStream.WriteUInt16( it->first ); SfxPoolItem::writeByteString(rStream, rMac.GetLibName()); SfxPoolItem::writeByteString(rStream, rMac.GetMacName()); if( SVX_MACROTBL_VERSION40 <= nVersion ) - rStream << (sal_uInt16)rMac.GetScriptType(); + rStream.WriteUInt16( (sal_uInt16)rMac.GetScriptType() ); ++it; } return rStream; diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index efc4d8134075..0fd983300d47 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -107,8 +107,8 @@ SfxPoolItem* SfxRangeItem::Create(SvStream &rStream, sal_uInt16) const SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16) const { - rStream << nFrom; - rStream << nTo; + rStream.WriteUInt16( nFrom ); + rStream.WriteUInt16( nTo ); return rStream; } diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 5b8ec5a16ac3..7b6e9a094329 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -181,14 +181,14 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, sal_uInt16 ) const if( !pImp ) { //fdo#39428 SvStream no longer supports operator<<(long) - rStream << (sal_Int32) 0; + rStream.WriteInt32( (sal_Int32) 0 ); return rStream; } DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid"); sal_uInt32 nCount = pImp->aList.size(); - rStream << nCount; + rStream.WriteUInt32( nCount ); for( sal_uInt32 i=0; i < nCount; i++ ) writeByteString(rStream, pImp->aList[i]); diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 140a8b22a5e5..bcfceffdaa0d 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -94,7 +94,7 @@ SfxPoolItem * SfxVisibilityItem::Create(SvStream & rStream, sal_uInt16) const SvStream & SfxVisibilityItem::Store(SvStream & rStream, sal_uInt16) const { DBG_CHKTHIS(SfxVisibilityItem, 0); - rStream << m_nValue.bVisible; + rStream.WriteUChar( m_nValue.bVisible ); return rStream; } diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index 2d318461cc79..d14b17427e70 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -106,7 +106,7 @@ ImpSvNumMultipleWriteHeader::ImpSvNumMultipleWriteHeader(SvStream& rNewStream, aMemStream( 4096, 4096 ) { nDataSize = nDefault; - rStream << nDataSize; + rStream.WriteUInt32( nDataSize ); nDataPos = rStream.Tell(); nEntryStart = nDataPos; @@ -118,8 +118,8 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() { sal_uLong nDataEnd = rStream.Tell(); - rStream << (sal_uInt16) SV_NUMID_SIZES; - rStream << static_cast<sal_uInt32>(aMemStream.Tell()); + rStream.WriteUInt16( (sal_uInt16) SV_NUMID_SIZES ); + rStream.WriteUInt32( static_cast<sal_uInt32>(aMemStream.Tell()) ); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); if ( nDataEnd - nDataPos != nDataSize ) // Hit Default? @@ -127,7 +127,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() nDataSize = nDataEnd - nDataPos; sal_uLong nPos = rStream.Tell(); rStream.Seek(nDataPos-sizeof(sal_uInt32)); - rStream << nDataSize; // Add size at the start + rStream.WriteUInt32( nDataSize ); // Add size at the start rStream.Seek(nPos); } } @@ -137,7 +137,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader() void ImpSvNumMultipleWriteHeader::EndEntry() { sal_uLong nPos = rStream.Tell(); - aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart); + aMemStream.WriteUInt32( static_cast<sal_uInt32>(nPos - nEntryStart) ); } //#pragma SEG_FUNCDEF(numhead_0e) diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 6e111e5c47d0..d6cca2fee76d 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -155,26 +155,26 @@ void ImpSvNumberformatInfo::Save(SvStream& rStream, sal_uInt16 nAnz) const { // The fight with versions before SV_NUMBERFORMATTER_VERSION_NEW_CURR case NF_SYMBOLTYPE_CURRENCY : - rStream << short( NF_SYMBOLTYPE_STRING ); + rStream.WriteInt16( short( NF_SYMBOLTYPE_STRING ) ); break; case NF_SYMBOLTYPE_CURRDEL : case NF_SYMBOLTYPE_CURREXT : - rStream << short(0); // will be ignored (hopefully ...) + rStream.WriteInt16( short(0) ); // will be ignored (hopefully ...) break; default: if ( nType > NF_KEY_LASTKEYWORD_SO5 ) { - rStream << short( NF_SYMBOLTYPE_STRING ); // all new keywords are string + rStream.WriteInt16( short( NF_SYMBOLTYPE_STRING ) ); // all new keywords are string } else { - rStream << nType; + rStream.WriteInt16( nType ); } } } - rStream << eScannedType << sal_Bool(bThousand) << nThousand - << nCntPre << nCntPost << nCntExp; + rStream.WriteInt16( eScannedType ).WriteUChar( sal_Bool(bThousand) ).WriteUInt16( nThousand ) + .WriteUInt16( nCntPre ).WriteUInt16( nCntPost ).WriteUInt16( nCntExp ); } void ImpSvNumberformatInfo::Load(SvStream& rStream, sal_uInt16 nAnz) @@ -443,7 +443,7 @@ void ImpSvNumFor::Copy( const ImpSvNumFor& rNumFor, ImpSvNumberformatScan* pSc ) void ImpSvNumFor::Save(SvStream& rStream) const { - rStream << nAnzStrings; + rStream.WriteUInt16( nAnzStrings ); aI.Save(rStream, nAnzStrings); rStream.WriteUniOrByteString( sColorName, rStream.GetStreamCharSet() ); } @@ -510,7 +510,7 @@ void ImpSvNumFor::SaveNewCurrencyMap( SvStream& rStream ) const break; } } - rStream << nCnt; + rStream.WriteUInt16( nCnt ); for ( j=0; j<nAnzStrings; j++ ) { switch ( aI.nTypeArray[j] ) @@ -518,7 +518,7 @@ void ImpSvNumFor::SaveNewCurrencyMap( SvStream& rStream ) const case NF_SYMBOLTYPE_CURRENCY : case NF_SYMBOLTYPE_CURRDEL : case NF_SYMBOLTYPE_CURREXT : - rStream << j << aI.nTypeArray[j]; + rStream.WriteUInt16( j ).WriteInt16( aI.nTypeArray[j] ); break; } } @@ -1971,18 +1971,18 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr rHdr.StartEntry(); rStream.WriteUniOrByteString( aFormatstring, rStream.GetStreamCharSet() ); - rStream << eType << fLimit1 << fLimit2 << (sal_uInt16) eOp1 << (sal_uInt16) eOp2 - << sal_Bool(bOldStandard) << sal_Bool(bIsUsed); + rStream.WriteInt16( eType ).WriteDouble( fLimit1 ).WriteDouble( fLimit2 ).WriteUInt16( (sal_uInt16) eOp1 ).WriteUInt16( (sal_uInt16) eOp2 ) + .WriteUChar( sal_Bool(bOldStandard) ).WriteUChar( sal_Bool(bIsUsed) ); for (sal_uInt16 i = 0; i < 4; i++) { NumFor[i].Save(rStream); } // As of SV_NUMBERFORMATTER_VERSION_NEWSTANDARD rStream.WriteUniOrByteString( aComment.makeStringAndClear(), rStream.GetStreamCharSet() ); - rStream << nNewStandardDefined; + rStream.WriteUInt16( nNewStandardDefined ); // As of SV_NUMBERFORMATTER_VERSION_NEW_CURR - rStream << nNewCurrencyVersionId; - rStream << sal_Bool(bNewCurrency); + rStream.WriteUInt16( nNewCurrencyVersionId ); + rStream.WriteUChar( sal_Bool(bNewCurrency) ); if ( bNewCurrency ) { for ( sal_uInt16 j=0; j<4; j++ ) @@ -1994,8 +1994,8 @@ void SvNumberformat::Save( SvStream& rStream, ImpSvNumMultipleWriteHeader& rHdr // the real standard flag to load with versions >638 if different if ( bStandard != bOldStandard ) { - rStream << nNewStandardFlagVersionId; - rStream << (sal_Bool)bStandard; + rStream.WriteUInt16( nNewStandardFlagVersionId ); + rStream.WriteUChar( (sal_Bool)bStandard ); } rHdr.EndEntry(); diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 33234ed7d5bb..fb19ddcb6300 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -105,14 +105,16 @@ SvStream& operator<<( SvStream& rOStm, const GraphicAttr& rAttr ) VersionCompat aCompat( rOStm, STREAM_WRITE, 2 ); const sal_uInt32 nTmp32 = 0; - rOStm << nTmp32 << nTmp32 << rAttr.mfGamma << rAttr.mnMirrFlags << rAttr.mnRotate10; - rOStm << rAttr.mnContPercent << rAttr.mnLumPercent << rAttr.mnRPercent << rAttr.mnGPercent << rAttr.mnBPercent; - rOStm << rAttr.mbInvert << rAttr.mcTransparency << (sal_uInt16) rAttr.meDrawMode; + rOStm.WriteUInt32( nTmp32 ).WriteUInt32( nTmp32 ); + rOStm << rAttr.mfGamma; + rOStm.WriteUInt32( rAttr.mnMirrFlags ).WriteUInt16( rAttr.mnRotate10 ); + rOStm.WriteInt16( rAttr.mnContPercent ).WriteInt16( rAttr.mnLumPercent ).WriteInt16( rAttr.mnRPercent ).WriteInt16( rAttr.mnGPercent ).WriteInt16( rAttr.mnBPercent ); + rOStm.WriteUChar( rAttr.mbInvert ).WriteUChar( rAttr.mcTransparency ).WriteUInt16( (sal_uInt16) rAttr.meDrawMode ); //#fdo39428 SvStream no longer supports operator<<(long) - rOStm << sal::static_int_cast<sal_Int32>(rAttr.mnLeftCrop) - << sal::static_int_cast<sal_Int32>(rAttr.mnTopCrop) - << sal::static_int_cast<sal_Int32>(rAttr.mnRightCrop) - << sal::static_int_cast<sal_Int32>(rAttr.mnBottomCrop); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rAttr.mnLeftCrop) ) + .WriteInt32( sal::static_int_cast<sal_Int32>(rAttr.mnTopCrop) ) + .WriteInt32( sal::static_int_cast<sal_Int32>(rAttr.mnRightCrop) ) + .WriteInt32( sal::static_int_cast<sal_Int32>(rAttr.mnBottomCrop) ); return rOStm; } diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 17805e4b4c9d..8325c3b8d93a 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1134,7 +1134,8 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); const sal_Bool bLink = rGraphicObj.HasLink(); - rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; + rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr(); + rOStm.WriteUChar( bLink ); if( bLink ) write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8); diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 7ee8fcb98de6..aecafea392fa 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -68,7 +68,7 @@ IMapCompat::~IMapCompat() const sal_uLong nEndPos = pRWStm->Tell(); pRWStm->Seek( nCompatPos ); - *pRWStm << (sal_uInt32) ( nEndPos - nTotalSize ); + pRWStm->WriteUInt32( (sal_uInt32) ( nEndPos - nTotalSize ) ); pRWStm->Seek( nEndPos ); } else diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index f7e64fe1aa81..a1a7b29a7139 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -59,14 +59,14 @@ namespace svt SvStream& operator << ( SvStream& _rStorage, const util::DateTime& _rDate ) { sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti ); - _rStorage << hundredthSeconds; + _rStorage.WriteUInt16( hundredthSeconds ); - _rStorage << _rDate.Seconds; - _rStorage << _rDate.Minutes; - _rStorage << _rDate.Hours; - _rStorage << _rDate.Day; - _rStorage << _rDate.Month; - _rStorage << _rDate.Year; + _rStorage.WriteUInt16( _rDate.Seconds ); + _rStorage.WriteUInt16( _rDate.Minutes ); + _rStorage.WriteUInt16( _rDate.Hours ); + _rStorage.WriteUInt16( _rDate.Day ); + _rStorage.WriteUInt16( _rDate.Month ); + _rStorage.WriteInt16( _rDate.Year ); return _rStorage; } @@ -357,7 +357,7 @@ namespace svt // store the info about the children // the number - m_rStorage << (sal_Int32)_rContent.size(); + m_rStorage.WriteInt32( (sal_Int32)_rContent.size() ); // their URLs ( the local name is not enough, since URL might be not a hierarchical one, "expand:" for example ) ::std::for_each( _rContent.getSubContents().begin(), @@ -559,11 +559,11 @@ namespace svt if ( m_bValidCurrentState && openCacheStream( sal_False ) ) { - *m_pCacheStream << getMagicNumber(); + m_pCacheStream->WriteInt32( getMagicNumber() ); // store the template root folders // the size - *m_pCacheStream << (sal_Int32)m_aCurrentState.size(); + m_pCacheStream->WriteInt32( (sal_Int32)m_aCurrentState.size() ); // the complete URLs ::std::for_each( m_aCurrentState.begin(), diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 3e3693dc6f40..f4006c6517ee 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -121,20 +121,20 @@ SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjD rOStm.SeekRel( 4 ); rOStm << rObjDesc.maClassName; - rOStm << nViewAspect; + rOStm.WriteUInt32( nViewAspect ); //#fdo39428 Remove SvStream operator<<(long) - rOStm << sal::static_int_cast<sal_Int32>(rObjDesc.maSize.Width()); - rOStm << sal::static_int_cast<sal_Int32>(rObjDesc.maSize.Height()); - rOStm << sal::static_int_cast<sal_Int32>(rObjDesc.maDragStartPos.X()); - rOStm << sal::static_int_cast<sal_Int32>(rObjDesc.maDragStartPos.Y()); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rObjDesc.maSize.Width()) ); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rObjDesc.maSize.Height()) ); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rObjDesc.maDragStartPos.X()) ); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rObjDesc.maDragStartPos.Y()) ); rOStm.WriteUniOrByteString( rObjDesc.maTypeName, osl_getThreadTextEncoding() ); rOStm.WriteUniOrByteString( rObjDesc.maDisplayName, osl_getThreadTextEncoding() ); - rOStm << nSig1 << nSig2; + rOStm.WriteUInt32( nSig1 ).WriteUInt32( nSig2 ); const sal_uInt32 nLastPos = rOStm.Tell(); rOStm.Seek( nFirstPos ); - rOStm << ( nLastPos - nFirstPos ); + rOStm.WriteUInt32( nLastPos - nFirstPos ); rOStm.Seek( nLastPos ); return rOStm; diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index 0643df2bc815..92b0975da1bb 100644 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -70,8 +70,8 @@ void GalleryCodec::Write( SvStream& rStmToWrite ) const sal_uInt32 nSize = rStmToWrite.Tell(); rStmToWrite.Seek( 0UL ); - rStm << 'S' << 'V' << 'R' << 'L' << 'E' << '2'; - rStm << nSize; + rStm.WriteChar( 'S' ).WriteChar( 'V' ).WriteChar( 'R' ).WriteChar( 'L' ).WriteChar( 'E' ).WriteChar( '2' ); + rStm.WriteUInt32( nSize ); nPos = rStm.Tell(); rStm.SeekRel( 4UL ); @@ -83,7 +83,7 @@ void GalleryCodec::Write( SvStream& rStmToWrite ) nCompSize = rStm.Tell() - nPos - 4UL; rStm.Seek( nPos ); - rStm << nCompSize; + rStm.WriteUInt32( nCompSize ); rStm.Seek( STREAM_SEEK_TO_END ); } diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 12f2a0a00392..c9c034868070 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -246,7 +246,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( pTestStm ) { - *pTestStm << sal_Int32(1); + pTestStm->WriteInt32( sal_Int32(1) ); if( pTestStm->GetError() ) rbDirIsReadOnly = sal_True; diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index cb4f07a0e228..09bf8b40384b 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -171,8 +171,8 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const { static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); - rOut << nInventor << (sal_uInt16) 0x0004 << GetVersion() << (sal_uInt16) GetObjKind(); - rOut << bIsThumbBmp; + rOut.WriteUInt32( nInventor ).WriteUInt16( (sal_uInt16) 0x0004 ).WriteUInt16( GetVersion() ).WriteUInt16( (sal_uInt16) GetObjKind() ); + rOut.WriteUChar( bIsThumbBmp ); if( bIsThumbBmp ) { @@ -370,7 +370,7 @@ BitmapEx SgaObjectSound::GetThumbBmp() const void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - rOut << (sal_uInt16) eSoundType; + rOut.WriteUInt16( (sal_uInt16) eSoundType ); write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8); } diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 3c129d6f7f9a..790190f5458f 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -324,10 +324,10 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { - rStream << nLeftMargin; - rStream << nTopMargin; - rStream << nRightMargin; - rStream << nBottomMargin; + rStream.WriteInt16( nLeftMargin ); + rStream.WriteInt16( nTopMargin ); + rStream.WriteInt16( nRightMargin ); + rStream.WriteInt16( nBottomMargin ); return rStream; } diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index d63e32e06e59..fa8b5778133c 100644 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -80,7 +80,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const if( GRFCROP_VERSION_SWDEFAULT == nVersion ) top = -top, bottom = -bottom, left = -left, right = -right; - rStrm << top << left << right << bottom; + rStrm.WriteInt32( top ).WriteInt32( left ).WriteInt32( right ).WriteInt32( bottom ); return rStrm; } diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 3e4d6923b3b5..65e6bb467af0 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -44,17 +44,17 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // UNICODE: rStrm << sTarget; rStrm.WriteUniOrByteString(sTarget, rStrm.GetStreamCharSet()); - rStrm << (sal_uInt32) eType; + rStrm.WriteUInt32( (sal_uInt32) eType ); // marker for versioninfo - rStrm << (sal_uInt32) HYPERLINKFF_MARKER; + rStrm.WriteUInt32( (sal_uInt32) HYPERLINKFF_MARKER ); // new data // UNICODE: rStrm << sIntName; rStrm.WriteUniOrByteString(sIntName, rStrm.GetStreamCharSet()); // macro-events - rStrm << nMacroEvents; + rStrm.WriteUInt16( nMacroEvents ); // store macros sal_uInt16 nCnt = pMacroTable ? (sal_uInt16)pMacroTable->size() : 0; @@ -67,7 +67,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ --nCnt; } - rStrm << nCnt; + rStrm.WriteUInt16( nCnt ); if( nCnt ) { @@ -78,7 +78,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ const SvxMacro& rMac = it->second; if( STARBASIC == rMac.GetScriptType() ) { - rStrm << (sal_uInt16)it->first; + rStrm.WriteUInt16( (sal_uInt16)it->first ); // UNICODE: rStrm << pMac->GetLibName(); rStrm.WriteUniOrByteString(rMac.GetLibName(), rStrm.GetStreamCharSet()); @@ -90,7 +90,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ } nCnt = nMax - nCnt; - rStrm << nCnt; + rStrm.WriteUInt16( nCnt ); if( nCnt ) { // 2. ::com::sun::star::script::JavaScript-Macros @@ -100,7 +100,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ const SvxMacro& rMac = it->second; if( STARBASIC != rMac.GetScriptType() ) { - rStrm << (sal_uInt16)it->first; + rStrm.WriteUInt16( (sal_uInt16)it->first ); // UNICODE: rStrm << pMac->GetLibName(); rStrm.WriteUniOrByteString(rMac.GetLibName(), rStrm.GetStreamCharSet()); @@ -108,7 +108,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ // UNICODE: rStrm << pMac->GetMacName(); rStrm.WriteUniOrByteString(rMac.GetMacName(), rStrm.GetStreamCharSet()); - rStrm << (sal_uInt16)rMac.GetScriptType(); + rStrm.WriteUInt16( (sal_uInt16)rMac.GetScriptType() ); } } } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 8f1321e5eee6..a431a9fea121 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -264,7 +264,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) con // UNICODE: rStrm << aDescName; rStrm.WriteUniOrByteString(aDescName, rStrm.GetStreamCharSet()); - rStrm << (sal_uInt8)eNumType << bLandscape << eUse; + rStrm.WriteUChar( (sal_uInt8)eNumType ).WriteUChar( bLandscape ).WriteUInt16( eUse ); return rStrm; } diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 663c860f1c6c..159c295dcea9 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -224,19 +224,19 @@ void NBOTypeMgrBase::ImplStore(OUString filename) sal_uInt32 nVersion; sal_Int32 nNumIndex; nVersion = DEFAULT_NUMBERING_CACHE_FORMAT_VERSION; - *pOStm << nVersion; + pOStm->WriteUInt32( nVersion ); for(sal_Int32 nItem = 0; nItem < DEFAULT_NUM_VALUSET_COUNT; nItem++ ) { if (IsCustomized(nItem)) { SvxNumRule aDefNumRule( NUM_BULLET_REL_SIZE|NUM_CONTINUOUS|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT,10, sal_False , SVX_RULETYPE_NUMBERING,SvxNumberFormat::LABEL_ALIGNMENT); sal_uInt16 mLevel = 0x1; - *pOStm << nItem; + pOStm->WriteInt32( nItem ); ApplyNumRule(aDefNumRule,nItem,mLevel,false,true); aDefNumRule.Store(*pOStm); } } nNumIndex = -1; - *pOStm << nNumIndex; //write end flag + pOStm->WriteInt32( nNumIndex ); //write end flag delete pOStm; } eCoreUnit = eOldCoreUnit; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index bbb1d351c74c..8f701a3b15e0 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -697,8 +697,8 @@ SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const SvStream& SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const { - rOut<<sal_Int32(nValue.GetNumerator()); - rOut<<sal_Int32(nValue.GetDenominator()); + rOut.WriteInt32( sal_Int32(nValue.GetNumerator()) ); + rOut.WriteInt32( sal_Int32(nValue.GetDenominator()) ); return rOut; } @@ -1420,7 +1420,7 @@ SvStream& SdrTextFixedCellHeightItem::Store( SvStream& rOut, sal_uInt16 nItemVer if ( nItemVersion ) { sal_Bool bValue = (sal_Bool)GetValue(); - rOut << bValue; + rOut.WriteUChar( bValue ); } return rOut; } @@ -1520,9 +1520,9 @@ SvStream& SdrCustomShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemV if ( nItemVersion ) { sal_uInt32 i, nCount = GetCount(); - rOut << nCount; + rOut.WriteUInt32( nCount ); for ( i = 0; i < nCount; i++ ) - rOut << GetValue( i ).nValue; + rOut.WriteUInt32( GetValue( i ).nValue ); } return rOut; } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 06325fe4b568..9cc0f5dc5415 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -124,7 +124,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { SfxStringItem::Store( rOut, nItemVersion ); - rOut << nPalIndex; + rOut.WriteInt32( nPalIndex ); return rOut; } @@ -720,12 +720,12 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const if (!IsIndex()) { - rOut << (sal_Int32) aDash.GetDashStyle(); - rOut << aDash.GetDots(); - rOut << (sal_uInt32) aDash.GetDotLen(); - rOut << aDash.GetDashes(); - rOut << (sal_uInt32) aDash.GetDashLen(); - rOut << (sal_uInt32) aDash.GetDistance(); + rOut.WriteInt32( (sal_Int32) aDash.GetDashStyle() ); + rOut.WriteUInt16( aDash.GetDots() ); + rOut.WriteUInt32( (sal_uInt32) aDash.GetDotLen() ); + rOut.WriteUInt16( aDash.GetDashes() ); + rOut.WriteUInt32( (sal_uInt32) aDash.GetDashLen() ); + rOut.WriteUInt32( (sal_uInt32) aDash.GetDistance() ); } return rOut; @@ -1183,7 +1183,7 @@ namespace void streamOutB2DPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, SvStream& rOut) { const sal_uInt32 nPolygonCount(rPolyPolygon.count()); - rOut << nPolygonCount; + rOut.WriteUInt32( nPolygonCount ); for(sal_uInt32 a(0L); a < nPolygonCount; a++) { @@ -1191,9 +1191,9 @@ namespace const sal_uInt32 nPointCount(aCandidate.count()); const sal_uInt8 bClosed(aCandidate.isClosed() ? 1 : 0); const sal_uInt8 bControlPoints(aCandidate.areControlPointsUsed() ? 1 : 0); - rOut << nPointCount; - rOut << bClosed; - rOut << bControlPoints; + rOut.WriteUInt32( nPointCount ); + rOut.WriteUChar( bClosed ); + rOut.WriteUChar( bControlPoints ); for(sal_uInt32 b(0L); b < nPointCount; b++) { @@ -1204,7 +1204,7 @@ namespace if(bControlPoints) { const sal_uInt8 bEdgeIsCurve(aCandidate.isPrevControlPointUsed(b) || aCandidate.isNextControlPointUsed(b) ? 1 : 0); - rOut << bEdgeIsCurve; + rOut.WriteUChar( bEdgeIsCurve ); if(bEdgeIsCurve) { @@ -2626,24 +2626,24 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) co if (!IsIndex()) { - rOut << (sal_Int16)aGradient.GetGradientStyle(); + rOut.WriteInt16( (sal_Int16)aGradient.GetGradientStyle() ); sal_uInt16 nTmp; - nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetBlue() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetRed() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp; - - rOut << (sal_Int32) aGradient.GetAngle(); - rOut << aGradient.GetBorder(); - rOut << aGradient.GetXOffset(); - rOut << aGradient.GetYOffset(); - rOut << aGradient.GetStartIntens(); - rOut << aGradient.GetEndIntens(); - rOut << aGradient.GetSteps(); + nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetBlue() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetRed() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut.WriteUInt16( nTmp ); + + rOut.WriteInt32( (sal_Int32) aGradient.GetAngle() ); + rOut.WriteUInt16( aGradient.GetBorder() ); + rOut.WriteUInt16( aGradient.GetXOffset() ); + rOut.WriteUInt16( aGradient.GetYOffset() ); + rOut.WriteUInt16( aGradient.GetStartIntens() ); + rOut.WriteUInt16( aGradient.GetEndIntens() ); + rOut.WriteUInt16( aGradient.GetSteps() ); } return rOut; @@ -3127,15 +3127,15 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const if (!IsIndex()) { - rOut << (sal_Int16)aHatch.GetHatchStyle(); + rOut.WriteInt16( (sal_Int16)aHatch.GetHatchStyle() ); sal_uInt16 nTmp; - nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp; - nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp; + nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut.WriteUInt16( nTmp ); + nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut.WriteUInt16( nTmp ); - rOut << (sal_Int32) aHatch.GetDistance(); - rOut << (sal_Int32) aHatch.GetAngle(); + rOut.WriteInt32( (sal_Int32) aHatch.GetDistance() ); + rOut.WriteInt32( (sal_Int32) aHatch.GetAngle() ); } return rOut; diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 76bffee80513..c5c67763a0cc 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -59,7 +59,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData ) sal_uInt32 nItemCount = 0; sal_Size nFirstPos = rOStm.Tell(); - rOStm << nItemCount; + rOStm.WriteUInt32( nItemCount ); while( nWhich ) { @@ -68,7 +68,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData ) VersionCompat aCompat( rOStm, STREAM_WRITE ); const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() ); - rOStm << nWhich << nItemVersion2; + rOStm.WriteUInt16( nWhich ).WriteUInt16( nItemVersion2 ); pItem->Store( rOStm, nItemVersion2 ); nItemCount++; @@ -79,7 +79,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData ) const sal_uIntPtr nLastPos = rOStm.Tell(); rOStm.Seek( nFirstPos ); - rOStm << nItemCount; + rOStm.WriteUInt32( nItemCount ); rOStm.Seek( nLastPos ); } diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index 8554cdfee69c..da0f9f683af7 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -92,7 +92,7 @@ sal_Bool SwServerObject::GetData( uno::Any & rData, SwWriter aWrt( aMemStm, *pPam, sal_False ); if( !IsError( aWrt.Write( xWrt )) ) { - aMemStm << '\0'; // append a zero char + aMemStm.WriteChar( '\0' ); // append a zero char rData <<= uno::Sequence< sal_Int8 >( (sal_Int8*)aMemStm.GetData(), aMemStm.Seek( STREAM_SEEK_TO_END ) ); diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 80e8761dedc0..5f0203231ff7 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -105,7 +105,7 @@ namespace sal_uInt64 whereToWriteEndOfSwBlock = rStream.Tell(); sal_uInt64 endOfSwBlock = 0; - rStream << endOfSwBlock; + rStream.WriteUInt64( endOfSwBlock ); return whereToWriteEndOfSwBlock; } @@ -116,7 +116,7 @@ namespace { sal_uInt64 endOfSwBlock = rStream.Tell(); rStream.Seek(whereToWriteEndOfSwBlock); - rStream << endOfSwBlock; + rStream.WriteUInt64( endOfSwBlock ); rStream.Seek(endOfSwBlock); } @@ -536,46 +536,46 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const // --- from 680/dr25 on: store strings as UTF-8 write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, sNumFmtString, RTL_TEXTENCODING_UTF8); - rStream << (sal_uInt16)eSysLanguage << (sal_uInt16)eNumFmtLanguage; + rStream.WriteUInt16( (sal_uInt16)eSysLanguage ).WriteUInt16( (sal_uInt16)eNumFmtLanguage ); return 0 == rStream.GetError(); } sal_Bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const { - rStream << aFont.GetVersion( fileVersion ); - rStream << aHeight.GetVersion( fileVersion ); - rStream << aWeight.GetVersion( fileVersion ); - rStream << aPosture.GetVersion( fileVersion ); - rStream << aUnderline.GetVersion( fileVersion ); - rStream << aOverline.GetVersion( fileVersion ); - rStream << aCrossedOut.GetVersion( fileVersion ); - rStream << aContour.GetVersion( fileVersion ); - rStream << aShadowed.GetVersion( fileVersion ); - rStream << aColor.GetVersion( fileVersion ); - rStream << aBox.GetVersion( fileVersion ); - rStream << aTLBR.GetVersion( fileVersion ); - rStream << aBackground.GetVersion( fileVersion ); - - rStream << aAdjust.GetVersion( fileVersion ); + rStream.WriteUInt16( aFont.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aHeight.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aWeight.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aPosture.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aUnderline.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aOverline.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aCrossedOut.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aContour.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aShadowed.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aColor.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aBox.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aTLBR.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aBackground.GetVersion( fileVersion ) ); + + rStream.WriteUInt16( aAdjust.GetVersion( fileVersion ) ); if (fileVersion >= SOFFICE_FILEFORMAT_50) { WriterSpecificAutoFormatBlock block(rStream); - rStream << m_aTextOrientation.GetVersion(fileVersion); - rStream << m_aVerticalAlignment.GetVersion(fileVersion); + rStream.WriteUInt16( m_aTextOrientation.GetVersion(fileVersion) ); + rStream.WriteUInt16( m_aVerticalAlignment.GetVersion(fileVersion) ); } - rStream << aHorJustify.GetVersion( fileVersion ); - rStream << aVerJustify.GetVersion( fileVersion ); - rStream << SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0).GetVersion( fileVersion ); - rStream << aMargin.GetVersion( fileVersion ); - rStream << aLinebreak.GetVersion( fileVersion ); - rStream << aRotateAngle.GetVersion( fileVersion ); - rStream << aRotateMode.GetVersion( fileVersion ); + rStream.WriteUInt16( aHorJustify.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aVerJustify.GetVersion( fileVersion ) ); + rStream.WriteUInt16( SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0).GetVersion( fileVersion ) ); + rStream.WriteUInt16( aMargin.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aLinebreak.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aRotateAngle.GetVersion( fileVersion ) ); + rStream.WriteUInt16( aRotateMode.GetVersion( fileVersion ) ); - rStream << (sal_uInt16)0; // NumberFormat + rStream.WriteUInt16( (sal_uInt16)0 ); // NumberFormat return 0 == rStream.GetError(); } @@ -964,17 +964,17 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const { sal_uInt16 nVal = AUTOFORMAT_DATA_ID; sal_Bool b; - rStream << nVal; + rStream.WriteUInt16( nVal ); // --- from 680/dr25 on: store strings as UTF-8 write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStream, m_aName, RTL_TEXTENCODING_UTF8 ); - rStream << nStrResId; - rStream << ( b = bInclFont ); - rStream << ( b = bInclJustify ); - rStream << ( b = bInclFrame ); - rStream << ( b = bInclBackground ); - rStream << ( b = bInclValueFormat ); - rStream << ( b = bInclWidthHeight ); + rStream.WriteUInt16( nStrResId ); + rStream.WriteUChar( ( b = bInclFont ) ); + rStream.WriteUChar( ( b = bInclJustify ) ); + rStream.WriteUChar( ( b = bInclFrame ) ); + rStream.WriteUChar( ( b = bInclBackground ) ); + rStream.WriteUChar( ( b = bInclValueFormat ) ); + rStream.WriteUChar( ( b = bInclWidthHeight ) ); { WriterSpecificAutoFormatBlock block(rStream); @@ -982,7 +982,7 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream, sal_uInt16 fileVersion ) const m_aBreak.Store(rStream, m_aBreak.GetVersion(fileVersion)); m_aPageDesc.Store(rStream, m_aPageDesc.GetVersion(fileVersion)); m_aKeepWithNextPara.Store(rStream, m_aKeepWithNextPara.GetVersion(fileVersion)); - rStream << m_aRepeatHeading << m_bLayoutSplit << m_bRowSplit << m_bCollapsingBorders; + rStream.WriteUInt16( m_aRepeatHeading ).WriteUChar( m_bLayoutSplit ).WriteUChar( m_bRowSplit ).WriteUChar( m_bCollapsingBorders ); m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion)); } @@ -1202,9 +1202,9 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const // Attention: We need to save a general Header here sal_uInt16 nVal = AUTOFORMAT_ID; - rStream << nVal - << (sal_uInt8)2 // Character count of the Header including this value - << (sal_uInt8)GetStoreCharSet( ::osl_getThreadTextEncoding() ); + rStream.WriteUInt16( nVal ) + .WriteUChar( (sal_uInt8)2 ) // Character count of the Header including this value + .WriteUChar( (sal_uInt8)GetStoreCharSet( ::osl_getThreadTextEncoding() ) ); bRet = 0 == rStream.GetError(); @@ -1212,7 +1212,7 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream ) const m_pImpl->m_AutoFormats[0].GetBoxFmt(0).SaveVersionNo( rStream, AUTOFORMAT_FILE_VERSION); - rStream << static_cast<sal_uInt16>(m_pImpl->m_AutoFormats.size() - 1); + rStream.WriteUInt16( static_cast<sal_uInt16>(m_pImpl->m_AutoFormats.size() - 1) ); bRet = 0 == rStream.GetError(); for (sal_uInt16 i = 1; bRet && i < m_pImpl->m_AutoFormats.size(); ++i) diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index c108035e6de1..81e64525891f 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -320,7 +320,7 @@ sal_Bool SwEditShell::GetSelectedText( OUString &rBuf, int nHndlParaBrk ) STRING_MAXLEN > (( lLen = aStream.GetSize() ) / sizeof( sal_Unicode )) + 1 ) { - aStream << (sal_Unicode)'\0'; + aStream.WriteUInt16( (sal_Unicode)'\0' ); const sal_Unicode *p = (sal_Unicode*)aStream.GetBuffer(); if( p ) diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 24341509202c..4305eb899879 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1193,7 +1193,7 @@ SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) cons #else rStream << static_cast<sal_Int32>(nYPos); #endif - rStream << eOrient << eRelation; + rStream.WriteInt16( eOrient ).WriteInt16( eRelation ); return rStream; } diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 7a0263ae0230..2d9803a1f7bc 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -721,7 +721,8 @@ void SwImplProtocol::_Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong break; } } - *pStream << aOut.getStr() << endl; // output + pStream->WriteCharPtr( aOut.getStr() ); + (*pStream) << endl; // output pStream->Flush(); // to the disk, so we can read it immediately if( ++nLineCount >= nMaxLines ) // max number of lines reached? SwProtocol::SetRecord( 0 ); // => end f logging diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 06598c1cf640..f4b329b0bdef 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -210,9 +210,9 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) aIo.OpenFlagRec( bFollow ? 0x01 : 0x00, bFollow ? 8 : 4 ); nNdIdx -= nStartOfContent; - aIo.GetStream() << static_cast<sal_uInt32>(nNdIdx); + aIo.GetStream().WriteUInt32( static_cast<sal_uInt32>(nNdIdx) ); if( bFollow ) - aIo.GetStream() << static_cast<sal_uInt32>(((SwTxtFrm*)pTmp)->GetOfst()); + aIo.GetStream().WriteUInt32( static_cast<sal_uInt32>(((SwTxtFrm*)pTmp)->GetOfst()) ); aIo.CloseFlagRec(); /* Close Paragraph Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA ); @@ -251,8 +251,8 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) aIo.OpenRec( SW_LAYCACHE_IO_REC_TABLE ); aIo.OpenFlagRec( 0, 8 ); nNdIdx -= nStartOfContent; - aIo.GetStream() << static_cast<sal_uInt32>(nNdIdx) - << static_cast<sal_uInt32>(nOfst); + aIo.GetStream().WriteUInt32( static_cast<sal_uInt32>(nNdIdx) ) + .WriteUInt32( static_cast<sal_uInt32>(nOfst) ); aIo.CloseFlagRec(); /* Close Table Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE ); @@ -315,10 +315,10 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) SwRect &rRct = pFly->Frm(); sal_Int32 nX = rRct.Left() - pPage->Frm().Left(); sal_Int32 nY = rRct.Top() - pPage->Frm().Top(); - aIo.GetStream() << nPageNum << nOrdNum - << nX << nY - << static_cast<sal_Int32>(rRct.Width()) - << static_cast<sal_Int32>(rRct.Height()); + aIo.GetStream().WriteUInt16( nPageNum ).WriteUInt32( nOrdNum ) + .WriteInt32( nX ).WriteInt32( nY ) + .WriteInt32( static_cast<sal_Int32>(rRct.Width()) ) + .WriteInt32( static_cast<sal_Int32>(rRct.Height()) ); /* Close Fly Record */ aIo.CloseRec( SW_LAYCACHE_IO_REC_FLY ); } @@ -1094,8 +1094,8 @@ SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, bool bWrtMd ) : bError( false ) { if( bWriteMode ) - *pStream << nMajorVersion - << nMinorVersion; + pStream->WriteUInt16( nMajorVersion ) + .WriteUInt16( nMinorVersion ); else *pStream >> nMajorVersion @@ -1109,7 +1109,7 @@ bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType ) if( bWriteMode ) { aRecords.push_back( RecTypeSize(cType, nPos) ); - *pStream << (sal_uInt32) 0; + pStream->WriteUInt32( (sal_uInt32) 0 ); } else { @@ -1149,7 +1149,7 @@ bool SwLayCacheIoImpl::CloseRec( sal_uInt8 ) pStream->Seek( nBgn ); sal_uInt32 nSize = nPos - nBgn; sal_uInt32 nVal = ( nSize << 8 ) | aRecords.back().type; - *pStream << nVal; + pStream->WriteUInt32( nVal ); pStream->Seek( nPos ); if( pStream->GetError() != SVSTREAM_OK ) bRes = false; @@ -1229,7 +1229,7 @@ void SwLayCacheIoImpl::OpenFlagRec( sal_uInt8 nFlags, sal_uInt8 nLen ) OSL_ENSURE( (nFlags & 0xF0) == 0, "illegal flags set" ); OSL_ENSURE( nLen < 16, "wrong flag record length" ); sal_uInt8 cFlags = (nFlags << 4) + nLen; - *pStream << cFlags; + pStream->WriteUChar( cFlags ); nFlagRecEnd = pStream->Tell() + nLen; } diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 999993187de1..8d9a2003dc02 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -193,7 +193,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam, OUString & rBuffer) 0x7ffffff > (( lLen = aStream.GetSize() ) / sizeof( sal_Unicode )) + 1 ) { - aStream << (sal_Unicode)'\0'; + aStream.WriteUInt16( (sal_Unicode)'\0' ); aStream.Seek( 0 ); aStream.ResetError(); diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 083e76594e56..913476a1f115 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -156,13 +156,12 @@ sal_uLong SwASCWriter::WriteStream() switch(GetAsciiOptions().GetCharSet()) { case RTL_TEXTENCODING_UTF8: - Strm() << sal_uInt8(0xEF) << sal_uInt8(0xBB) << - sal_uInt8(0xBF); + Strm().WriteUChar( sal_uInt8(0xEF) ).WriteUChar( sal_uInt8(0xBB) ). WriteUChar( sal_uInt8(0xBF) ); break; case RTL_TEXTENCODING_UCS2: Strm().SetEndianSwap(sal_False); #ifdef OSL_LITENDIAN - Strm() << sal_uInt8(0xFF) << sal_uInt8(0xFE); + Strm().WriteUChar( sal_uInt8(0xFF) ).WriteUChar( sal_uInt8(0xFE) ); #else Strm() << sal_uInt8(0xFE) << sal_uInt8(0xFF); #endif diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index 4d512ce68421..39ef0907a421 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -812,12 +812,12 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, ((const XFillColorItem&)rItemSet.Get(XATTR_FILLCOLOR)).GetColorValue(); sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).append("="); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_Color( rWrt.Strm(), rFillColor, rHTMLWrt.eDestEnc ); } if (!sOut.isEmpty()) - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // und nun noch ALIGN, HSPACE und VSPACE sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE; @@ -828,7 +828,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject ); - rWrt.Strm() << '>'; + rWrt.Strm().WriteChar( '>' ); // Was jetzt kommt ist das Gegenstueck zu SdrTextObjectt::SetText() Outliner aOutliner(0, OUTLINERMODE_TEXTOBJECT); @@ -842,7 +842,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False ); if( !aEndTags.isEmpty() ) - rWrt.Strm() << aEndTags.getStr(); + rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); return rWrt; } diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 29c9c7646bd5..70887214f610 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -276,7 +276,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name). append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } @@ -284,7 +284,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_value). append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } @@ -301,7 +301,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed); } sOut.append('>'); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); } // Inhalt des Feldes ausgeben @@ -448,14 +448,14 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; OUString rTxt(comphelper::string::strip(pFld->GetPar2(), ' ')); - rWrt.Strm() << '<'; + rWrt.Strm().WriteChar( '<' ); if( !bOn ) - rWrt.Strm() << '/'; + rWrt.Strm().WriteChar( '/' ); // TODO: HTML-Tags are written without entitities, that for, characters // not contained in the destination encoding are lost! OString sTmp(OUStringToOString(rTxt, ((SwHTMLWriter&)rWrt).eDestEnc)); - rWrt.Strm() << sTmp.getStr() << '>'; + rWrt.Strm().WriteCharPtr( sTmp.getStr() ).WriteChar( '>' ); } else if( RES_POSTITFLD == pFldTyp->Which() ) { @@ -476,7 +476,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // characters not contained in the destination encoding are lost! OString sTmp(OUStringToOString(sComment, ((SwHTMLWriter&)rWrt).eDestEnc)); - rWrt.Strm() << sTmp.getStr(); + rWrt.Strm().WriteCharPtr( sTmp.getStr() ); bWritten = true; } else if( rComment.getLength() >= 7 && @@ -492,7 +492,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) // lost! OString sTmp(OUStringToOString(sComment, ((SwHTMLWriter&)rWrt).eDestEnc)); - rWrt.Strm() << sTmp.getStr(); + rWrt.Strm().WriteCharPtr( sTmp.getStr() ); bWritten = true; } @@ -506,7 +506,7 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_comment) .append(' ').append(OUStringToOString(sComment, ((SwHTMLWriter&)rWrt).eDestEnc)).append(" -->"); - rWrt.Strm() << sOut.getStr(); + rWrt.Strm().WriteCharPtr( sOut.getStr() ); } } else if( RES_SCRIPTFLD == pFldTyp->Which() ) diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index c210b56fdbcf..64b8480ebb91 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -446,7 +446,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt, sOut.append('<').append(pCntnrStr).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\"") .append("sd-abs-pos").append('\"'); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // Fuer Nicht-Zeichenobekte eine Breite ausgeben sal_uLong nFrmFlags = HTML_FRMOPTS_CNTNR; @@ -458,7 +458,7 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt, if( IsHTMLMode( HTMLMODE_BORDER_NONE ) ) nFrmFlags |= HTML_FRMOPT_S_NOBORDER; OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags, pSdrObject ); - Strm() << '>'; + Strm().WriteChar( '>' ); if( HTML_CNTNR_DIV == nCntnrMode ) { @@ -543,7 +543,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, (nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; sOut.append(' ').append(pStr). append("=\""); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), rFrmFmt.GetName(), eDestEnc, &aNonConvertableCharacters ); sOut.append('\"'); } @@ -552,7 +552,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( nFrmOpts & HTML_FRMOPT_DIR ) { sal_uInt16 nDir = GetHTMLDirection( rItemSet ); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); OutDirection( nDir ); } @@ -562,7 +562,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt). append("=\""); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), rAlternateTxt, eDestEnc, &aNonConvertableCharacters ); sOut.append('\"'); } @@ -743,7 +743,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, } if (!sOut.isEmpty()) - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // Umlauf fuer absatzgeb. Grafiken als <BR CLEAR=...> in den String // schreiben @@ -998,7 +998,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_href). append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); rHTMLWrt.OutHyperlinkHRefValue( aMapURL ); sOut.append('\"'); } @@ -1007,7 +1007,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name). append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); @@ -1017,14 +1017,14 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_target). append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aTarget, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } if (!sOut.isEmpty()) - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); if( pMacItem ) { @@ -1037,7 +1037,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, &rHTMLWrt.aNonConvertableCharacters ); } - rWrt.Strm() << ">"; + rWrt.Strm().WriteCharPtr( ">" ); aEndTags = OStringBuffer().append("</"). append(OOO_STRING_SVTOOLS_HTML_anchor). append(">").append(aEndTags). @@ -1108,9 +1108,9 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, sOut.append('<'); sOut.append(OOO_STRING_SVTOOLS_HTML_font).append(' '). append(OOO_STRING_SVTOOLS_HTML_O_color).append("="); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_Color( rWrt.Strm(), - pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ) << '>'; + pColBorderLine->GetColor(), rHTMLWrt.eDestEnc ).WriteChar( '>' ); aEndTags = OStringBuffer(). append("</"). @@ -1123,7 +1123,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, sOut.append(OOO_STRING_SVTOOLS_HTML_image).append(' '). append(OOO_STRING_SVTOOLS_HTML_O_src). append("=\"").append(OOO_STRING_SVTOOLS_HTML_O_data).append(":"); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); OUString aGraphicInBase64; sal_uLong nErr = XOutBitmap::GraphicToBase64(rGraphic, aGraphicInBase64); @@ -1131,7 +1131,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, { rHTMLWrt.nWarn = WARN_SWG_POOR_LOAD | WARN_SW_WRITE_BASE; } - HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"'; + HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' ); // Events if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, sal_True, &pItem )) @@ -1154,26 +1154,26 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border). append("=\"").append(static_cast<sal_Int32>(nBorderWidth)).append("\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); } if( pURLItem && pURLItem->IsServerMap() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_ismap); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); } if( !aIMapName.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_usemap). append("=\"#"); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); - HTMLOutFuncs::Out_String( rWrt.Strm(), aIMapName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"'; + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aIMapName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' ); } - rHTMLWrt.Strm() << '>'; + rHTMLWrt.Strm().WriteChar( '>' ); if( !aEndTags.isEmpty() ) - rWrt.Strm() << aEndTags.getStr(); + rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); if( !rHTMLWrt.aINetFmts.empty() ) { @@ -1215,7 +1215,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, sOut.append(' '); sOut.append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\""). append(OOO_STRING_SVTOOLS_HTML_O_data).append(":"); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); @@ -1269,7 +1269,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt, if (pTag) sOut.append('>'); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); return rWrt; } @@ -1366,7 +1366,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, append("=\"").append(static_cast<sal_Int32>(nGutter)).append("\""); } - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // WIDTH sal_uLong nFrmFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR @@ -1377,7 +1377,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt, if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr ) rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags ); - rWrt.Strm() << '>'; + rWrt.Strm().WriteChar( '>' ); rHTMLWrt.bLFPossible = sal_True; rHTMLWrt.IncIndentLevel(); // den Inhalt von Multicol einruecken; @@ -1418,14 +1418,14 @@ static Writer& OutHTML_FrmFmtAsSpacer( Writer& rWrt, const SwFrmFmt& rFrmFmt ) sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_spacer).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_type).append("=\"") .append(OOO_STRING_SVTOOLS_HTML_SPTYPE_block).append("\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // ALIGN, WIDTH, HEIGHT OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, HTML_FRMOPTS_SPACER ); - rWrt.Strm() << '>'; + rWrt.Strm().WriteChar( '>' ); if( !aEndTags.isEmpty() ) - rWrt.Strm() << aEndTags.getStr(); + rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); return rWrt; } @@ -1454,13 +1454,13 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, OStringBuffer sOut; sOut.append('<').append(pStr); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); sal_uLong nFrmFlags = HTML_FRMOPTS_DIV; if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) ) nFrmFlags |= HTML_FRMOPT_S_NOBORDER; OString aEndTags = rHTMLWrt.OutFrmFmtOptions( rFrmFmt, aEmptyOUStr, nFrmFlags ); rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmFlags ); - rWrt.Strm() << '>'; + rWrt.Strm().WriteChar( '>' ); rHTMLWrt.IncIndentLevel(); // den Inhalt einruecken rHTMLWrt.bLFPossible = sal_True; @@ -1490,7 +1490,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt, HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False ); if( !aEndTags.isEmpty() ) - rWrt.Strm() << aEndTags.getStr(); + rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); return rWrt; } diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 6afdc96cb3f3..98609a6ebf6b 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -295,20 +295,20 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt ) OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\" ") .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#"); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sFtnName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append('\"'); if( !rFmtFtn.GetNumStr().isEmpty() ) sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed); sOut.append('>'); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, sal_True ); HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc), @@ -355,9 +355,9 @@ void SwHTMLWriter::OutFootEndNotes() OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_division) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_id).append("=\""); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters ); - Strm() << "\">"; + Strm().WriteCharPtr( "\">" ); bLFPossible = sal_True; IncIndentLevel(); // Inhalt von <DIV> einruecken @@ -463,17 +463,17 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_anchor).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_class).append("=\""); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), sClass, eDestEnc, &aNonConvertableCharacters ); sOut.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\""); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol).append("\" ") .append(OOO_STRING_SVTOOLS_HTML_O_href).append("=\"#"); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), sFtnName, eDestEnc, &aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor).append("\">"); - Strm() << sOut.makeStringAndClear().getStr(); + Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( Strm(), rNum, eDestEnc, &aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False ); @@ -534,9 +534,9 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString *pParts, sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"").append(pName) .append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_content).append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aContent, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - rWrt.Strm() << "\">"; + rWrt.Strm().WriteCharPtr( "\">" ); } void SwHTMLWriter::OutFootEndNoteInfo() diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 491abb8b1ad3..323bd7d1972d 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -824,7 +824,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, { // Unordered list: <UL> sOut.append(OOO_STRING_SVTOOLS_HTML_unorderlist); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); OutHTML_BulletImage( rWrt, 0, rNumFmt.GetBrush(), @@ -873,12 +873,12 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, } if (!sOut.isEmpty()) - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); if( rWrt.bCfgOutStyles ) OutCSS1_NumBulListStyleOpt( rWrt, *rInfo.GetNumRule(), (sal_uInt8)i ); - rWrt.Strm() << '>'; + rWrt.Strm().WriteChar( '>' ); rWrt.IncIndentLevel(); // Inhalt von <OL> einruecken } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 57f1a1901ca4..7da37d9183c7 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1040,7 +1040,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src) .append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } @@ -1051,7 +1051,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_type) .append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } @@ -1086,7 +1086,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_codebase) .append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } @@ -1098,7 +1098,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, aAny >>= aClass; sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_code) .append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); @@ -1110,7 +1110,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sOut.append('\"'); } @@ -1129,7 +1129,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, // oder das Flating-Frame spezifische sOut.append(OOO_STRING_SVTOOLS_HTML_iframe); - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(), xSet, @@ -1140,7 +1140,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, : HTML_FRMOPTS_IFRAME; } - rWrt.Strm() << sOut.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() ); // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed ) @@ -1170,10 +1170,10 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, if( SWHTML_OPTTYPE_TAG == nType ) { const OUString& rValue = rCommand.GetArgument(); - rWrt.Strm() << ' '; + rWrt.Strm().WriteChar( ' ' ); HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - rWrt.Strm() << "=\""; - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"'; + rWrt.Strm().WriteCharPtr( "=\"" ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' ); } else if( SWHTML_OPTTYPE_PARAM == nType ) { @@ -1181,7 +1181,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, } } - rHTMLWrt.Strm() << '>'; + rHTMLWrt.Strm().WriteChar( '>' ); rHTMLWrt.IncIndentLevel(); // Inhalt von Applet einruecken @@ -1196,12 +1196,12 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, sBuf.append('<').append(OOO_STRING_SVTOOLS_HTML_param) .append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) .append("=\""); - rWrt.Strm() << sBuf.makeStringAndClear().getStr(); + rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() ); HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); sBuf.append("\" ").append(OOO_STRING_SVTOOLS_HTML_O_value) .append("=\""); - rWrt.Strm() << sBuf.makeStringAndClear().getStr(); - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << "\">"; + rWrt.Strm().WriteCharPtr( sBuf.makeStringAndClear().getStr() ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteCharPtr( "\">" ); } rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken @@ -1227,25 +1227,25 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt, if( SwApplet_Impl::GetOptionType( rName, sal_False ) == SWHTML_OPTTYPE_TAG ) { const OUString& rValue = rCommand.GetArgument(); - rWrt.Strm() << ' '; + rWrt.Strm().WriteChar( ' ' ); HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); - rWrt.Strm() << "=\""; - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ) << '\"'; + rWrt.Strm().WriteCharPtr( "=\"" ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' ); } } - rHTMLWrt.Strm() << '>'; + rHTMLWrt.Strm().WriteChar( '>' ); } else { // und fuer Floating-Frames einfach noch ein </IFRAME> // ausgeben - rHTMLWrt.Strm() << '>'; + rHTMLWrt.Strm().WriteChar( '>' ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False ); } if( !aEndTags.isEmpty() ) - rWrt.Strm() << aEndTags.getStr(); + rWrt.Strm().WriteCharPtr( aEndTags.getStr() ); return rWrt; } diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 5245cd38715c..d05364c01c87 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -52,7 +52,7 @@ SvStream& lcl_OutLongExt( SvStream& rStrm, sal_uLong nVal, bool bNeg ) if (bNeg) aBuf[--i] = '-'; - return rStrm << &aBuf[i]; + return rStrm.WriteCharPtr( &aBuf[i] ); } } diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx index 73732b830664..2aaf2b3317ce 100644 --- a/sw/source/filter/ww8/WW8FFData.cxx +++ b/sw/source/filter/ww8/WW8FFData.cxx @@ -72,7 +72,7 @@ void WW8FFData::WriteOUString(SvStream * pDataStrm, const OUString & rStr, bool bAddZero) { sal_uInt16 nStrLen = msword_cast<sal_uInt16>(rStr.getLength()); - *pDataStrm << nStrLen; + pDataStrm->WriteUInt16( nStrLen ); SwWW8Writer::WriteString16(*pDataStrm, rStr, bAddZero); } @@ -131,7 +131,7 @@ void WW8FFData::Write(SvStream * pDataStrm) if (mnType == 0) WriteOUString(pDataStrm, msDefault, true); else - *pDataStrm << mnDefault; + pDataStrm->WriteUInt16( mnDefault ); WriteOUString(pDataStrm, msFormat, true); WriteOUString(pDataStrm, msHelp, true); @@ -145,7 +145,7 @@ void WW8FFData::Write(SvStream * pDataStrm) pDataStrm->Write(aData1, sizeof(aData1)); sal_uInt32 nListboxEntries = msListEntries.size(); - *pDataStrm << nListboxEntries; + pDataStrm->WriteUInt32( nListboxEntries ); ::std::vector< OUString >::const_iterator aIt = msListEntries.begin(); diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx index 811cba097c8a..1d652db1faa0 100644 --- a/sw/source/filter/ww8/rtfstringbuffer.cxx +++ b/sw/source/filter/ww8/rtfstringbuffer.cxx @@ -26,7 +26,7 @@ RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrmFmt* pFlyFrmFmt, const void RtfStringBufferValue::makeStringAndClear(RtfAttributeOutput* pAttributeOutput) { if (!isGraphic()) - pAttributeOutput->m_rExport.Strm() << m_aBuffer.makeStringAndClear().getStr(); + pAttributeOutput->m_rExport.Strm().WriteCharPtr( m_aBuffer.makeStringAndClear().getStr() ); else pAttributeOutput->FlyFrameGraphic(m_pFlyFrmFmt, m_pGrfNode); } diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 47db18eb99ad..e605bc079805 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -212,7 +212,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm SwWW8Writer::WriteLong(tmpStrm, rTarFrm.getLength()+1); SwWW8Writer::WriteString16(tmpStrm, rTarFrm, false); - tmpStrm << sal_uInt16( 0 ); + tmpStrm.WriteUInt16( sal_uInt16( 0 ) ); mnFlags |= WW8_HLINK_FRAME; } @@ -230,7 +230,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm mnFlags |= WW8_HLINK_BODY; tmpStrm.Write( maGuidFileMoniker,sizeof(maGuidFileMoniker) ); - tmpStrm << nLevel; + tmpStrm.WriteUInt16( nLevel ); SwWW8Writer::WriteLong(tmpStrm, aFileName.getLength()+1); SwWW8Writer::WriteString8( tmpStrm, aFileName, true, RTL_TEXTENCODING_MS_1252 ); tmpStrm.Write( maGuidFileTail,sizeof(maGuidFileTail) ); @@ -238,7 +238,7 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm //For UNICODE SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength()+6); SwWW8Writer::WriteLong(tmpStrm, 2*aFileName.getLength()); - tmpStrm << sal_uInt16(0x0003); + tmpStrm.WriteUInt16( sal_uInt16(0x0003) ); SwWW8Writer::WriteString16(tmpStrm, aFileName, false); } else if( eProtocol != INET_PROT_NOT_VALID ) @@ -270,8 +270,8 @@ void SwBasicEscherEx::WriteHyperlinkWithinFly( SvMemoryStream& rStrm, const SwFm } rStrm.Write( maGuidStdLink,16 ); - rStrm << sal_uInt32( 2 ) - << mnFlags; + rStrm .WriteUInt32( sal_uInt32( 2 ) ) + .WriteUInt32( mnFlags ); tmpStrm.Seek( STREAM_SEEK_TO_BEGIN ); sal_uInt32 nStrmPos = tmpStrm.Tell(); tmpStrm.Seek( STREAM_SEEK_TO_END ); @@ -1423,19 +1423,19 @@ void WinwordAnchoring::WriteData( EscherEx& rEx ) const if (mbInline) { rEx.AddAtom(18, DFF_msofbtUDefProp, 3, 3); //Prop id is 0xF122 - rSt << (sal_uInt16)0x0390 << sal_uInt32(3); - rSt << (sal_uInt16)0x0392 << sal_uInt32(3); + rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( sal_uInt32(3) ); + rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( sal_uInt32(3) ); //This sub property is required to be in the dummy inline frame as //well - rSt << (sal_uInt16)0x053F << nInlineHack; + rSt.WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack ); } else { rEx.AddAtom(24, DFF_msofbtUDefProp, 3, 4 ); //Prop id is 0xF122 - rSt << (sal_uInt16)0x038F << mnXAlign; - rSt << (sal_uInt16)0x0390 << mnXRelTo; - rSt << (sal_uInt16)0x0391 << mnYAlign; - rSt << (sal_uInt16)0x0392 << mnYRelTo; + rSt.WriteUInt16( (sal_uInt16)0x038F ).WriteUInt32( mnXAlign ); + rSt.WriteUInt16( (sal_uInt16)0x0390 ).WriteUInt32( mnXRelTo ); + rSt.WriteUInt16( (sal_uInt16)0x0391 ).WriteUInt32( mnYAlign ); + rSt.WriteUInt16( (sal_uInt16)0x0392 ).WriteUInt32( mnYRelTo ); } } } @@ -1515,7 +1515,7 @@ SwBasicEscherEx::~SwBasicEscherEx() void SwBasicEscherEx::WriteFrmExtraData(const SwFrmFmt&) { AddAtom(4, ESCHER_ClientAnchor); - GetStream() << (sal_uInt32)0x80000000; + GetStream().WriteUInt32( (sal_uInt32)0x80000000 ); } void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShapeId) @@ -1526,7 +1526,7 @@ void SwBasicEscherEx::WriteEmptyFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nShape WriteFrmExtraData(rFmt); AddAtom(6, DFF_msofbtUDefProp, 3, 1); //Prop id is 0xF122 - GetStream() << (sal_uInt16)0x053F << nInlineHack; + GetStream().WriteUInt16( (sal_uInt16)0x053F ).WriteUInt32( nInlineHack ); CloseContainer(); // ESCHER_SpContainer } @@ -1598,7 +1598,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0 ); aPropOpt.Commit( GetStream() ); AddAtom(4, ESCHER_ClientAnchor); - GetStream() << (sal_uInt32)0x80000000; + GetStream().WriteUInt32( (sal_uInt32)0x80000000 ); CloseContainer(); return 0; @@ -2173,13 +2173,13 @@ sal_Int32 SwEscherEx::WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType aPolyDump.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); sal_uInt16 nLen = aPoly.GetSize(); - aPolyDump << nLen; - aPolyDump << nLen; - aPolyDump << sal_uInt16(8); + aPolyDump.WriteUInt16( nLen ); + aPolyDump.WriteUInt16( nLen ); + aPolyDump.WriteUInt16( sal_uInt16(8) ); for (sal_uInt16 nI = 0; nI < nLen; ++nI) { - aPolyDump << sal_uInt32(aPoly[nI].X()); - aPolyDump << sal_uInt32(aPoly[nI].Y()); + aPolyDump.WriteUInt32( sal_uInt32(aPoly[nI].X()) ); + aPolyDump.WriteUInt32( sal_uInt32(aPoly[nI].Y()) ); } sal_uInt16 nArrLen = msword_cast<sal_uInt16>(aPolyDump.Tell()); @@ -2256,13 +2256,13 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) OpenContainer( ESCHER_DggContainer ); sal_uInt16 nColorCount = 4; - *pStrm << (sal_uInt16)( nColorCount << 4 ) // instance - << (sal_uInt16)ESCHER_SplitMenuColors // record type - << (sal_uInt32)( nColorCount * 4 ) // size - << (sal_uInt32)0x08000004 - << (sal_uInt32)0x08000001 - << (sal_uInt32)0x08000002 - << (sal_uInt32)0x100000f7; + pStrm ->WriteUInt16( (sal_uInt16)( nColorCount << 4 ) ) // instance + .WriteUInt16( (sal_uInt16)ESCHER_SplitMenuColors ) // record type + .WriteUInt32( (sal_uInt32)( nColorCount * 4 ) ) // size + .WriteUInt32( (sal_uInt32)0x08000004 ) + .WriteUInt32( (sal_uInt32)0x08000001 ) + .WriteUInt32( (sal_uInt32)0x08000002 ) + .WriteUInt32( (sal_uInt32)0x100000f7 ); CloseContainer(); // ESCHER_DggContainer @@ -2281,7 +2281,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) for( ; i--; pSdrObjs = rWrt.pSdrObjs, pTxtBxs = rWrt.pTxtBxs ) { // "dummy char" (or any Count ?) - why? This knows only M$ - GetStream() << (sal_Char)i; + GetStream().WriteChar( (sal_Char)i ); OpenContainer( ESCHER_DgContainer ); @@ -2392,7 +2392,7 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) aPropOpt.Commit( *pStrm ); AddAtom( 4, ESCHER_ClientData ); - GetStream() << static_cast<sal_Int32>(1); + GetStream().WriteInt32( static_cast<sal_Int32>(1) ); CloseContainer(); // ESCHER_SpContainer } @@ -2861,10 +2861,10 @@ void SwEscherEx::WriteFrmExtraData( const SwFrmFmt& rFmt ) aWinwordAnchoring.WriteData(*this); AddAtom(4, ESCHER_ClientAnchor); - GetStream() << static_cast<sal_Int32>(0); + GetStream().WriteInt32( static_cast<sal_Int32>(0) ); AddAtom(4, ESCHER_ClientData); - GetStream() << static_cast<sal_Int32>(1); + GetStream().WriteInt32( static_cast<sal_Int32>(1) ); } sal_Int32 SwEscherEx::WriteFlyFrm(const DrawObj &rObj, sal_uInt32 &rShapeId, @@ -3018,7 +3018,7 @@ sal_Int32 SwEscherEx::WriteTxtFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId, // store anchor attribute WriteFrmExtraData( rFmt ); - AddAtom( 4, ESCHER_ClientTextbox ); GetStream() << nTxtBox; + AddAtom( 4, ESCHER_ClientTextbox ); GetStream().WriteUInt32( nTxtBox ); CloseContainer(); // ESCHER_SpContainer return nBorderThick; diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 5083368bcfc1..02a313866aff 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -166,7 +166,7 @@ void WW8AttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &r if ( rRule.IsContinusNum() ) nFlags |= 0x1; - *m_rWW8Export.pTableStrm << nFlags << nDummy; + m_rWW8Export.pTableStrm->WriteUChar( nFlags ).WriteUChar( nDummy ); } void MSWordExportBase::NumberingDefinitions() @@ -204,7 +204,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, SwWW8Writer::WriteLong( *m_rWW8Export.pTableStrm, nStart ); // Type - *m_rWW8Export.pTableStrm << WW8Export::GetNumId( nNumberingType ); + m_rWW8Export.pTableStrm->WriteUChar( WW8Export::GetNumId( nNumberingType ) ); // Justification sal_uInt8 nAlign; @@ -220,14 +220,14 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, nAlign = 0; break; } - *m_rWW8Export.pTableStrm << nAlign; + m_rWW8Export.pTableStrm->WriteUChar( nAlign ); // Write the rgbxchNums[9], positions of placeholders for paragraph // numbers in the text m_rWW8Export.pTableStrm->Write( pNumLvlPos, WW8ListManager::nMaxLevel ); // Type of the character between the bullet and the text - *m_rWW8Export.pTableStrm << nFollow; + m_rWW8Export.pTableStrm->WriteUChar( nFollow ); // dxaSoace/dxaIndent (Word 6 compatibility) SwWW8Writer::WriteLong( *m_rWW8Export.pTableStrm, 0 ); @@ -270,7 +270,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, m_rWW8Export.pO = pOldpO; } - *m_rWW8Export.pTableStrm << sal_uInt8( aCharAtrs.size() ); + m_rWW8Export.pTableStrm->WriteUChar( sal_uInt8( aCharAtrs.size() ) ); // cbGrpprlPapx sal_uInt8 aPapSprms [] = { @@ -278,7 +278,7 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/, 0x60, 0x84, 0, 0, // sprmPDxaLeft1 0x15, 0xc6, 0x05, 0x00, 0x01, 0, 0, 0x06 }; - *m_rWW8Export.pTableStrm << sal_uInt8( sizeof( aPapSprms ) ); + m_rWW8Export.pTableStrm->WriteUChar( sal_uInt8( sizeof( aPapSprms ) ) ); // reserved SwWW8Writer::WriteShort( *m_rWW8Export.pTableStrm, 0 ); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 1ed627cb66d1..40731e16137e 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -664,7 +664,7 @@ void WW8AttributeOutput::StartStyles() sal_uLong nCurPos = m_rWW8Export.pTableStrm->Tell(); if ( nCurPos & 1 ) // Start auf gerader { - *m_rWW8Export.pTableStrm << (char)0; // Adress + m_rWW8Export.pTableStrm->WriteChar( (char)0 ); // Adress ++nCurPos; } rFib.fcStshfOrig = rFib.fcStshf = nCurPos; @@ -2324,7 +2324,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, for ( i = 0; i < aStrArr.size(); ++i ) { const OUString& sAuthor = aStrArr[i].first; - *rWrt.pTableStrm << (sal_uInt8)sAuthor.getLength(); + rWrt.pTableStrm->WriteUChar( (sal_uInt8)sAuthor.getLength() ); SwWW8Writer::WriteString8(*rWrt.pTableStrm, sAuthor, false, RTL_TEXTENCODING_MS_1252); } @@ -2521,7 +2521,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, } else { - *rWrt.pTableStrm << nInitialsLen; + rWrt.pTableStrm->WriteUChar( nInitialsLen ); SwWW8Writer::WriteString8(*rWrt.pTableStrm, sInitials, false, RTL_TEXTENCODING_MS_1252); SwWW8Writer::FillCount(*rWrt.pTableStrm, 9 - nInitialsLen); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 53c3b6123a0e..1c9574826746 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1292,7 +1292,7 @@ void WW8_WrPct::WritePc( WW8Export& rWrt ) boost::ptr_vector<WW8_WrPc>::iterator aIter; nPctStart = rWrt.pTableStrm->Tell(); // Start piece table - *rWrt.pTableStrm << ( char )0x02; // Status byte PCT + rWrt.pTableStrm->WriteChar( ( char )0x02 ); // Status byte PCT nOldPos = nPctStart + 1; // remember Position SwWW8Writer::WriteLong( *rWrt.pTableStrm, 0 ); // then the length @@ -1608,7 +1608,7 @@ void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings, { const OUString &rString = rStrings[n]; const OUString aNm(rString.copy(0, std::min<sal_Int32>(rString.getLength(), 255))); - rStrm << (sal_uInt8)aNm.getLength(); + rStrm.WriteUChar( (sal_uInt8)aNm.getLength() ); SwWW8Writer::WriteString8(rStrm, aNm, false, RTL_TEXTENCODING_MS_1252); if (nExtraLen) @@ -1814,9 +1814,9 @@ void WW8Export::WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo void WW8Export::WriteChar( sal_Unicode c ) { if( pPiece->IsUnicode() ) - Strm() << c; + Strm().WriteUInt16( c ); else - Strm() << (sal_uInt8)c; + Strm().WriteUChar( (sal_uInt8)c ); } void MSWordExportBase::SaveData( sal_uLong nStt, sal_uLong nEnd ) @@ -3203,7 +3203,7 @@ void WW8Export::ExportDocument_Impl() // EncryptionVersionInfo (4 bytes): A Version structure where Version.vMajor MUST be 0x0001, and Version.vMinor MUST be 0x0001. pTableStrmTemp->Seek( 0 ); sal_uInt32 nEncType = 0x10001; - *pTableStrmTemp << nEncType; + pTableStrmTemp->WriteUInt32( nEncType ); sal_uInt8 pDocId[16]; aCtx.GetDocId( pDocId ); @@ -3735,20 +3735,20 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) } } - *pDataStrm << slen; + pDataStrm->WriteUInt32( slen ); int len = sizeof( aFldData ); OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" ); pDataStrm->Write( aFldData, len ); - *pDataStrm << aFldHeader.version << aFldHeader.bits << aFldHeader.cch << aFldHeader.hps; + pDataStrm->WriteUInt32( aFldHeader.version ).WriteUInt16( aFldHeader.bits ).WriteUInt16( aFldHeader.cch ).WriteUInt16( aFldHeader.hps ); SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name if ( !type ) SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true ); if ( type ) - *pDataStrm << sal_uInt16(0); + pDataStrm->WriteUInt16( sal_uInt16(0) ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffformat ), true ); @@ -3757,9 +3757,9 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffentrymcr ), true ); SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffexitmcr ), true ); if (type==2) { - *pDataStrm<<(sal_uInt16)0xFFFF; + pDataStrm->WriteUInt16( (sal_uInt16)0xFFFF ); const int items=aListItems.size(); - *pDataStrm<<(sal_uInt32)items; + pDataStrm->WriteUInt32( (sal_uInt32)items ); for(int i=0;i<items;i++) { OUString item=aListItems[i]; SwWW8Writer::WriteString_xstz( *pDataStrm, item, false ); diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 92677df1b81d..e20674b9f302 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -706,7 +706,7 @@ void SwWW8WrGrf::WriteGrfFromGrfNode(SvStream& rStrm, const SwGrfNode &rGrfNd, WritePICFHeader(rStrm, rFly, mm, nWidth, nHeight, rGrfNd.GetpSwAttrSet()); - rStrm << (sal_uInt8)aFileN.getLength(); // write Pascal-String + rStrm.WriteUChar( (sal_uInt8)aFileN.getLength() ); // write Pascal-String SwWW8Writer::WriteString8(rStrm, aFileN, false, RTL_TEXTENCODING_MS_1252); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index f2029454a0fb..218a13d1d27f 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1116,7 +1116,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, SvMemoryStream aMemStream; struct HyperLinksTable hlStr; sal_uInt16 mnRawRecId,mnRawRecSize; - aMemStream << sal_uInt16( 0 ) << static_cast< sal_uInt16 >( nBufferSize ); + aMemStream.WriteUInt16( sal_uInt16( 0 ) ).WriteUInt16( static_cast< sal_uInt16 >( nBufferSize ) ); // copy from DFF stream to memory stream ::std::vector< sal_uInt8 > aBuffer( nBufferSize ); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 80ecc7dd97b8..99544d28ecd6 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -711,7 +711,7 @@ void SwDocShell::Execute(SfxRequest& rReq) OUString aCmd("SendOutlineToImpress"); uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); pStrm->Seek( STREAM_SEEK_TO_END ); - *pStrm << '\0'; + pStrm->WriteChar( '\0' ); pStrm->Seek( STREAM_SEEK_TO_BEGIN ); // Transfer ownership of stream to a lockbytes object @@ -768,7 +768,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( !ERRCODE_TOERROR( eErr ) ) { pStrm->Seek( STREAM_SEEK_TO_END ); - *pStrm << '\0'; + pStrm->WriteChar( '\0' ); pStrm->Seek( STREAM_SEEK_TO_BEGIN ); if ( nWhich == FN_OUTLINE_TO_IMPRESS ) { @@ -778,7 +778,7 @@ void SwDocShell::Execute(SfxRequest& rReq) OUString aCmd("SendOutlineToImpress"); uno::Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); pStrm->Seek( STREAM_SEEK_TO_END ); - *pStrm << '\0'; + pStrm->WriteChar( '\0' ); pStrm->Seek( STREAM_SEEK_TO_BEGIN ); // Transfer ownership of stream to a lockbytes object diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 843fa195cef7..8928fbfc2b75 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -744,7 +744,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream, SwWriter aWrt( *xStream, *pDoc ); if( !IsError( aWrt.Write( xWrt )) ) { - *xStream << '\0'; // terminate with a zero + xStream->WriteChar( '\0' ); // terminate with a zero xStream->Commit(); bRet = sal_True; } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 69934d59d27a..f0baf31e511a 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -240,7 +240,7 @@ void VCLXPrinterPropertySet::selectForm( const OUString& rFormDescription ) thro ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem; - aMem << sal_uInt32(BINARYSETUPMARKER); + aMem.WriteUInt32( sal_uInt32(BINARYSETUPMARKER) ); aMem << GetPrinter()->GetJobSetup(); return ::com::sun::star::uno::Sequence<sal_Int8>( (sal_Int8*) aMem.GetData(), aMem.Tell() ); } diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index d1ae8023ed18..1bce440ec8b8 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -225,7 +225,7 @@ SvStream& Color::Read( SvStream& rIStm, bool bNewFormat ) SvStream& Color::Write( SvStream& rOStm, bool bNewFormat ) { if ( bNewFormat ) - rOStm << mnColor; + rOStm.WriteUInt32( mnColor ); else rOStm << *this; @@ -312,10 +312,10 @@ SvStream& operator<<( SvStream& rOStream, const Color& rColor ) nGreen = (nGreen<<8) + nGreen; nBlue = (nBlue<<8) + nBlue; - rOStream << nColorName; - rOStream << nRed; - rOStream << nGreen; - rOStream << nBlue; + rOStream.WriteUInt16( nColorName ); + rOStream.WriteUInt16( nRed ); + rOStream.WriteUInt16( nGreen ); + rOStream.WriteUInt16( nBlue ); return rOStream; } diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index 6c13f05d87b8..3610065222bd 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -496,8 +496,8 @@ SvStream& operator >> ( SvStream& rIStream, Fraction& rFract ) SvStream& operator << ( SvStream& rOStream, const Fraction& rFract ) { //fdo#39428 SvStream no longer supports operator<<(long) - rOStream << sal::static_int_cast<sal_Int32>(rFract.nNumerator); - rOStream << sal::static_int_cast<sal_Int32>(rFract.nDenominator); + rOStream.WriteInt32( sal::static_int_cast<sal_Int32>(rFract.nNumerator) ); + rOStream.WriteInt32( sal::static_int_cast<sal_Int32>(rFract.nDenominator) ); return rOStream; } diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index b011a90e3578..a0c74b5c3713 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -39,7 +39,7 @@ SvStream& operator<<( SvStream& rOStream, const Pair& rPair ) DBG_ASSERTWARNING( rOStream.GetVersion(), "Pair::<< - Solar-Version not set on rOStream" ); //39428 SvStream no longer supports operator<<(long) - rOStream << sal::static_int_cast<sal_Int32>(rPair.nA) << sal::static_int_cast<sal_Int32>(rPair.nB); + rOStream.WriteInt32( sal::static_int_cast<sal_Int32>(rPair.nA) ).WriteInt32( sal::static_int_cast<sal_Int32>(rPair.nB) ); return rOStream; } @@ -191,10 +191,10 @@ SvStream& operator<<( SvStream& rOStream, const Rectangle& rRect ) DBG_ASSERTWARNING( rOStream.GetVersion(), "Rectangle::<< - Solar-Version not set on rOStream" ); //fdo#39428 SvStream no longer supports operator<<(long) - rOStream << sal::static_int_cast<sal_Int32>(rRect.nLeft) - << sal::static_int_cast<sal_Int32>(rRect.nTop) - << sal::static_int_cast<sal_Int32>(rRect.nRight) - << sal::static_int_cast<sal_Int32>(rRect.nBottom); + rOStream.WriteInt32( sal::static_int_cast<sal_Int32>(rRect.nLeft) ) + .WriteInt32( sal::static_int_cast<sal_Int32>(rRect.nTop) ) + .WriteInt32( sal::static_int_cast<sal_Int32>(rRect.nRight) ) + .WriteInt32( sal::static_int_cast<sal_Int32>(rRect.nBottom) ); return rOStream; } diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 60e4a145377b..580ab8940e57 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1604,7 +1604,7 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly ) sal_uInt16 nPoints = rPoly.GetSize(); // Write number of points - rOStream << nPoints; + rOStream.WriteUInt16( nPoints ); { // Determine whether we need to write through operators @@ -1621,8 +1621,8 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly ) for( i = 0; i < nPoints; i++ ) { //fdo#39428 SvStream no longer supports operator<<(long) - rOStream << sal::static_int_cast<sal_Int32>( rPoly.mpImplPolygon->mpPointAry[i].X() ) - << sal::static_int_cast<sal_Int32>( rPoly.mpImplPolygon->mpPointAry[i].Y() ); + rOStream.WriteInt32( sal::static_int_cast<sal_Int32>( rPoly.mpImplPolygon->mpPointAry[i].X() ) ) + .WriteInt32( sal::static_int_cast<sal_Int32>( rPoly.mpImplPolygon->mpPointAry[i].Y() ) ); } } else @@ -1659,8 +1659,8 @@ void Polygon::Read( SvStream& rIStream ) void Polygon::ImplWrite( SvStream& rOStream ) const { sal_uInt8 bHasPolyFlags = mpImplPolygon->mpFlagAry != NULL; - rOStream << *this - << bHasPolyFlags; + rOStream << *this; + rOStream.WriteUChar( bHasPolyFlags ); if ( bHasPolyFlags ) rOStream.Write( mpImplPolygon->mpFlagAry, mpImplPolygon->mnPoints ); diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 4fa9a839f0ae..7b92501a6cb5 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -630,7 +630,7 @@ SvStream& operator<<( SvStream& rOStream, const PolyPolygon& rPolyPoly ) // Write number of polygons sal_uInt16 nPolyCount = rPolyPoly.mpImplPolyPolygon->mnCount; - rOStream << nPolyCount; + rOStream.WriteUInt16( nPolyCount ); // output polygons for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) @@ -681,7 +681,7 @@ void PolyPolygon::Write( SvStream& rOStream ) const // Write number of polygons sal_uInt16 nPolyCount = mpImplPolyPolygon->mnCount; - rOStream << nPolyCount; + rOStream.WriteUInt16( nPolyCount ); // Output polygons for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 5855cd2958f2..3cd6300ddfbf 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -102,11 +102,11 @@ sal_uIntPtr INetMessage::SetHeaderField ( SvStream& INetMessage::operator<< (SvStream& rStrm) const { - rStrm << static_cast<sal_uInt32>(m_nDocSize); + rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nDocSize) ); 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); + rStrm.WriteUInt32( static_cast<sal_uInt32>(n) ); for (i = 0; i < n; i++) rStrm << *( m_aHeaderList[ i ] ); @@ -611,7 +611,7 @@ SvStream& INetRFC822Message::operator<< (SvStream& rStrm) const INetMessage::operator<< (rStrm); for (sal_uInt16 i = 0; i < INETMSG_RFC822_NUMHDR; i++) - rStrm << static_cast<sal_uInt32>(m_nIndex[i]); + rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nIndex[i]) ); return rStrm; } @@ -1016,10 +1016,10 @@ SvStream& INetMIMEMessage::operator<< (SvStream& rStrm) const INetRFC822Message::operator<< (rStrm); for (sal_uInt16 i = 0; i < INETMSG_MIME_NUMHDR; i++) - rStrm << static_cast<sal_uInt32>(m_nIndex[i]); + rStrm.WriteUInt32( static_cast<sal_uInt32>(m_nIndex[i]) ); write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rStrm, m_aBoundary); - rStrm << static_cast<sal_uInt32>(aChildren.size()); + rStrm.WriteUInt32( static_cast<sal_uInt32>(aChildren.size()) ); return rStrm; } diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index ec412bd01a4d..584d43da6eaa 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -234,10 +234,10 @@ int INetMessageIStream::GetMsgLine(sal_Char* pData, sal_uIntPtr nSize) if (aHeader.GetValue().getLength()) { // NYI: Folding long lines. - *pMsgBuffer << aHeader.GetName().getStr(); - *pMsgBuffer << ": "; - *pMsgBuffer << aHeader.GetValue().getStr(); - *pMsgBuffer << "\r\n"; + pMsgBuffer->WriteCharPtr( aHeader.GetName().getStr() ); + pMsgBuffer->WriteCharPtr( ": " ); + pMsgBuffer->WriteCharPtr( aHeader.GetValue().getStr() ); + pMsgBuffer->WriteCharPtr( "\r\n" ); } } @@ -323,7 +323,7 @@ int INetMessageOStream::PutData(const sal_Char* pData, sal_uIntPtr nSize) // Emit any buffered last header field. if (pMsgBuffer->Tell() > 0) { - *pMsgBuffer << '\0'; + pMsgBuffer->WriteChar( '\0' ); int status = PutMsgLine( (const sal_Char*) pMsgBuffer->GetData(), pMsgBuffer->Tell()); if (status != INETSTREAM_STATUS_OK) return status; @@ -339,7 +339,7 @@ int INetMessageOStream::PutData(const sal_Char* pData, sal_uIntPtr nSize) else if ((*pData == ' ') || (*pData == '\t')) { // Continuation line. Unfold multi-line field-body. - *pMsgBuffer << ' '; + pMsgBuffer->WriteChar( ' ' ); pData++; } else @@ -348,7 +348,7 @@ int INetMessageOStream::PutData(const sal_Char* pData, sal_uIntPtr nSize) if (pMsgBuffer->Tell() > 0) { // Emit buffered header field now. - *pMsgBuffer << '\0'; + pMsgBuffer->WriteChar( '\0' ); int status = PutMsgLine((const sal_Char*) pMsgBuffer->GetData(), pMsgBuffer->Tell()); if (status != INETSTREAM_STATUS_OK) return status; @@ -358,7 +358,7 @@ int INetMessageOStream::PutData(const sal_Char* pData, sal_uIntPtr nSize) pMsgBuffer->Seek(STREAM_SEEK_TO_BEGIN); // Insert current character into buffer. - *pMsgBuffer << *pData++; + pMsgBuffer->WriteChar( *pData++ ); } // Search for next line break character. @@ -381,7 +381,7 @@ int INetMessageOStream::PutData(const sal_Char* pData, sal_uIntPtr nSize) { // Any <LWS> is folded into a single <SP> character. sal_Char c = *((const sal_Char*) pMsgBuffer->GetData() + pMsgBuffer->Tell() - 1); - if (!ascii_isWhitespace(c & 0x7f)) *pMsgBuffer << ' '; + if (!ascii_isWhitespace(c & 0x7f)) pMsgBuffer->WriteChar( ' ' ); // Skip over this <LWS> character. pData++; @@ -389,7 +389,7 @@ int INetMessageOStream::PutData(const sal_Char* pData, sal_uIntPtr nSize) else { // Any other character is inserted into line buffer. - *pMsgBuffer << *pData++; + pMsgBuffer->WriteChar( *pData++ ); } } @@ -714,9 +714,9 @@ int INetMessageDecodeQPStream_Impl::PutMsgLine( const sal_Char* pData, else { // Decode token. - *pMsgBuffer << sal_uInt8 ( + pMsgBuffer->WriteUChar( sal_uInt8 ( (pr2hex[(int)(pTokBuffer[0] & 0x7f)] << 4) | - (pr2hex[(int)(pTokBuffer[1] & 0x7f)] & 15) ); + (pr2hex[(int)(pTokBuffer[1] & 0x7f)] & 15) ) ); // Search for next <CR>. eState = INETMSG_EOL_SCR; @@ -734,17 +734,17 @@ int INetMessageDecodeQPStream_Impl::PutMsgLine( const sal_Char* pData, } else if (eState == INETMSG_EOL_FCR) { - *pMsgBuffer << *pData++; + pMsgBuffer->WriteChar( *pData++ ); eState = INETMSG_EOL_BEGIN; } else if (*pData == '\r') { - *pMsgBuffer << *pData++; + pMsgBuffer->WriteChar( *pData++ ); eState = INETMSG_EOL_FCR; } else { - *pMsgBuffer << *pData++; + pMsgBuffer->WriteChar( *pData++ ); } if (eState == INETMSG_EOL_BEGIN) diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx index d6ce83115b90..7eb2022d1599 100644 --- a/tools/source/ref/globname.cxx +++ b/tools/source/ref/globname.cxx @@ -124,14 +124,14 @@ SvStream& operator << ( SvStream& rOStr, const SvGlobalName & rObj ) { sal_uInt32 a; memcpy(&a, rObj.pImp->szData, sizeof(sal_uInt32)); - rOStr << a; + rOStr.WriteUInt32( a ); sal_uInt16 b; memcpy(&b, rObj.pImp->szData+4, sizeof(sal_uInt16)); - rOStr << b; + rOStr.WriteUInt16( b ); memcpy(&b, rObj.pImp->szData+6, sizeof(sal_uInt16)); - rOStr << b; + rOStr.WriteUInt16( b ); rOStr.Write( (sal_Char *)&rObj.pImp->szData[ 8 ], 8 ); return rOStr; diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index fae8e124d80f..e84f9fd47f86 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -50,7 +50,7 @@ TYPEINIT0( SvRttiBase ); void TOOLS_DLLPUBLIC WritePersistListObjects(const SvPersistListWriteable& rList, SvPersistStream & rStm, bool bOnlyStreamed ) { #ifdef STOR_NO_OPTIMIZE - rStm << (sal_uInt8)(PERSIST_LIST_VER | PERSIST_LIST_DBGUTIL); + rStm.WriteUChar( (sal_uInt8)(PERSIST_LIST_VER | PERSIST_LIST_DBGUTIL) ); sal_uInt32 nObjPos = rStm.WriteDummyLen(); #else sal_uInt8 bTmp = PERSIST_LIST_VER; @@ -59,7 +59,7 @@ void TOOLS_DLLPUBLIC WritePersistListObjects(const SvPersistListWriteable& rList sal_uInt32 nCountMember = rList.size(); sal_uIntPtr nCountPos = rStm.Tell(); sal_uInt32 nWriteCount = 0; - rStm << nCountMember; + rStm.WriteUInt32( nCountMember ); // Don't change the list, as it causes side-effects while saving for( sal_uIntPtr n = 0; n < nCountMember; n++ ) { @@ -75,7 +75,7 @@ void TOOLS_DLLPUBLIC WritePersistListObjects(const SvPersistListWriteable& rList // Didn't write all members, adjust count sal_uIntPtr nPos = rStm.Tell(); rStm.Seek( nCountPos ); - rStm << nWriteCount; + rStm.WriteUInt32( nWriteCount ); rStm.Seek( nPos ); } #ifdef STOR_NO_OPTIMIZE @@ -324,25 +324,25 @@ void SvPersistStream::WriteCompressed( SvStream & rStm, sal_uInt32 nVal ) { #ifdef STOR_NO_OPTIMIZE if( nVal < 0x80 ) - rStm << (sal_uInt8)(LEN_1 | nVal); + rStm.WriteUChar( (sal_uInt8)(LEN_1 | nVal) ); else if( nVal < 0x4000 ) { - rStm << (sal_uInt8)(LEN_2 | (nVal >> 8)); - rStm << (sal_uInt8)nVal; + rStm.WriteUChar( (sal_uInt8)(LEN_2 | (nVal >> 8)) ); + rStm.WriteUChar( (sal_uInt8)nVal ); } else if( nVal < 0x20000000 ) { // highest sal_uInt8 - rStm << (sal_uInt8)(LEN_4 | (nVal >> 24)); + rStm.WriteUChar( (sal_uInt8)(LEN_4 | (nVal >> 24)) ); // 2nd highest sal_uInt8 - rStm << (sal_uInt8)(nVal >> 16); - rStm << (sal_uInt16)(nVal); + rStm.WriteUChar( (sal_uInt8)(nVal >> 16) ); + rStm.WriteUInt16( (sal_uInt16)(nVal) ); } else #endif { - rStm << (sal_uInt8)LEN_5; - rStm << nVal; + rStm.WriteUChar( (sal_uInt8)LEN_5 ); + rStm.WriteUInt32( nVal ); } } @@ -369,7 +369,7 @@ sal_uInt32 SvPersistStream::WriteDummyLen() sal_uInt32 nPos = Tell(); #endif sal_uInt32 n0 = 0; - *this << n0; // Because of Sun sp + WriteUInt32( n0 ); // Because of Sun sp // Don't assert on stream error DBG_ASSERT( GetError() != SVSTREAM_OK || (sizeof( sal_uInt32 ) == Tell() -nPos), @@ -404,7 +404,7 @@ void SvPersistStream::WriteLen( sal_uInt32 nObjPos ) // Length in stream must be 4 Bytes Seek( nObjPos - sizeof( sal_uInt32 ) ); // write length - *this << nLen; + WriteUInt32( nLen ); Seek( nPos ); } @@ -457,17 +457,17 @@ static void WriteId { if( (nHdr & P_OBJ) || nId != 0 ) { // Id set only for pointers or DBGUTIL - rStm << (sal_uInt8)(nHdr); + rStm.WriteUChar( (sal_uInt8)(nHdr) ); SvPersistStream::WriteCompressed( rStm, nId ); } else { // NULL Pointer - rStm << (sal_uInt8)(nHdr | P_ID_0); + rStm.WriteUChar( (sal_uInt8)(nHdr | P_ID_0) ); return; } } else - rStm << nHdr; + rStm.WriteUChar( nHdr ); if( (nHdr & P_DBGUTIL) || (nHdr & P_OBJ) ) // Objects always have a class id @@ -670,9 +670,9 @@ SvStream& operator << rThis.SetStream( &rStm ); sal_uInt8 bTmp = 0; - rThis << bTmp; // Version + rThis.WriteUChar( bTmp ); // Version sal_uInt32 nCount = (sal_uInt32)rThis.aPUIdx.Count(); - rThis << nCount; + rThis.WriteUInt32( nCount ); sal_uIntPtr aIndex = rThis.aPUIdx.FirstIndex(); for( sal_uInt32 i = 0; i < nCount; i++ ) { diff --git a/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx index b81f95636a24..63575a951aa0 100644 --- a/tools/source/stream/vcompat.cxx +++ b/tools/source/stream/vcompat.cxx @@ -31,7 +31,7 @@ VersionCompat::VersionCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 { if( STREAM_WRITE == mnStmMode ) { - *mpRWStm << mnVersion; + mpRWStm->WriteUInt16( mnVersion ); mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4UL; mpRWStm->SeekRel( 4L ); } @@ -51,7 +51,7 @@ VersionCompat::~VersionCompat() const sal_uInt32 nEndPos = mpRWStm->Tell(); mpRWStm->Seek( mnCompatPos ); - *mpRWStm << ( nEndPos - mnTotalSize ); + mpRWStm->WriteUInt32( nEndPos - mnTotalSize ); mpRWStm->Seek( nEndPos ); } else diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index d71bdd891f2a..b3684b199f5d 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -157,7 +157,7 @@ void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType ) { ImplBeginRecord( WIN_EMR_GDICOMMENT ); m_rStm.SeekRel( 4 ); - m_rStm<< (sal_Int32) nCommentType; + m_rStm.WriteInt32( (sal_Int32) nCommentType ); } void EMFWriter::ImplEndCommentRecord() @@ -166,7 +166,7 @@ void EMFWriter::ImplEndCommentRecord() { sal_Int32 nActPos = m_rStm.Tell(); m_rStm.Seek( mnRecordPos + 8 ); - m_rStm << (sal_uInt32)( nActPos - mnRecordPos - 0xc ); + m_rStm.WriteUInt32( (sal_uInt32)( nActPos - mnRecordPos - 0xc ) ); m_rStm.Seek( nActPos ); } ImplEndRecord(); @@ -181,7 +181,7 @@ void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags ) mbRecordPlusOpen = sal_True; mnRecordPlusPos = m_rStm.Tell(); - m_rStm << (sal_uInt16) nType << (sal_uInt16) nFlags; + m_rStm.WriteUInt16( (sal_uInt16) nType ).WriteUInt16( (sal_uInt16) nFlags ); m_rStm.SeekRel( 8 ); } } @@ -195,8 +195,8 @@ void EMFWriter::ImplEndPlusRecord() sal_Int32 nActPos = m_rStm.Tell(); sal_Int32 nSize = nActPos - mnRecordPlusPos; m_rStm.Seek( mnRecordPlusPos + 4 ); - m_rStm << (sal_uInt32)( nSize ) // Size - << (sal_uInt32) ( nSize - 0xc ); // Data Size + m_rStm.WriteUInt32( (sal_uInt32)( nSize ) ) // Size + .WriteUInt32( (sal_uInt32) ( nSize - 0xc ) ); // Data Size m_rStm.Seek( nActPos ); mbRecordPlusOpen = sal_False; } @@ -222,14 +222,14 @@ void EMFWriter::WriteEMFPlusHeader( const Size &rMtfSizePix, const Size &rMtfSiz if (nDivY) nDPIY /= nDivY; // DPI Y - m_rStm<< (sal_Int16) EmfPlusHeader; - m_rStm<< (sal_Int16) 0x01 // Flags - Dual Mode // TODO: Check this - << (sal_Int32) 0x1C // Size - << (sal_Int32) 0x10 // Data Size - << (sal_Int32) 0xdbc01002 // (lower 12bits) 1-> v1 2-> v1.1 // TODO: Check this - << (sal_Int32) 0x01 // Video display - << nDPIX - << nDPIY; + m_rStm.WriteInt16( (sal_Int16) EmfPlusHeader ); + m_rStm.WriteInt16( (sal_Int16) 0x01 ) // Flags - Dual Mode // TODO: Check this + .WriteInt32( (sal_Int32) 0x1C ) // Size + .WriteInt32( (sal_Int32) 0x10 ) // Data Size + .WriteInt32( (sal_Int32) 0xdbc01002 ) // (lower 12bits) 1-> v1 2-> v1.1 // TODO: Check this + .WriteInt32( (sal_Int32) 0x01 ) // Video display + .WriteInt32( nDPIX ) + .WriteInt32( nDPIY ); ImplEndCommentRecord(); // Write more properties @@ -258,14 +258,14 @@ void EMFWriter::ImplWritePlusColor( const Color& rColor, const sal_uInt32& nTran nCol |= ( (sal_uInt32) rColor.GetGreen() ) << 8; nCol |= ( (sal_uInt32) rColor.GetRed() ) << 16; nCol |= ( nAlpha << 24 ); - m_rStm << nCol; + m_rStm.WriteUInt32( nCol ); } void EMFWriter::ImplWritePlusPoint( const Point& rPoint ) { // Convert to pixels const Point aPoint(maVDev.LogicToPixel( rPoint, maDestMapMode )); - m_rStm << (sal_uInt16) aPoint.X() << (sal_uInt16) aPoint.Y(); + m_rStm.WriteUInt16( (sal_uInt16) aPoint.X() ).WriteUInt16( (sal_uInt16) aPoint.Y() ); } void EMFWriter::ImplWritePlusFillPolygonRecord( const Polygon& rPoly, const sal_uInt32& nTrans ) @@ -275,7 +275,7 @@ void EMFWriter::ImplWritePlusFillPolygonRecord( const Polygon& rPoly, const sal_ { ImplBeginPlusRecord( EmfPlusFillPolygon, 0xC000 ); // Sets the color as well ImplWritePlusColor( maVDev.GetFillColor(), nTrans ); - m_rStm << (sal_uInt32) rPoly.GetSize(); + m_rStm.WriteUInt32( (sal_uInt32) rPoly.GetSize() ); for( sal_uInt16 i = 0; i < rPoly.GetSize(); i++ ) ImplWritePlusPoint( rPoly[ i ] ); ImplEndPlusRecord(); @@ -314,29 +314,29 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilter // set 100th mm map mode in EMF ImplBeginRecord( WIN_EMR_SETMAPMODE ); - m_rStm << (sal_Int32) MM_ANISOTROPIC; + m_rStm.WriteInt32( (sal_Int32) MM_ANISOTROPIC ); ImplEndRecord(); ImplBeginRecord( WIN_EMR_SETVIEWPORTEXTEX ); - m_rStm << (sal_Int32) maVDev.ImplGetDPIX() << (sal_Int32) maVDev.ImplGetDPIY(); + m_rStm.WriteInt32( (sal_Int32) maVDev.ImplGetDPIX() ).WriteInt32( (sal_Int32) maVDev.ImplGetDPIY() ); ImplEndRecord(); ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX ); - m_rStm << (sal_Int32) 2540 << (sal_Int32) 2540; + m_rStm.WriteInt32( (sal_Int32) 2540 ).WriteInt32( (sal_Int32) 2540 ); ImplEndRecord(); ImplBeginRecord( WIN_EMR_SETVIEWPORTORGEX ); - m_rStm << (sal_Int32) 0 << (sal_Int32) 0; + m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ); ImplEndRecord(); ImplBeginRecord( WIN_EMR_SETWINDOWORGEX ); - m_rStm << (sal_Int32) 0 << (sal_Int32) 0; + m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ); ImplEndRecord(); ImplWriteRasterOp( ROP_OVERPAINT ); ImplBeginRecord( WIN_EMR_SETBKMODE ); - m_rStm << (sal_uInt32) 1; // TRANSPARENT + m_rStm.WriteUInt32( (sal_uInt32) 1 ); // TRANSPARENT ImplEndRecord(); // write emf data @@ -345,24 +345,24 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilter ImplWritePlusEOF(); ImplBeginRecord( WIN_EMR_EOF ); - m_rStm<< (sal_uInt32)0 // nPalEntries - << (sal_uInt32)0x10 // offPalEntries - << (sal_uInt32)0x14; // nSizeLast + m_rStm.WriteUInt32( (sal_uInt32)0 ) // nPalEntries + .WriteUInt32( (sal_uInt32)0x10 ) // offPalEntries + .WriteUInt32( (sal_uInt32)0x14 ); // nSizeLast ImplEndRecord(); // write header const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos ); - m_rStm << (sal_uInt32) 0x00000001 << (sal_uInt32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object - << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) ( aMtfSizePix.Width() - 1 ) << (sal_Int32) ( aMtfSizePix.Height() - 1 ) - << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) ( aMtfSizeLog.Width() - 1 ) << (sal_Int32) ( aMtfSizeLog.Height() - 1 ) - << (sal_uInt32) 0x464d4520 << (sal_uInt32) 0x10000 << (sal_uInt32) ( nEndPos - nHeaderPos ) - << (sal_uInt32) mnRecordCount << (sal_uInt16) ( mnHandleCount + 1 ) << (sal_uInt16) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 - << (sal_Int32) aMtfSizePix.Width() << (sal_Int32) aMtfSizePix.Height() - << (sal_Int32) ( aMtfSizeLog.Width() / 100 ) << (sal_Int32) ( aMtfSizeLog.Height() / 100 ) - << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 - << (sal_Int32) ( aMtfSizeLog.Width() * 10 ) << (sal_Int32) ( aMtfSizeLog.Height() * 10 ); //use [MS-EMF 2.2.11] HeaderExtension2 Object + m_rStm.WriteUInt32( (sal_uInt32) 0x00000001 ).WriteUInt32( (sal_uInt32) 108 ) //use [MS-EMF 2.2.11] HeaderExtension2 Object + .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizePix.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizePix.Height() - 1 ) ) + .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() - 1 ) ) + .WriteUInt32( (sal_uInt32) 0x464d4520 ).WriteUInt32( (sal_uInt32) 0x10000 ).WriteUInt32( (sal_uInt32) ( nEndPos - nHeaderPos ) ) + .WriteUInt32( (sal_uInt32) mnRecordCount ).WriteUInt16( (sal_uInt16) ( mnHandleCount + 1 ) ).WriteUInt16( (sal_uInt16) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) + .WriteInt32( (sal_Int32) aMtfSizePix.Width() ).WriteInt32( (sal_Int32) aMtfSizePix.Height() ) + .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() / 100 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() / 100 ) ) + .WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) + .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() * 10 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() * 10 ) ); //use [MS-EMF 2.2.11] HeaderExtension2 Object m_rStm.Seek( nEndPos ); delete[] mpHandlesUsed; @@ -404,7 +404,7 @@ void EMFWriter::ImplBeginRecord( sal_uInt32 nType ) mbRecordOpen = sal_True; mnRecordPos = m_rStm.Tell(); - m_rStm << nType; + m_rStm.WriteUInt32( nType ); m_rStm.SeekRel( 4 ); } } @@ -421,10 +421,10 @@ void EMFWriter::ImplEndRecord() nFillBytes += 3; // each record has to be dword aligned nFillBytes ^= 3; nFillBytes &= 3; - m_rStm << (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes ); + m_rStm.WriteUInt32( (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes ) ); m_rStm.Seek( nActPos ); while( nFillBytes-- ) - m_rStm << (sal_uInt8)0; + m_rStm.WriteUChar( (sal_uInt8)0 ); mnRecordCount++; mbRecordOpen = sal_False; } @@ -445,12 +445,12 @@ sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSel // select stock object first ImplBeginRecord( WIN_EMR_SELECTOBJECT ); - m_rStm << nStockObject; + m_rStm.WriteUInt32( nStockObject ); ImplEndRecord(); // destroy handle of created object ImplBeginRecord( WIN_EMR_DELETEOBJECT ); - m_rStm << rHandle; + m_rStm.WriteUInt32( rHandle ); ImplEndRecord(); // mark handle as free @@ -470,12 +470,12 @@ void EMFWriter::ImplCheckLineAttr() sal_uInt32 nWidth = 0, nHeight = 0; ImplBeginRecord( WIN_EMR_CREATEPEN ); - m_rStm << mnLineHandle << nStyle << nWidth << nHeight; + m_rStm.WriteUInt32( mnLineHandle ).WriteUInt32( nStyle ).WriteUInt32( nWidth ).WriteUInt32( nHeight ); ImplWriteColor( maVDev.GetLineColor() ); ImplEndRecord(); ImplBeginRecord( WIN_EMR_SELECTOBJECT ); - m_rStm << mnLineHandle; + m_rStm.WriteUInt32( mnLineHandle ); ImplEndRecord(); } } @@ -488,13 +488,13 @@ void EMFWriter::ImplCheckFillAttr() sal_uInt32 nPatternStyle = 0; ImplBeginRecord( WIN_EMR_CREATEBRUSHINDIRECT ); - m_rStm << mnFillHandle << nStyle; + m_rStm.WriteUInt32( mnFillHandle ).WriteUInt32( nStyle ); ImplWriteColor( maVDev.GetFillColor() ); - m_rStm << nPatternStyle; + m_rStm.WriteUInt32( nPatternStyle ); ImplEndRecord(); ImplBeginRecord( WIN_EMR_SELECTOBJECT ); - m_rStm << mnFillHandle; + m_rStm.WriteUInt32( mnFillHandle ); ImplEndRecord(); } } @@ -510,10 +510,10 @@ void EMFWriter::ImplCheckTextAttr() sal_uInt8 nPitchAndFamily; ImplBeginRecord( WIN_EMR_EXTCREATEFONTINDIRECTW ); - m_rStm << mnTextHandle; + m_rStm.WriteUInt32( mnTextHandle ); ImplWriteExtent( -rFont.GetSize().Height() ); ImplWriteExtent( rFont.GetSize().Width() ); - m_rStm << (sal_Int32) rFont.GetOrientation() << (sal_Int32) rFont.GetOrientation(); + m_rStm.WriteInt32( (sal_Int32) rFont.GetOrientation() ).WriteInt32( (sal_Int32) rFont.GetOrientation() ); switch( rFont.GetWeight() ) { @@ -530,12 +530,12 @@ void EMFWriter::ImplCheckTextAttr() default: nWeight = 0; break; } - m_rStm << nWeight; - m_rStm << (sal_uInt8) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 ); - m_rStm << (sal_uInt8) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 ); - m_rStm << (sal_uInt8) ( ( STRIKEOUT_NONE == rFont.GetStrikeout() ) ? 0 : 1 ); - m_rStm << (sal_uInt8) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 ); - m_rStm << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0; + m_rStm.WriteInt32( nWeight ); + m_rStm.WriteUChar( (sal_uInt8) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 ) ); + m_rStm.WriteUChar( (sal_uInt8) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 ) ); + m_rStm.WriteUChar( (sal_uInt8) ( ( STRIKEOUT_NONE == rFont.GetStrikeout() ) ? 0 : 1 ) ); + m_rStm.WriteUChar( (sal_uInt8) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 ) ); + m_rStm.WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ); switch( rFont.GetPitch() ) { @@ -554,33 +554,33 @@ void EMFWriter::ImplCheckTextAttr() default: break; } - m_rStm << nPitchAndFamily; + m_rStm.WriteUChar( nPitchAndFamily ); for( i = 0; i < 32; i++ ) - m_rStm << (sal_Unicode) ( ( i < aFontName.getLength() ) ? aFontName[ i ] : 0 ); + m_rStm.WriteUInt16( (sal_Unicode) ( ( i < aFontName.getLength() ) ? aFontName[ i ] : 0 ) ); // dummy elfFullName for( i = 0; i < 64; i++ ) - m_rStm << (sal_Unicode) 0; + m_rStm.WriteUInt16( (sal_Unicode) 0 ); // dummy elfStyle for( i = 0; i < 32; i++ ) - m_rStm << (sal_Unicode) 0; + m_rStm.WriteUInt16( (sal_Unicode) 0 ); // dummy elfVersion, elfStyleSize, elfMatch, elfReserved - m_rStm << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 ; + m_rStm.WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) ; // dummy elfVendorId - m_rStm << (sal_uInt32) 0; + m_rStm.WriteUInt32( (sal_uInt32) 0 ); // dummy elfCulture - m_rStm << (sal_uInt32) 0; + m_rStm.WriteUInt32( (sal_uInt32) 0 ); // dummy elfPanose - m_rStm << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0; + m_rStm.WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ); // fill record to get a record size divideable by 4 - m_rStm << (sal_uInt16) 0; + m_rStm.WriteUInt16( (sal_uInt16) 0 ); ImplEndRecord(); @@ -596,7 +596,7 @@ void EMFWriter::ImplCheckTextAttr() nTextAlign |= mnHorTextAlign; ImplBeginRecord( WIN_EMR_SETTEXTALIGN ); - m_rStm << nTextAlign; + m_rStm.WriteUInt32( nTextAlign ); ImplEndRecord(); // Text color @@ -605,7 +605,7 @@ void EMFWriter::ImplCheckTextAttr() ImplEndRecord(); ImplBeginRecord( WIN_EMR_SELECTOBJECT ); - m_rStm << mnTextHandle; + m_rStm.WriteUInt32( mnTextHandle ); ImplEndRecord(); } } @@ -617,7 +617,7 @@ void EMFWriter::ImplWriteColor( const Color& rColor ) nCol |= ( (sal_uInt32) rColor.GetGreen() ) << 8; nCol |= ( (sal_uInt32) rColor.GetBlue() ) << 16; - m_rStm << nCol; + m_rStm.WriteUInt32( nCol ); } void EMFWriter::ImplWriteRasterOp( RasterOp eRop ) @@ -632,36 +632,36 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop ) } ImplBeginRecord( WIN_EMR_SETROP2 ); - m_rStm << nROP2; + m_rStm.WriteUInt32( nROP2 ); ImplEndRecord(); } void EMFWriter::ImplWriteExtent( long nExtent ) { nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width(); - m_rStm << (sal_Int32) nExtent; + m_rStm.WriteInt32( (sal_Int32) nExtent ); } void EMFWriter::ImplWritePoint( const Point& rPoint ) { const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode )); - m_rStm << (sal_Int32) aPoint.X() << (sal_Int32) aPoint.Y(); + m_rStm.WriteInt32( (sal_Int32) aPoint.X() ).WriteInt32( (sal_Int32) aPoint.Y() ); } void EMFWriter::ImplWriteSize( const Size& rSize) { const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode )); - m_rStm << (sal_Int32) aSize.Width() << (sal_Int32) aSize.Height(); + m_rStm.WriteInt32( (sal_Int32) aSize.Width() ).WriteInt32( (sal_Int32) aSize.Height() ); } void EMFWriter::ImplWriteRect( const Rectangle& rRect ) { const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode )); m_rStm - << static_cast<sal_Int32>(aRect.Left()) - << static_cast<sal_Int32>(aRect.Top()) - << static_cast<sal_Int32>(aRect.Right()) - << static_cast<sal_Int32>(aRect.Bottom()); + .WriteInt32( static_cast<sal_Int32>(aRect.Left()) ) + .WriteInt32( static_cast<sal_Int32>(aRect.Top()) ) + .WriteInt32( static_cast<sal_Int32>(aRect.Right()) ) + .WriteInt32( static_cast<sal_Int32>(aRect.Bottom()) ); } void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose ) @@ -679,7 +679,7 @@ void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose ) ImplBeginRecord( bClose ? WIN_EMR_POLYGON : WIN_EMR_POLYLINE ); ImplWriteRect( rPoly.GetBoundRect() ); - m_rStm << (sal_uInt32) rPoly.GetSize(); + m_rStm.WriteUInt32( (sal_uInt32) rPoly.GetSize() ); for( sal_uInt16 i = 0; i < rPoly.GetSize(); i++ ) ImplWritePoint( rPoly[ i ] ); @@ -719,10 +719,10 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) ImplBeginRecord( WIN_EMR_POLYPOLYGON ); ImplWriteRect( rPolyPoly.GetBoundRect() ); - m_rStm << (sal_uInt32)nPolyCount << nTotalPoints; + m_rStm.WriteUInt32( (sal_uInt32)nPolyCount ).WriteUInt32( nTotalPoints ); for( i = 0; i < nPolyCount; i++ ) - m_rStm << (sal_uInt32)rPolyPoly[ i ].GetSize(); + m_rStm.WriteUInt32( (sal_uInt32)rPolyPoly[ i ].GetSize() ); for( i = 0; i < nPolyCount; i++ ) { @@ -776,7 +776,7 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) for ( o = 0; o < nBezPoints; o++ ) aNewPoly[ o + 1 ] = rPoly[ n + o ]; ImplWriteRect( aNewPoly.GetBoundRect() ); - m_rStm << (sal_uInt32)nBezPoints; + m_rStm.WriteUInt32( (sal_uInt32)nBezPoints ); for( o = 1; o < aNewPoly.GetSize(); o++ ) ImplWritePoint( aNewPoly[ o ] ); ImplEndRecord(); @@ -796,7 +796,7 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) for ( o = 1; o <= nPoints; o++ ) aNewPoly[ o ] = rPoly[ n - 1 + o ]; ImplWriteRect( aNewPoly.GetBoundRect() ); - m_rStm << (sal_uInt32)( nPoints ); + m_rStm.WriteUInt32( (sal_uInt32)( nPoints ) ); for( o = 1; o < aNewPoly.GetSize(); o++ ) ImplWritePoint( aNewPoly[ o ] ); ImplEndRecord(); @@ -834,13 +834,13 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, ImplBeginRecord( WIN_EMR_STRETCHDIBITS ); ImplWriteRect( Rectangle( rPt, rSz ) ); ImplWritePoint( rPt ); - m_rStm << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) aBmpSizePixel.Width() << (sal_Int32) aBmpSizePixel.Height(); + m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) aBmpSizePixel.Width() ).WriteInt32( (sal_Int32) aBmpSizePixel.Height() ); // write offset positions and sizes later const sal_uLong nOffPos = m_rStm.Tell(); m_rStm.SeekRel( 16 ); - m_rStm << (sal_uInt32) 0 << sal_Int32( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP ); + m_rStm.WriteUInt32( (sal_uInt32) 0 ).WriteInt32( sal_Int32( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP ) ); ImplWriteSize( rSz ); WriteDIB(rBmp, aMemStm, true, false); @@ -863,8 +863,8 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nOffPos ); - m_rStm << (sal_uInt32) 80 << (sal_uInt32)( nHeaderSize + ( nPalCount << 2 ) ); - m_rStm << (sal_uInt32)( 80 + ( nHeaderSize + ( nPalCount << 2 ) ) ) << nImageSize; + m_rStm.WriteUInt32( (sal_uInt32) 80 ).WriteUInt32( (sal_uInt32)( nHeaderSize + ( nPalCount << 2 ) ) ); + m_rStm.WriteUInt32( (sal_uInt32)( 80 + ( nHeaderSize + ( nPalCount << 2 ) ) ) ).WriteUInt32( nImageSize ); m_rStm.Seek( nEndPos ); ImplEndRecord(); @@ -912,20 +912,20 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const OUString rText, co ImplBeginRecord( WIN_EMR_EXTTEXTOUTW ); ImplWriteRect( Rectangle( rPos, Size( nNormWidth, maVDev.GetTextHeight() ) ) ); - m_rStm << (sal_uInt32)1; - m_rStm << (sal_Int32) 0 << (sal_Int32) 0; + m_rStm.WriteUInt32( (sal_uInt32)1 ); + m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ); ImplWritePoint( rPos ); - m_rStm << (sal_uInt32) nLen << (sal_uInt32) 76 << (sal_uInt32) 2; - m_rStm << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) 0; - m_rStm << (sal_uInt32) ( 76 + ( nLen << 1 ) + ( (nLen & 1 ) ? 2 : 0 ) ); + m_rStm.WriteUInt32( (sal_uInt32) nLen ).WriteUInt32( (sal_uInt32) 76 ).WriteUInt32( (sal_uInt32) 2 ); + m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ); + m_rStm.WriteUInt32( (sal_uInt32) ( 76 + ( nLen << 1 ) + ( (nLen & 1 ) ? 2 : 0 ) ) ); // write text for( i = 0; i < nLen; i++ ) - m_rStm << (sal_Unicode)rText[ i ]; + m_rStm.WriteUInt16( (sal_Unicode)rText[ i ] ); // padding word if( nLen & 1 ) - m_rStm << (sal_uInt16) 0; + m_rStm.WriteUInt16( (sal_uInt16) 0 ); // write DX array ImplWriteExtent( pDX[ 0 ] ); @@ -1263,7 +1263,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) maVDev.Pop(); ImplBeginRecord( WIN_EMR_RESTOREDC ); - m_rStm << (sal_Int32) -1; + m_rStm.WriteInt32( (sal_Int32) -1 ); ImplEndRecord(); break; } @@ -1453,7 +1453,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) ( (MetaAction*) pAction )->Execute( &maVDev ); ImplBeginRecord( WIN_EMR_RESTOREDC ); - m_rStm << (sal_Int32) -1; + m_rStm.WriteInt32( (sal_Int32) -1 ); ImplEndRecord(); ImplWriteRasterOp( maVDev.GetRasterOp() ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 255d2d01443b..2d15308526e4 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -1014,12 +1014,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF() char* pBuf = new char[ nSize ]; SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE ); aTmp.ObjectOwnsMemory( sal_True ); - aTmp << (sal_uInt8)'B' - << (sal_uInt8)'M' - << (sal_uInt32)cbBitsSrc - << (sal_uInt16)0 - << (sal_uInt16)0 - << (sal_uInt32)cbBmiSrc + 14; + aTmp.WriteUChar( (sal_uInt8)'B' ) + .WriteUChar( (sal_uInt8)'M' ) + .WriteUInt32( (sal_uInt32)cbBitsSrc ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 ); pWMF->Seek( nStart + offBmiSrc ); pWMF->Read( pBuf + 14, cbBmiSrc ); pWMF->Seek( nStart + offBitsSrc ); @@ -1077,12 +1077,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF() char* pBuf = new char[ nSize ]; SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE ); aTmp.ObjectOwnsMemory( sal_True ); - aTmp << (sal_uInt8)'B' - << (sal_uInt8)'M' - << (sal_uInt32)cbBitsSrc - << (sal_uInt16)0 - << (sal_uInt16)0 - << (sal_uInt32)cbBmiSrc + 14; + aTmp.WriteUChar( (sal_uInt8)'B' ) + .WriteUChar( (sal_uInt8)'M' ) + .WriteUInt32( (sal_uInt32)cbBitsSrc ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 ); pWMF->Seek( nStart + offBmiSrc ); pWMF->Read( pBuf + 14, cbBmiSrc ); pWMF->Seek( nStart + offBitsSrc ); @@ -1147,12 +1147,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF() char* pBuf = new char[ nSize ]; SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE ); aTmp.ObjectOwnsMemory( sal_True ); - aTmp << (sal_uInt8)'B' - << (sal_uInt8)'M' - << (sal_uInt32)cbBitsSrc - << (sal_uInt16)0 - << (sal_uInt16)0 - << (sal_uInt32)cbBmiSrc + 14; + aTmp.WriteUChar( (sal_uInt8)'B' ) + .WriteUChar( (sal_uInt8)'M' ) + .WriteUInt32( (sal_uInt32)cbBitsSrc ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 ); pWMF->Seek( nStart + offBmiSrc ); pWMF->Read( pBuf + 14, cbBmiSrc ); pWMF->Seek( nStart + offBitsSrc ); @@ -1384,12 +1384,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF() SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE ); aTmp.ObjectOwnsMemory( sal_True ); - aTmp << (sal_uInt8)'B' - << (sal_uInt8)'M' - << (sal_uInt32)cbBits - << (sal_uInt16)0 - << (sal_uInt16)0 - << (sal_uInt32)cbBmi + 14; + aTmp.WriteUChar( (sal_uInt8)'B' ) + .WriteUChar( (sal_uInt8)'M' ) + .WriteUInt32( (sal_uInt32)cbBits ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt16( (sal_uInt16)0 ) + .WriteUInt32( (sal_uInt32)cbBmi + 14 ); pWMF->Seek( nStart + offBmi ); pWMF->Read( pBuf + 14, cbBmi ); pWMF->Seek( nStart + offBits ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 31b99da1b2f8..30acfc454b5b 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -2180,8 +2180,8 @@ void WinMtfOutput::PassEMFPlusHeaderInfo() nBottom = mrclFrame.Bottom(); // emf header info - mem << nLeft << nTop << nRight << nBottom; - mem << mnPixX << mnPixY << mnMillX << mnMillY; + mem.WriteInt32( nLeft ).WriteInt32( nTop ).WriteInt32( nRight ).WriteInt32( nBottom ); + mem.WriteInt32( mnPixX ).WriteInt32( mnPixY ).WriteInt32( mnMillX ).WriteInt32( mnMillY ); float one, zero; @@ -2190,7 +2190,7 @@ void WinMtfOutput::PassEMFPlusHeaderInfo() // add transformation matrix to be used in vcl's metaact.cxx for // rotate and scale operations - mem << one << zero << zero << one << zero << zero; + mem.WriteFloat( one ).WriteFloat( zero ).WriteFloat( zero ).WriteFloat( one ).WriteFloat( zero ).WriteFloat( zero ); // need to flush the stream, otherwise GetEndOfData will return 0 // on windows where the function parameters are probably resolved in reverse order diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 3dc415bd2223..9f702bd4cb5c 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -184,14 +184,14 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) void WMFWriter::WritePointXY(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); - *pWMF << ((short)aPt.X()) << ((short)aPt.Y()); + pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() ); } void WMFWriter::WritePointYX(const Point & rPoint) { Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) ); - *pWMF << ((short)aPt.Y()) << ((short)aPt.X()); + pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() ); } @@ -205,14 +205,14 @@ sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX ) void WMFWriter::WriteSize(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); - *pWMF << ((short)aSz.Width()) << ((short)aSz.Height()); + pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() ); } void WMFWriter::WriteHeightWidth(const Size & rSize) { Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) ); - *pWMF << ((short)aSz.Height()) << ((short)aSz.Width()); + pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() ); } @@ -225,7 +225,7 @@ void WMFWriter::WriteRectangle(const Rectangle & rRect) void WMFWriter::WriteColor(const Color & rColor) { - *pWMF << (sal_uInt8) rColor.GetRed() << (sal_uInt8) rColor.GetGreen() << (sal_uInt8) rColor.GetBlue() << (sal_uInt8) 0; + pWMF->WriteUChar( (sal_uInt8) rColor.GetRed() ).WriteUChar( (sal_uInt8) rColor.GetGreen() ).WriteUChar( (sal_uInt8) rColor.GetBlue() ).WriteUChar( (sal_uInt8) 0 ); } @@ -233,7 +233,7 @@ void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) { nActRecordPos=pWMF->Tell(); if (nSizeWords>nMaxRecordSize) nMaxRecordSize=nSizeWords; - *pWMF << nSizeWords << nType; + pWMF->WriteUInt32( nSizeWords ).WriteUInt16( nType ); } @@ -244,13 +244,13 @@ void WMFWriter::UpdateRecordHeader() nPos=pWMF->Tell(); nSize=nPos-nActRecordPos; if ((nSize & 1)!=0) { - *pWMF << (sal_uInt8)0; + pWMF->WriteUChar( (sal_uInt8)0 ); nPos++; nSize++; } nSize/=2; if (nSize>nMaxRecordSize) nMaxRecordSize=nSize; pWMF->Seek(nActRecordPos); - *pWMF << nSize; + pWMF->WriteUInt32( nSize ); pWMF->Seek(nPos); } @@ -277,12 +277,12 @@ void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor) WriteRecordHeader(0x00000007,W_META_CREATEBRUSHINDIRECT); if( rColor==Color(COL_TRANSPARENT) ) - *pWMF << (sal_uInt16) W_BS_HOLLOW; + pWMF->WriteUInt16( (sal_uInt16) W_BS_HOLLOW ); else - *pWMF << (sal_uInt16) W_BS_SOLID; + pWMF->WriteUInt16( (sal_uInt16) W_BS_SOLID ); WriteColor( rColor ); - *pWMF << (sal_uInt16) 0; + pWMF->WriteUInt16( (sal_uInt16) 0 ); } @@ -293,7 +293,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT); WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height())); - *pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation(); + pWMF->WriteInt16( (short)rFont.GetOrientation() ).WriteInt16( (short)rFont.GetOrientation() ); switch (rFont.GetWeight()) { case WEIGHT_THIN: nWeight=W_FW_THIN; break; @@ -308,11 +308,11 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) case WEIGHT_BLACK: nWeight=W_FW_BLACK; break; default: nWeight=W_FW_DONTCARE; } - *pWMF << nWeight; + pWMF->WriteUInt16( nWeight ); - if (rFont.GetItalic()==ITALIC_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1; - if (rFont.GetUnderline()==UNDERLINE_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1; - if (rFont.GetStrikeout()==STRIKEOUT_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1; + if (rFont.GetItalic()==ITALIC_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else pWMF->WriteUChar( (sal_uInt8)1 ); + if (rFont.GetUnderline()==UNDERLINE_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else pWMF->WriteUChar( (sal_uInt8)1 ); + if (rFont.GetStrikeout()==STRIKEOUT_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else pWMF->WriteUChar( (sal_uInt8)1 ); rtl_TextEncoding eFontNameEncoding = rFont.GetCharSet(); sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding ); @@ -320,9 +320,9 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) eFontNameEncoding = RTL_TEXTENCODING_MS_1252; if ( nCharSet == 1 ) nCharSet = W_ANSI_CHARSET; - *pWMF << nCharSet; + pWMF->WriteUChar( nCharSet ); - *pWMF << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0; + pWMF->WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ); switch (rFont.GetPitch()) { case PITCH_FIXED: nPitchFamily=W_FIXED_PITCH; break; @@ -337,13 +337,13 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) case FAMILY_SWISS: nPitchFamily|=W_FF_SWISS; break; default: nPitchFamily|=W_FF_DONTCARE; } - *pWMF << nPitchFamily; + pWMF->WriteUChar( nPitchFamily ); OString aFontName(OUStringToOString(rFont.GetName(), eFontNameEncoding)); for ( i = 0; i < W_LF_FACESIZE; i++ ) { sal_Char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0; - *pWMF << nChar; + pWMF->WriteChar( nChar ); } UpdateRecordHeader(); } @@ -378,7 +378,7 @@ void WMFWriter::WMFRecord_CreatePenIndirect(const Color& rColor, const LineInfo& default: break; } - *pWMF << nStyle; + pWMF->WriteUInt16( nStyle ); WriteSize( Size( rLineInfo.GetWidth(), 0 ) ); WriteColor( rColor ); @@ -387,7 +387,7 @@ void WMFWriter::WMFRecord_CreatePenIndirect(const Color& rColor, const LineInfo& void WMFWriter::WMFRecord_DeleteObject(sal_uInt16 nObjectHandle) { WriteRecordHeader(0x00000004,W_META_DELETEOBJECT); - *pWMF << nObjectHandle; + pWMF->WriteUInt16( nObjectHandle ); } @@ -409,15 +409,15 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In nCheckSum = rtl_crc32( nCheckSum, pData, nLen ); WriteRecordHeader( 3 + 9 + ( ( nLen + 1 ) >> 1 ), W_META_ESCAPE ); - *pWMF << (sal_uInt16)W_MFCOMMENT - << (sal_uInt16)( nLen + 14 ) // we will always have a fourteen byte escape header: - << (sal_uInt16)0x4f4f // OO - << (sal_uInt32)0xa2c2a // evil magic number - << (sal_uInt32)nCheckSum // crc32 checksum about nEsc & pData - << (sal_uInt32)nEsc; // escape number + pWMF->WriteUInt16( (sal_uInt16)W_MFCOMMENT ) + .WriteUInt16( (sal_uInt16)( nLen + 14 ) ) // we will always have a fourteen byte escape header: + .WriteUInt16( (sal_uInt16)0x4f4f ) // OO + .WriteUInt32( (sal_uInt32)0xa2c2a ) // evil magic number + .WriteUInt32( (sal_uInt32)nCheckSum ) // crc32 checksum about nEsc & pData + .WriteUInt32( (sal_uInt32)nEsc ); // escape number pWMF->Write( pData, nLen ); if ( nLen & 1 ) - *pWMF << (sal_uInt8)0; // pad byte + pWMF->WriteUChar( (sal_uInt8)0 ); // pad byte } /* if return value is true, then a complete unicode string and also a polygon replacement has been written, @@ -493,15 +493,15 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r SvMemoryStream aMemoryStream( nStrmLen ); Point aPt( pVirDev->LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) ); - aMemoryStream << static_cast<sal_Int32>(aPt.X()) - << static_cast<sal_Int32>(aPt.Y()) - << nStringLen; + aMemoryStream.WriteInt32( static_cast<sal_Int32>(aPt.X()) ) + .WriteInt32( static_cast<sal_Int32>(aPt.Y()) ) + .WriteUInt32( nStringLen ); for ( i = 0; i < nStringLen; i++ ) - aMemoryStream << rUniStr[ i ]; - aMemoryStream << nDXCount; + aMemoryStream.WriteUInt16( rUniStr[ i ] ); + aMemoryStream.WriteUInt32( nDXCount ); for ( i = 0; i < nDXCount; i++ ) - aMemoryStream << pDXAry[ i ]; - aMemoryStream << nSkipActions; + aMemoryStream.WriteInt32( pDXAry[ i ] ); + aMemoryStream.WriteUInt32( nSkipActions ); WMFRecord_Escape( PRIVATE_ESCAPE_UNICODE, nStrmLen, (const sal_Int8*)aMemoryStream.GetData() ); std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() ); @@ -542,10 +542,10 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const OUString & rString, WriteRecordHeader( 0, W_META_EXTTEXTOUT ); WritePointYX( rPoint ); sal_uInt16 nNewTextLen = static_cast<sal_uInt16>(rByteString.getLength()); - *pWMF << nNewTextLen << (sal_uInt16)0; + pWMF->WriteUInt16( nNewTextLen ).WriteUInt16( (sal_uInt16)0 ); write_uInt8s_FromOString(*pWMF, rByteString, nNewTextLen); if ( nNewTextLen & 1 ) - *pWMF << (sal_uInt8)0; + pWMF->WriteUChar( (sal_uInt8)0 ); sal_Int32 nOriginalTextLen = rString.getLength(); sal_Int16* pConvertedDXAry = new sal_Int16[ nOriginalTextLen ]; @@ -558,14 +558,14 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const OUString & rString, for (sal_uInt16 i = 0; i < nOriginalTextLen; ++i) { sal_Int16 nDx = pConvertedDXAry[ i ]; - *pWMF << nDx; + pWMF->WriteInt16( nDx ); if ( nOriginalTextLen < nNewTextLen ) { sal_Unicode nUniChar = rString[i]; OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet()); j = aTemp.getLength(); while ( --j > 0 ) - *pWMF << (sal_uInt16)0; + pWMF->WriteUInt16( (sal_uInt16)0 ); } } delete[] pConvertedDXAry; @@ -606,7 +606,7 @@ void WMFWriter::WMFRecord_Polygon(const Polygon & rPoly) aSimplePoly = rPoly; nSize = aSimplePoly.GetSize(); WriteRecordHeader(((sal_uLong)nSize)*2+4,W_META_POLYGON); - *pWMF << nSize; + pWMF->WriteUInt16( nSize ); for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } @@ -621,7 +621,7 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) aSimplePoly = rPoly; nSize=aSimplePoly.GetSize(); WriteRecordHeader(((sal_uLong)nSize)*2+4,W_META_POLYLINE); - *pWMF << nSize; + pWMF->WriteUInt16( nSize ); for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } @@ -643,8 +643,8 @@ void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly) } } WriteRecordHeader(0,W_META_POLYPOLYGON); - *pWMF << nCount; - for (i=0; i<nCount; i++) *pWMF << ((sal_uInt16)(aSimplePolyPoly.GetObject(i).GetSize())); + pWMF->WriteUInt16( nCount ); + for (i=0; i<nCount; i++) pWMF->WriteUInt16( (sal_uInt16)(aSimplePolyPoly.GetObject(i).GetSize()) ); for (i=0; i<nCount; i++) { pPoly=&(aSimplePolyPoly.GetObject(i)); nSize=pPoly->GetSize(); @@ -664,7 +664,7 @@ void WMFWriter::WMFRecord_Rectangle(const Rectangle & rRect) void WMFWriter::WMFRecord_RestoreDC() { WriteRecordHeader(0x00000004,W_META_RESTOREDC); - *pWMF << (short)-1; + pWMF->WriteInt16( (short)-1 ); } @@ -685,21 +685,21 @@ void WMFWriter::WMFRecord_SaveDC() void WMFWriter::WMFRecord_SelectObject(sal_uInt16 nObjectHandle) { WriteRecordHeader(0x00000004,W_META_SELECTOBJECT); - *pWMF << nObjectHandle; + pWMF->WriteUInt16( nObjectHandle ); } void WMFWriter::WMFRecord_SetBkMode(bool bTransparent) { WriteRecordHeader(0x00000004,W_META_SETBKMODE); - if (bTransparent) *pWMF << (sal_uInt16)W_TRANSPARENT; - else *pWMF << (sal_uInt16)W_OPAQUE; + if (bTransparent) pWMF->WriteUInt16( (sal_uInt16)W_TRANSPARENT ); + else pWMF->WriteUInt16( (sal_uInt16)W_OPAQUE ); } void WMFWriter::WMFRecord_SetStretchBltMode() { WriteRecordHeader( 0x00000004, W_META_SETSTRETCHBLTMODE ); - *pWMF << (sal_uInt16) 3; // STRETCH_DELETESCANS + pWMF->WriteUInt16( (sal_uInt16) 3 ); // STRETCH_DELETESCANS } void WMFWriter::WMFRecord_SetPixel(const Point & rPoint, const Color & rColor) @@ -720,7 +720,7 @@ void WMFWriter::WMFRecord_SetROP2(RasterOp eROP) default: nROP2=W_R2_COPYPEN; } WriteRecordHeader(0x00000004,W_META_SETROP2); - *pWMF << nROP2; + pWMF->WriteUInt16( nROP2 ); } @@ -737,7 +737,7 @@ void WMFWriter::WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt32 eHorText nAlign|=W_TA_NOUPDATECP; WriteRecordHeader(0x00000004,W_META_SETTEXTALIGN); - *pWMF << nAlign; + pWMF->WriteUInt16( nAlign ); } @@ -778,7 +778,7 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, // erzeugt, schreiben wir zuerst die Bitmap an die richtige Position // Und ueberschreiben hinterher den FILEHEADER mit den Parametern. nPosAnf=pWMF->Tell(); // Position merken, wo Parameter hin sollen - *pWMF << (sal_Int32)0 << (sal_Int32)0; // 8 bytes auffuellen (diese 8 bytes + + pWMF->WriteInt32( (sal_Int32)0 ).WriteInt32( (sal_Int32)0 ); // 8 bytes auffuellen (diese 8 bytes + // 14 bytes ueberfluessigen FILEHEADER // = 22 bytes Parameter) @@ -801,12 +801,7 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, } } - *pWMF << nROP << - (short) 0 << - (short) rBitmap.GetSizePixel().Height() << - (short) rBitmap.GetSizePixel().Width() << - (short) 0 << - (short) 0; + pWMF->WriteUInt32( nROP ). WriteInt16( (short) 0 ). WriteInt16( (short) rBitmap.GetSizePixel().Height() ). WriteInt16( (short) rBitmap.GetSizePixel().Width() ). WriteInt16( (short) 0 ). WriteInt16( (short) 0 ); WriteHeightWidth(rSize); WritePointYX(rPoint); @@ -832,7 +827,7 @@ void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString) write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(*pWMF, rString); sal_Int32 nLen = rString.getLength(); - if ((nLen&1)!=0) *pWMF << (sal_uInt8)0; + if ((nLen&1)!=0) pWMF->WriteUChar( (sal_uInt8)0 ); WritePointYX(rPoint); UpdateRecordHeader(); } @@ -1667,27 +1662,27 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable ) sal_uInt16 nUnitsPerInch = (sal_uInt16) ( ( aSize.Width() + aSize.Height() ) >> 1 ); nCheckSum=0; - nValue=0xcdd7; nCheckSum^=nValue; *pWMF << nValue; - nValue=0x9ac6; nCheckSum^=nValue; *pWMF << nValue; - nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; - nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; - nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; - nValue=(sal_uInt16) aTargetSize.Width(); nCheckSum^=nValue; *pWMF << nValue; - nValue=(sal_uInt16) aTargetSize.Height(); nCheckSum^=nValue; *pWMF << nValue; - nValue=nUnitsPerInch; nCheckSum^=nValue; *pWMF << nValue; - nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; - nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; - *pWMF << nCheckSum; + nValue=0xcdd7; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=0x9ac6; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=(sal_uInt16) aTargetSize.Width(); nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=(sal_uInt16) aTargetSize.Height(); nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=nUnitsPerInch; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue ); + pWMF->WriteUInt16( nCheckSum ); } nMetafileHeaderPos=pWMF->Tell(); - *pWMF << (sal_uInt16)0x0001 // Typ: Datei - << (sal_uInt16)0x0009 // Headerlaenge in Worten - << (sal_uInt16)0x0300 // Version als BCD-Zahl - << (sal_uInt32) 0x00000000 // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt - << (sal_uInt16)MAXOBJECTHANDLES // Maximalezahl der gleichzeitigen Objekte - << (sal_uInt32) 0x00000000 // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt - << (sal_uInt16)0x0000; // Reserved + pWMF->WriteUInt16( (sal_uInt16)0x0001 ) // Typ: Datei + .WriteUInt16( (sal_uInt16)0x0009 ) // Headerlaenge in Worten + .WriteUInt16( (sal_uInt16)0x0300 ) // Version als BCD-Zahl + .WriteUInt32( (sal_uInt32) 0x00000000 ) // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt + .WriteUInt16( (sal_uInt16)MAXOBJECTHANDLES ) // Maximalezahl der gleichzeitigen Objekte + .WriteUInt32( (sal_uInt32) 0x00000000 ) // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt + .WriteUInt16( (sal_uInt16)0x0000 ); // Reserved } // ------------------------------------------------------------------------ @@ -1700,15 +1695,15 @@ void WMFWriter::UpdateHeader() nPos=pWMF->Tell(); // Endposition = Gesammtgroesse der Datei nFileSize=nPos-nMetafileHeaderPos; // Groesse des 1. Headers abziehen if ((nFileSize&1)!=0) { // ggf. auf ganze Worte aufrunden - *pWMF << (sal_uInt8)0; + pWMF->WriteUChar( (sal_uInt8)0 ); nPos++; nFileSize++; } nFileSize>>=1; // In Anzahl Worte umrechnen pWMF->Seek(nMetafileHeaderPos+6); // Zum Dateigroessen-Eintrag im zweiten Header - *pWMF << nFileSize; // Dateigroesse berichtigen + pWMF->WriteUInt32( nFileSize ); // Dateigroesse berichtigen pWMF->SeekRel(2); // Zum Max-Record-Laenge-Eintrag im zweiten Header - *pWMF << nMaxRecordSize; // und berichtigen + pWMF->WriteUInt32( nMaxRecordSize ); // und berichtigen pWMF->Seek(nPos); } @@ -1924,17 +1919,17 @@ void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sa { // according to http://msdn.microsoft.com/en-us/library/dd366152%28PROT.13%29.aspx WriteRecordHeader( 0, W_META_ESCAPE ); - *pWMF << (sal_uInt16)W_MFCOMMENT // same as META_ESCAPE_ENHANCED_METAFILE - << (sal_uInt16)( nCurSize + 34 ) // we will always have a 34 byte escape header: - << (sal_uInt32) 0x43464D57 // WMFC - << (sal_uInt32) 0x00000001 // Comment type - << (sal_uInt32) 0x00010000 // version - << nCheckSum // check sum - << (sal_uInt32) 0 // flags = 0 - << nRecCounts // total number of records - << nCurSize // size of this record's data - << nRemainingSize // remaining size of data in following records, missing in MSDN documentation - << nTotalSize; // total size of EMF stream + pWMF->WriteUInt16( (sal_uInt16)W_MFCOMMENT ) // same as META_ESCAPE_ENHANCED_METAFILE + .WriteUInt16( (sal_uInt16)( nCurSize + 34 ) ) // we will always have a 34 byte escape header: + .WriteUInt32( (sal_uInt32) 0x43464D57 ) // WMFC + .WriteUInt32( (sal_uInt32) 0x00000001 ) // Comment type + .WriteUInt32( (sal_uInt32) 0x00010000 ) // version + .WriteUInt16( nCheckSum ) // check sum + .WriteUInt32( (sal_uInt32) 0 ) // flags = 0 + .WriteUInt32( nRecCounts ) // total number of records + .WriteUInt32( nCurSize ) // size of this record's data + .WriteUInt32( nRemainingSize ) // remaining size of data in following records, missing in MSDN documentation + .WriteUInt32( nTotalSize ); // total size of EMF stream pWMF->Write( static_cast< const sal_Char* >( rStream.GetData() ) + rStream.Tell(), nCurSize ); rStream.SeekRel( nCurSize ); diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index a43bd15837f9..92f19b7c4daa 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -711,7 +711,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) WriteDIBBitmapEx(rAnimation.GetBitmapEx(), rOStm); // Write identifier ( SDANIMA1 ) - rOStm << (sal_uInt32) 0x5344414e << (sal_uInt32) 0x494d4931; + rOStm.WriteUInt32( (sal_uInt32) 0x5344414e ).WriteUInt32( (sal_uInt32) 0x494d4931 ); for( sal_uInt16 i = 0; i < nCount; i++ ) { @@ -723,15 +723,15 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation ) rOStm << rAnimBmp.aPosPix; rOStm << rAnimBmp.aSizePix; rOStm << rAnimation.maGlobalSize; - rOStm << (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ); - rOStm << (sal_uInt16) rAnimBmp.eDisposal; - rOStm << (sal_uInt8) rAnimBmp.bUserInput; - rOStm << (sal_uInt32) rAnimation.mnLoopCount; - rOStm << nDummy32; // Unused - rOStm << nDummy32; // Unused - rOStm << nDummy32; // Unused + rOStm.WriteUInt16( (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) ); + rOStm.WriteUInt16( (sal_uInt16) rAnimBmp.eDisposal ); + rOStm.WriteUChar( (sal_uInt8) rAnimBmp.bUserInput ); + rOStm.WriteUInt32( (sal_uInt32) rAnimation.mnLoopCount ); + rOStm.WriteUInt32( nDummy32 ); // Unused + rOStm.WriteUInt32( nDummy32 ); // Unused + rOStm.WriteUInt32( nDummy32 ); // Unused write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy - rOStm << nRest; // Count of remaining structures + rOStm.WriteUInt16( nRest ); // Count of remaining structures } } diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 46ee97c3a9c1..54dafd3b79bc 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -83,9 +83,9 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly ) for( n = 0; n < nPoly; n++ ) nPoints = sal::static_int_cast<sal_uInt16>(nPoints + rPolyPoly[ n ].GetSize()); - rOStm << (sal_Int16) GDI_POLYPOLYGON_ACTION; - rOStm << (sal_Int32) ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) ); - rOStm << (sal_Int32) nPoly; + rOStm.WriteInt16( (sal_Int16) GDI_POLYPOLYGON_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) ) ); + rOStm.WriteInt32( (sal_Int32) nPoly ); for( n = 0; n < nPoly; n++ ) { @@ -96,7 +96,7 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly ) rPolyPoly[n].AdaptiveSubdivide(aSimplePoly); const sal_uInt16 nSize(aSimplePoly.GetSize()); - rOStm << (sal_Int32) nSize; + rOStm.WriteInt32( (sal_Int32) nSize ); for( sal_uInt16 j = 0; j < nSize; j++ ) rOStm << aSimplePoly[ j ]; @@ -117,13 +117,13 @@ void ImplWriteColor( SvStream& rOStm, const Color& rColor ) sal_Int16 nVal; nVal = ( (sal_Int16) rColor.GetRed() << 8 ) | rColor.GetRed(); - rOStm << nVal; + rOStm.WriteInt16( nVal ); nVal = ( (sal_Int16) rColor.GetGreen() << 8 ) | rColor.GetGreen(); - rOStm << nVal; + rOStm.WriteInt16( nVal ); nVal = ( (sal_Int16) rColor.GetBlue() << 8 ) | rColor.GetBlue(); - rOStm << nVal; + rOStm.WriteInt16( nVal ); } void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode ) @@ -141,24 +141,24 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode ) void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) { - rOStm << (sal_Int16) rMapMode.GetMapUnit(); + rOStm.WriteInt16( (sal_Int16) rMapMode.GetMapUnit() ); rOStm << rMapMode.GetOrigin(); - rOStm << (sal_Int32) rMapMode.GetScaleX().GetNumerator(); - rOStm << (sal_Int32) rMapMode.GetScaleX().GetDenominator(); - rOStm << (sal_Int32) rMapMode.GetScaleY().GetNumerator(); - rOStm << (sal_Int32) rMapMode.GetScaleY().GetDenominator(); + rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetNumerator() ); + rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetDenominator() ); + rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetNumerator() ); + rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetDenominator() ); } void ImplWritePushAction( SvStream& rOStm ) { - rOStm << (sal_Int16) GDI_PUSH_ACTION; - rOStm << (sal_Int32) 4; + rOStm.WriteInt16( (sal_Int16) GDI_PUSH_ACTION ); + rOStm.WriteInt32( (sal_Int32) 4 ); } void ImplWritePopAction( SvStream& rOStm ) { - rOStm << (sal_Int16) GDI_POP_ACTION; - rOStm << (sal_Int32) 4; + rOStm.WriteInt16( (sal_Int16) GDI_POP_ACTION ); + rOStm.WriteInt32( (sal_Int32) 4 ); } void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle, sal_Int32 nWidth = 0L ) @@ -166,17 +166,17 @@ void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle, if( rColor.GetTransparency() > 127 ) nStyle = 0; - rOStm << (sal_Int16) GDI_PEN_ACTION; - rOStm << (sal_Int32) 16; + rOStm.WriteInt16( (sal_Int16) GDI_PEN_ACTION ); + rOStm.WriteInt32( (sal_Int32) 16 ); ImplWriteColor( rOStm, rColor ); - rOStm << nWidth; - rOStm << nStyle; + rOStm.WriteInt32( nWidth ); + rOStm.WriteInt16( nStyle ); } void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle ) { - rOStm << (sal_Int16) GDI_FILLBRUSH_ACTION; - rOStm << (sal_Int32) 20; + rOStm.WriteInt16( (sal_Int16) GDI_FILLBRUSH_ACTION ); + rOStm.WriteInt32( (sal_Int32) 20 ); ImplWriteColor( rOStm, rColor ); if( rColor.GetTransparency() > 127 ) @@ -185,14 +185,14 @@ void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle if( nStyle > 1 ) { ImplWriteColor( rOStm, COL_WHITE ); - rOStm << nStyle; - rOStm << (sal_Int16) 1; + rOStm.WriteInt16( nStyle ); + rOStm.WriteInt16( (sal_Int16) 1 ); } else { ImplWriteColor( rOStm, COL_BLACK ); - rOStm << nStyle; - rOStm << (sal_Int16) 0; + rOStm.WriteInt16( nStyle ); + rOStm.WriteInt16( (sal_Int16) 0 ); } } @@ -230,34 +230,34 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont, break; } - rOStm << (sal_Int16) GDI_FONT_ACTION; - rOStm << (sal_Int32) 78; + rOStm.WriteInt16( (sal_Int16) GDI_FONT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 78 ); rActualCharSet = GetStoreCharSet( rFont.GetCharSet() ); ImplWriteColor( rOStm, rFont.GetColor() ); ImplWriteColor( rOStm, rFont.GetFillColor() ); rOStm.Write( aName, 32 ); rOStm << rFont.GetSize(); - rOStm << (sal_Int16) 0; // no character orientation anymore - rOStm << (sal_Int16) rFont.GetOrientation(); - rOStm << (sal_Int16) rActualCharSet; - rOStm << (sal_Int16) rFont.GetFamily(); - rOStm << (sal_Int16) rFont.GetPitch(); - rOStm << (sal_Int16) rFont.GetAlign(); - rOStm << (sal_Int16) nWeight; - rOStm << (sal_Int16) rFont.GetUnderline(); - rOStm << (sal_Int16) rFont.GetStrikeout(); - rOStm << (sal_Bool) ( rFont.GetItalic() != ITALIC_NONE ); - rOStm << rFont.IsOutline(); - rOStm << rFont.IsShadow(); - rOStm << rFont.IsTransparent(); + rOStm.WriteInt16( (sal_Int16) 0 ); // no character orientation anymore + rOStm.WriteInt16( (sal_Int16) rFont.GetOrientation() ); + rOStm.WriteInt16( (sal_Int16) rActualCharSet ); + rOStm.WriteInt16( (sal_Int16) rFont.GetFamily() ); + rOStm.WriteInt16( (sal_Int16) rFont.GetPitch() ); + rOStm.WriteInt16( (sal_Int16) rFont.GetAlign() ); + rOStm.WriteInt16( (sal_Int16) nWeight ); + rOStm.WriteInt16( (sal_Int16) rFont.GetUnderline() ); + rOStm.WriteInt16( (sal_Int16) rFont.GetStrikeout() ); + rOStm.WriteUChar( (sal_Bool) ( rFont.GetItalic() != ITALIC_NONE ) ); + rOStm.WriteUChar( rFont.IsOutline() ); + rOStm.WriteUChar( rFont.IsShadow() ); + rOStm.WriteUChar( rFont.IsTransparent() ); if ( rActualCharSet == RTL_TEXTENCODING_DONTKNOW ) rActualCharSet = osl_getThreadTextEncoding(); } void ImplWriteRasterOpAction( SvStream& rOStm, sal_Int16 nRasterOp ) { - rOStm << (sal_Int16) GDI_RASTEROP_ACTION << (sal_Int32) 6 << nRasterOp; + rOStm.WriteInt16( (sal_Int16) GDI_RASTEROP_ACTION ).WriteInt32( (sal_Int32) 6 ).WriteInt16( nRasterOp ); } sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString ) @@ -268,7 +268,7 @@ sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString ) sal_uInt32 nSize = ( nStringLen << 1 ) + 4; sal_uInt16 nType = GDI_UNICODE_COMMENT; - rOStm << nType << nSize; + rOStm.WriteUInt16( nType ).WriteUInt32( nSize ); write_uInt16s_FromOUString(rOStm, rString); } return nStringLen != 0; @@ -337,7 +337,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol if((bOnlyWhenCurve && nAllFlagCount) || (!bOnlyWhenCurve && nAllPointCount)) { - rOStm << (sal_Int16) GDI_EXTENDEDPOLYGON_ACTION; + rOStm.WriteInt16( (sal_Int16) GDI_EXTENDEDPOLYGON_ACTION ); const sal_Int32 nActionSize( 4 + // Action size @@ -347,8 +347,8 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol nAllPolygonCount + // Bool if (when poly has points) it has flags, too nAllFlagCount); // Flags themselves - rOStm << nActionSize; - rOStm << (sal_uInt16)nAllPolygonCount; + rOStm.WriteInt32( nActionSize ); + rOStm.WriteUInt16( (sal_uInt16)nAllPolygonCount ); for(a = 0; a < nPolygonCount; a++) { @@ -357,7 +357,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol if(nPointCount) { - rOStm << nPointCount; + rOStm.WriteUInt16( nPointCount ); for(sal_uInt16 b(0); b < nPointCount; b++) { @@ -366,16 +366,16 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol if(rCandidate.HasFlags()) { - rOStm << (sal_uInt8)true; + rOStm.WriteUChar( (sal_uInt8)true ); for(sal_uInt16 c(0); c < nPointCount; c++) { - rOStm << (sal_uInt8)rCandidate.GetFlags(c); + rOStm.WriteUChar( (sal_uInt8)rCandidate.GetFlags(c) ); } } else { - rOStm << (sal_uInt8)false; + rOStm.WriteUChar( (sal_uInt8)false ); } } } @@ -1342,11 +1342,11 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); // Write MagicCode - rOStm << "SVGDI"; // Identifier - rOStm << (sal_Int16) 42; // HeaderSize - rOStm << (sal_Int16) 200; // VERSION - rOStm << (sal_Int32) aPrefSize.Width(); - rOStm << (sal_Int32) aPrefSize.Height(); + rOStm.WriteCharPtr( "SVGDI" ); // Identifier + rOStm.WriteInt16( (sal_Int16) 42 ); // HeaderSize + rOStm.WriteInt16( (sal_Int16) 200 ); // VERSION + rOStm.WriteInt32( (sal_Int32) aPrefSize.Width() ); + rOStm.WriteInt32( (sal_Int32) aPrefSize.Height() ); ImplWriteMapMode( rOStm, rMtf.GetPrefMapMode() ); // ActionCount will be written later @@ -1357,7 +1357,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) const sal_uLong nActPos = rOStm.Tell(); rOStm.Seek( nCountPos ); - rOStm << nActCount; + rOStm.WriteInt32( nActCount ); rOStm.Seek( nActPos ); rOStm.SetNumberFormatInt( nOldFormat ); @@ -1385,8 +1385,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaPixelAction* pAct = (MetaPixelAction*) pAction; - rOStm << (sal_Int16) GDI_PIXEL_ACTION; - rOStm << (sal_Int32) 18; + rOStm.WriteInt16( (sal_Int16) GDI_PIXEL_ACTION ); + rOStm.WriteInt32( (sal_Int32) 18 ); rOStm << pAct->GetPoint(); ImplWriteColor( rOStm, pAct->GetColor() ); nCount++; @@ -1397,8 +1397,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaPointAction* pAct = (MetaPointAction*) pAction; - rOStm << (sal_Int16) GDI_POINT_ACTION; - rOStm << (sal_Int32) 12; + rOStm.WriteInt16( (sal_Int16) GDI_POINT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 12 ); rOStm << pAct->GetPoint(); nCount++; } @@ -1420,32 +1420,32 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if(bLineJoin) { - rOStm << (sal_Int16) GDI_LINEJOIN_ACTION; - rOStm << (sal_Int32) 6; - rOStm << (sal_Int16) rInfo.GetLineJoin(); + rOStm.WriteInt16( (sal_Int16) GDI_LINEJOIN_ACTION ); + rOStm.WriteInt32( (sal_Int32) 6 ); + rOStm.WriteInt16( (sal_Int16) rInfo.GetLineJoin() ); } if(bLineCap) { - rOStm << (sal_Int16) GDI_LINECAP_ACTION; - rOStm << (sal_Int32) 6; - rOStm << (sal_Int16) rInfo.GetLineCap(); + rOStm.WriteInt16( (sal_Int16) GDI_LINECAP_ACTION ); + rOStm.WriteInt32( (sal_Int32) 6 ); + rOStm.WriteInt16( (sal_Int16) rInfo.GetLineCap() ); } } if(bLineDashDot) { - rOStm << (sal_Int16) GDI_LINEDASHDOT_ACTION; - rOStm << (sal_Int32) 4 + 16; - rOStm << (sal_Int16)rInfo.GetDashCount(); - rOStm << (sal_Int32)rInfo.GetDashLen(); - rOStm << (sal_Int16)rInfo.GetDotCount(); - rOStm << (sal_Int32)rInfo.GetDotLen(); - rOStm << (sal_Int32)rInfo.GetDistance(); + rOStm.WriteInt16( (sal_Int16) GDI_LINEDASHDOT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 4 + 16 ); + rOStm.WriteInt16( (sal_Int16)rInfo.GetDashCount() ); + rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() ); + rOStm.WriteInt16( (sal_Int16)rInfo.GetDotCount() ); + rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() ); + rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() ); } - rOStm << (sal_Int16) GDI_LINE_ACTION; - rOStm << (sal_Int32) 20; + rOStm.WriteInt16( (sal_Int16) GDI_LINE_ACTION ); + rOStm.WriteInt32( (sal_Int32) 20 ); rOStm << pAct->GetStartPoint(); rOStm << pAct->GetEndPoint(); nCount++; @@ -1477,11 +1477,11 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaRectAction* pAct = (MetaRectAction*) pAction; - rOStm << (sal_Int16) GDI_RECT_ACTION; - rOStm << (sal_Int32) 28; + rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 28 ); ImplWriteRect( rOStm, pAct->GetRect() ); - rOStm << (sal_Int32) 0; - rOStm << (sal_Int32) 0; + rOStm.WriteInt32( (sal_Int32) 0 ); + rOStm.WriteInt32( (sal_Int32) 0 ); nCount++; } break; @@ -1490,11 +1490,11 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction; - rOStm << (sal_Int16) GDI_RECT_ACTION; - rOStm << (sal_Int32) 28; + rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 28 ); ImplWriteRect( rOStm, pAct->GetRect() ); - rOStm << (sal_Int32) pAct->GetHorzRound(); - rOStm << (sal_Int32) pAct->GetVertRound(); + rOStm.WriteInt32( (sal_Int32) pAct->GetHorzRound() ); + rOStm.WriteInt32( (sal_Int32) pAct->GetVertRound() ); nCount++; } break; @@ -1503,8 +1503,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaEllipseAction* pAct = (MetaEllipseAction*) pAction; - rOStm << (sal_Int16) GDI_ELLIPSE_ACTION; - rOStm << (sal_Int32) 20; + rOStm.WriteInt16( (sal_Int16) GDI_ELLIPSE_ACTION ); + rOStm.WriteInt32( (sal_Int32) 20 ); ImplWriteRect( rOStm, pAct->GetRect() ); nCount++; } @@ -1514,8 +1514,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaArcAction* pAct = (MetaArcAction*) pAction; - rOStm << (sal_Int16) GDI_ARC_ACTION; - rOStm << (sal_Int32) 36; + rOStm.WriteInt16( (sal_Int16) GDI_ARC_ACTION ); + rOStm.WriteInt32( (sal_Int32) 36 ); ImplWriteRect( rOStm, pAct->GetRect() ); rOStm << pAct->GetStartPoint(); rOStm << pAct->GetEndPoint(); @@ -1527,8 +1527,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaPieAction* pAct = (MetaPieAction*) pAction; - rOStm << (sal_Int16) GDI_PIE_ACTION; - rOStm << (sal_Int32) 36; + rOStm.WriteInt16( (sal_Int16) GDI_PIE_ACTION ); + rOStm.WriteInt32( (sal_Int32) 36 ); ImplWriteRect( rOStm, pAct->GetRect() ); rOStm << pAct->GetStartPoint(); rOStm << pAct->GetEndPoint(); @@ -1543,9 +1543,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, pAct->GetEndPoint(), POLY_CHORD ); const sal_uInt16 nPoints = aChordPoly.GetSize(); - rOStm << (sal_Int16) GDI_POLYGON_ACTION; - rOStm << (sal_Int32) ( 8 + ( nPoints << 3 ) ); - rOStm << (sal_Int32) nPoints; + rOStm.WriteInt16( (sal_Int16) GDI_POLYGON_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) ); + rOStm.WriteInt32( (sal_Int32) nPoints ); for( sal_uInt16 n = 0; n < nPoints; n++ ) rOStm << aChordPoly[ n ]; @@ -1576,33 +1576,33 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if(bLineJoin) { - rOStm << (sal_Int16) GDI_LINEJOIN_ACTION; - rOStm << (sal_Int32) 6; - rOStm << (sal_Int16) rInfo.GetLineJoin(); + rOStm.WriteInt16( (sal_Int16) GDI_LINEJOIN_ACTION ); + rOStm.WriteInt32( (sal_Int32) 6 ); + rOStm.WriteInt16( (sal_Int16) rInfo.GetLineJoin() ); } if(bLineCap) { - rOStm << (sal_Int16) GDI_LINECAP_ACTION; - rOStm << (sal_Int32) 6; - rOStm << (sal_Int16) rInfo.GetLineCap(); + rOStm.WriteInt16( (sal_Int16) GDI_LINECAP_ACTION ); + rOStm.WriteInt32( (sal_Int32) 6 ); + rOStm.WriteInt16( (sal_Int16) rInfo.GetLineCap() ); } } if(bLineDashDot) { - rOStm << (sal_Int16) GDI_LINEDASHDOT_ACTION; - rOStm << (sal_Int32) 4 + 16; - rOStm << (sal_Int16)rInfo.GetDashCount(); - rOStm << (sal_Int32)rInfo.GetDashLen(); - rOStm << (sal_Int16)rInfo.GetDotCount(); - rOStm << (sal_Int32)rInfo.GetDotLen(); - rOStm << (sal_Int32)rInfo.GetDistance(); + rOStm.WriteInt16( (sal_Int16) GDI_LINEDASHDOT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 4 + 16 ); + rOStm.WriteInt16( (sal_Int16)rInfo.GetDashCount() ); + rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() ); + rOStm.WriteInt16( (sal_Int16)rInfo.GetDotCount() ); + rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() ); + rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() ); } - rOStm << (sal_Int16) GDI_POLYLINE_ACTION; - rOStm << (sal_Int32) ( 8 + ( nPoints << 3 ) ); - rOStm << (sal_Int32) nPoints; + rOStm.WriteInt16( (sal_Int16) GDI_POLYLINE_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) ); + rOStm.WriteInt32( (sal_Int32) nPoints ); for( sal_uInt16 n = 0; n < nPoints; n++ ) { @@ -1650,9 +1650,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, pAct->GetPolygon().AdaptiveSubdivide(aSimplePoly); const sal_uInt16 nPoints(aSimplePoly.GetSize()); - rOStm << (sal_Int16) GDI_POLYGON_ACTION; - rOStm << (sal_Int32) ( 8 + ( nPoints << 3 ) ); - rOStm << (sal_Int32) nPoints; + rOStm.WriteInt16( (sal_Int16) GDI_POLYGON_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) ); + rOStm.WriteInt32( (sal_Int32) nPoints ); for( sal_uInt16 n = 0; n < nPoints; n++ ) rOStm << aSimplePoly[ n ]; @@ -1691,12 +1691,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) nCount++; - rOStm << (sal_Int16) GDI_TEXT_ACTION; - rOStm << (sal_Int32) ( 24 + ( nStrLen + 1 ) ); + rOStm.WriteInt16( (sal_Int16) GDI_TEXT_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 24 + ( nStrLen + 1 ) ) ); rOStm << pAct->GetPoint(); - rOStm << (sal_Int32) pAct->GetIndex(); - rOStm << (sal_Int32) pAct->GetLen(); - rOStm << (sal_Int32) nStrLen; + rOStm.WriteInt32( (sal_Int32) pAct->GetIndex() ); + rOStm.WriteInt32( (sal_Int32) pAct->GetLen() ); + rOStm.WriteInt32( (sal_Int32) nStrLen ); rOStm.Write( aText.getStr(), nStrLen + 1 ); nCount++; } @@ -1729,17 +1729,17 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, else nAryLen = nLen; // #105987# Write out all of DX array - rOStm << (sal_Int16) GDI_TEXTARRAY_ACTION; - rOStm << (sal_Int32) ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) ); + rOStm.WriteInt16( (sal_Int16) GDI_TEXTARRAY_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) ) ); rOStm << pAct->GetPoint(); - rOStm << (sal_Int32) 0; - rOStm << (sal_Int32) nLen; - rOStm << (sal_Int32) nLen; - rOStm << (sal_Int32) nAryLen; + rOStm.WriteInt32( (sal_Int32) 0 ); + rOStm.WriteInt32( (sal_Int32) nLen ); + rOStm.WriteInt32( (sal_Int32) nLen ); + rOStm.WriteInt32( (sal_Int32) nAryLen ); rOStm.Write( aText.getStr()+pAct->GetIndex(), nLen + 1 ); for( sal_uLong n = 0UL ; n < nAryLen; n++ ) - rOStm << (sal_Int32) pDXArray[ n ]; + rOStm.WriteInt32( (sal_Int32) pDXArray[ n ] ); nCount++; } @@ -1756,13 +1756,13 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, if ( ImplWriteUnicodeComment( rOStm, aUniText ) ) nCount++; - rOStm << (sal_Int16) GDI_STRETCHTEXT_ACTION; - rOStm << (sal_Int32) ( 28 + ( nStrLen + 1 ) ); + rOStm.WriteInt16( (sal_Int16) GDI_STRETCHTEXT_ACTION ); + rOStm.WriteInt32( (sal_Int32) ( 28 + ( nStrLen + 1 ) ) ); rOStm << pAct->GetPoint(); - rOStm << (sal_Int32) pAct->GetIndex(); - rOStm << (sal_Int32) pAct->GetLen(); - rOStm << (sal_Int32) nStrLen; - rOStm << (sal_Int32) pAct->GetWidth(); + rOStm.WriteInt32( (sal_Int32) pAct->GetIndex() ); + rOStm.WriteInt32( (sal_Int32) pAct->GetLen() ); + rOStm.WriteInt32( (sal_Int32) nStrLen ); + rOStm.WriteInt32( (sal_Int32) pAct->GetWidth() ); rOStm.Write( aText.getStr(), nStrLen + 1 ); nCount++; } @@ -1772,8 +1772,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaBmpAction* pAct = (MetaBmpAction*) pAction; - rOStm << (sal_Int16) GDI_BITMAP_ACTION; - rOStm << (sal_Int32) 12; + rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION ); + rOStm.WriteInt32( (sal_Int32) 12 ); rOStm << pAct->GetPoint(); WriteDIB(pAct->GetBitmap(), rOStm, false, true); nCount++; @@ -1784,8 +1784,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction; - rOStm << (sal_Int16) GDI_BITMAPSCALE_ACTION; - rOStm << (sal_Int32) 20; + rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION ); + rOStm.WriteInt32( (sal_Int32) 20 ); rOStm << pAct->GetPoint(); rOStm << pAct->GetSize(); WriteDIB(pAct->GetBitmap(), rOStm, false, true); @@ -1797,8 +1797,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction; - rOStm << (sal_Int16) GDI_BITMAPSCALEPART_ACTION; - rOStm << (sal_Int32) 36; + rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION ); + rOStm.WriteInt32( (sal_Int32) 36 ); rOStm << pAct->GetDestPoint(); rOStm << pAct->GetDestSize(); rOStm << pAct->GetSrcPoint(); @@ -1813,8 +1813,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaBmpExAction* pAct = (MetaBmpExAction*) pAction; const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() ); - rOStm << (sal_Int16) GDI_BITMAP_ACTION; - rOStm << (sal_Int32) 12; + rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION ); + rOStm.WriteInt32( (sal_Int32) 12 ); rOStm << pAct->GetPoint(); WriteDIB(aBmp, rOStm, false, true); nCount++; @@ -1826,8 +1826,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction; const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() ); - rOStm << (sal_Int16) GDI_BITMAPSCALE_ACTION; - rOStm << (sal_Int32) 20; + rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION ); + rOStm.WriteInt32( (sal_Int32) 20 ); rOStm << pAct->GetPoint(); rOStm << pAct->GetSize(); WriteDIB(aBmp, rOStm, false, true); @@ -1840,8 +1840,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction; const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() ); - rOStm << (sal_Int16) GDI_BITMAPSCALEPART_ACTION; - rOStm << (sal_Int32) 36; + rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION ); + rOStm.WriteInt32( (sal_Int32) 36 ); rOStm << pAct->GetDestPoint(); rOStm << pAct->GetDestSize(); rOStm << pAct->GetSrcPoint(); @@ -1856,18 +1856,18 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, MetaGradientAction* pAct = (MetaGradientAction*) pAction; const Gradient& rGrad = pAct->GetGradient(); - rOStm << (sal_Int16) GDI_GRADIENT_ACTION; - rOStm << (sal_Int32) 46; + rOStm.WriteInt16( (sal_Int16) GDI_GRADIENT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 46 ); ImplWriteRect( rOStm, pAct->GetRect() ); - rOStm << (sal_Int16) rGrad.GetStyle(); + rOStm.WriteInt16( (sal_Int16) rGrad.GetStyle() ); ImplWriteColor( rOStm, rGrad.GetStartColor() ); ImplWriteColor( rOStm, rGrad.GetEndColor() ); - rOStm << (sal_Int16) rGrad.GetAngle(); - rOStm << (sal_Int16) rGrad.GetBorder(); - rOStm << (sal_Int16) rGrad.GetOfsX(); - rOStm << (sal_Int16) rGrad.GetOfsY(); - rOStm << (sal_Int16) rGrad.GetStartIntensity(); - rOStm << (sal_Int16) rGrad.GetEndIntensity(); + rOStm.WriteInt16( (sal_Int16) rGrad.GetAngle() ); + rOStm.WriteInt16( (sal_Int16) rGrad.GetBorder() ); + rOStm.WriteInt16( (sal_Int16) rGrad.GetOfsX() ); + rOStm.WriteInt16( (sal_Int16) rGrad.GetOfsY() ); + rOStm.WriteInt16( (sal_Int16) rGrad.GetStartIntensity() ); + rOStm.WriteInt16( (sal_Int16) rGrad.GetEndIntensity() ); nCount++; } break; @@ -1878,7 +1878,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm << (sal_Int16) GDI_GRADIENTEX_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_GRADIENTEX_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -1886,12 +1886,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write data rOStm << pA->GetPolyPolygon() << pA->GetGradient(); - rOStm << (sal_Int32) 0; // number of actions that follow this comment + rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) ); rOStm.Seek( nNewPos ); nCount++; @@ -1907,11 +1907,11 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, ImplWriteLineColor( rOStm, rColor, 1 ); ImplWriteFillColor( rOStm, rColor, 1 ); - rOStm << (sal_Int16) GDI_RECT_ACTION; - rOStm << (sal_Int32) 28; + rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION ); + rOStm.WriteInt32( (sal_Int32) 28 ); ImplWriteRect( rOStm, pAct->GetRect() ); - rOStm << (sal_Int32) 0; - rOStm << (sal_Int32) 0; + rOStm.WriteInt32( (sal_Int32) 0 ); + rOStm.WriteInt32( (sal_Int32) 0 ); ImplWritePopAction( rOStm ); nCount += 5; @@ -1924,18 +1924,18 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, const Region& rRegion = pAct->GetRegion(); Rectangle aClipRect; - rOStm << (sal_Int16) GDI_CLIPREGION_ACTION; - rOStm << (sal_Int32) 24; + rOStm.WriteInt16( (sal_Int16) GDI_CLIPREGION_ACTION ); + rOStm.WriteInt32( (sal_Int32) 24 ); if( pAct->IsClipping() ) { aClipRect = rRegion.GetBoundRect(); - rOStm << (sal_Int16) 1; + rOStm.WriteInt16( (sal_Int16) 1 ); } else - rOStm << (sal_Int16) 0; + rOStm.WriteInt16( (sal_Int16) 0 ); - rOStm << (sal_Int16) 0; + rOStm.WriteInt16( (sal_Int16) 0 ); ImplWriteRect( rOStm, aClipRect ); if( pAct->IsClipping() ) @@ -1949,8 +1949,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction; - rOStm << (sal_Int16) GDI_ISECTCLIPREGION_ACTION; - rOStm << (sal_Int32) 20; + rOStm.WriteInt16( (sal_Int16) GDI_ISECTCLIPREGION_ACTION ); + rOStm.WriteInt32( (sal_Int32) 20 ); rOStm << pAct->GetRect(); nCount++; } @@ -1960,10 +1960,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction; - rOStm << (sal_Int16) GDI_MOVECLIPREGION_ACTION; - rOStm << (sal_Int32) 12; - rOStm << (sal_Int32) pAct->GetHorzMove(); - rOStm << (sal_Int32) pAct->GetVertMove(); + rOStm.WriteInt16( (sal_Int16) GDI_MOVECLIPREGION_ACTION ); + rOStm.WriteInt32( (sal_Int32) 12 ); + rOStm.WriteInt32( (sal_Int32) pAct->GetHorzMove() ); + rOStm.WriteInt32( (sal_Int32) pAct->GetVertMove() ); nCount++; } break; @@ -2034,8 +2034,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { MetaMapModeAction* pAct = (MetaMapModeAction*) pAction; - rOStm << (sal_Int16) GDI_MAPMODE_ACTION; - rOStm << (sal_Int32) 30; + rOStm.WriteInt16( (sal_Int16) GDI_MAPMODE_ACTION ); + rOStm.WriteInt32( (sal_Int32) 30 ); ImplWriteMapMode( rOStm, pAct->GetMapMode() ); nCount++; } @@ -2133,7 +2133,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write transparence comment - rOStm << (sal_Int16) GDI_TRANSPARENT_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_TRANSPARENT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2141,13 +2141,13 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write comment data rOStm << rPolyPoly; - rOStm << nTrans; - rOStm << (sal_Int32) 15; // number of actions that follow this comment + rOStm.WriteInt16( nTrans ); + rOStm.WriteInt32( (sal_Int32) 15 ); // number of actions that follow this comment // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) ); rOStm.Seek( nNewPos ); { @@ -2194,7 +2194,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm << (sal_Int16) GDI_FLOATTRANSPARENT_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_FLOATTRANSPARENT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2206,7 +2206,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos + 4 ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos + 4 ) ); rOStm.Seek( ( nOldPos = nNewPos ) + 4 ); { @@ -2233,7 +2233,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, nAddCount = ImplWriteActions( rOStm, aMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet ); nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) nAddCount; + rOStm.WriteInt32( (sal_Int32) nAddCount ); rOStm.Seek( nNewPos ); nCount += nAddCount; @@ -2251,7 +2251,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos, nAddCount; // write hatch comment - rOStm << (sal_Int16) GDI_HATCH_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_HATCH_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2264,7 +2264,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos + 4 ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos + 4 ) ); rOStm.Seek( ( nOldPos = nNewPos ) + 4 ); { @@ -2276,7 +2276,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, nAddCount = ImplWriteActions( rOStm, aTmpMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet ); nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) nAddCount; + rOStm.WriteInt32( (sal_Int32) nAddCount ); rOStm.Seek( nNewPos ); nCount += nAddCount; @@ -2294,20 +2294,21 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm << (sal_Int16) GDI_REFPOINT_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_REFPOINT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); rOStm.SeekRel( 4 ); // write data - rOStm << rRefPoint << bSet; - rOStm << (sal_Int32) 0; // number of actions that follow this comment + rOStm << rRefPoint; + rOStm.WriteUChar( bSet ); + rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) ); rOStm.Seek( nNewPos ); nCount++; @@ -2322,20 +2323,21 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm << (sal_Int16) GDI_TEXTLINECOLOR_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_TEXTLINECOLOR_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); rOStm.SeekRel( 4 ); // write data - rOStm << rColor << bSet; - rOStm << (sal_Int32) 0; // number of actions that follow this comment + rOStm << rColor; + rOStm.WriteUChar( bSet ); + rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) ); rOStm.Seek( nNewPos ); nCount++; @@ -2352,22 +2354,21 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm << (sal_Int16) GDI_TEXTLINE_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_TEXTLINE_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); rOStm.SeekRel( 4 ); // write data - rOStm << rStartPt << nWidth << - static_cast<sal_uInt32>(eStrikeout) << - static_cast<sal_uInt32>(eUnderline); - rOStm << (sal_Int32) 0; // number of actions that follow this comment + rOStm << rStartPt; + rOStm.WriteInt32( nWidth ).WriteUInt32( static_cast<sal_uInt32>(eStrikeout) ).WriteUInt32( static_cast<sal_uInt32>(eUnderline) ); + rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) ); rOStm.Seek( nNewPos ); nCount++; @@ -2384,7 +2385,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, sal_uLong nOldPos, nNewPos; // write RefPoint comment - rOStm << (sal_Int16) GDI_COMMENT_COMMENT; + rOStm.WriteInt16( (sal_Int16) GDI_COMMENT_COMMENT ); // we'll write the ActionSize later nOldPos = rOStm.Tell(); @@ -2392,17 +2393,17 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, // write data write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, pA->GetComment()); - rOStm << pA->GetValue() << nDataSize; + rOStm.WriteInt32( pA->GetValue() ).WriteUInt32( nDataSize ); if( nDataSize ) rOStm.Write( pA->GetData(), nDataSize ); - rOStm << (sal_Int32) 0; // number of actions that follow this comment + rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment // calculate and write ActionSize of comment nNewPos = rOStm.Tell(); rOStm.Seek( nOldPos ); - rOStm << (sal_Int32) ( nNewPos - nOldPos ); + rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) ); rOStm.Seek( nNewPos ); nCount++; diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 85d0d9b7acbe..e7cfd64fbd8d 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -933,8 +933,8 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, bool bRLE4 ) rOStm.Write( pBuf, nBufCount ); } - rOStm << (sal_uInt8) 0; - rOStm << (sal_uInt8) 1; + rOStm.WriteUChar( (sal_uInt8) 0 ); + rOStm.WriteUChar( (sal_uInt8) 1 ); delete[] pBuf; @@ -1208,49 +1208,49 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess& aHeader.nColsUsed = ((!pAccAlpha && aHeader.nBitCount <= 8) ? rAcc.GetPaletteEntryCount() : 0); aHeader.nColsImportant = 0; - rOStm << aHeader.nSize; - rOStm << aHeader.nWidth; - rOStm << aHeader.nHeight; - rOStm << aHeader.nPlanes; - rOStm << aHeader.nBitCount; - rOStm << aHeader.nCompression; + rOStm.WriteUInt32( aHeader.nSize ); + rOStm.WriteInt32( aHeader.nWidth ); + rOStm.WriteInt32( aHeader.nHeight ); + rOStm.WriteUInt16( aHeader.nPlanes ); + rOStm.WriteUInt16( aHeader.nBitCount ); + rOStm.WriteUInt32( aHeader.nCompression ); nImageSizePos = rOStm.Tell(); rOStm.SeekRel( sizeof( aHeader.nSizeImage ) ); - rOStm << aHeader.nXPelsPerMeter; - rOStm << aHeader.nYPelsPerMeter; - rOStm << aHeader.nColsUsed; - rOStm << aHeader.nColsImportant; + rOStm.WriteInt32( aHeader.nXPelsPerMeter ); + rOStm.WriteInt32( aHeader.nYPelsPerMeter ); + rOStm.WriteUInt32( aHeader.nColsUsed ); + rOStm.WriteUInt32( aHeader.nColsImportant ); if(pAccAlpha) // only write DIBV5 when asked to do so { aHeader.nV5CSType = 0x57696E20; // LCS_WINDOWS_COLOR_SPACE aHeader.nV5Intent = 0x00000004; // LCS_GM_IMAGES - rOStm << aHeader.nV5RedMask; - rOStm << aHeader.nV5GreenMask; - rOStm << aHeader.nV5BlueMask; - rOStm << aHeader.nV5AlphaMask; - rOStm << aHeader.nV5CSType; - - rOStm << aHeader.aV5Endpoints.aXyzRed.aXyzX; - rOStm << aHeader.aV5Endpoints.aXyzRed.aXyzY; - rOStm << aHeader.aV5Endpoints.aXyzRed.aXyzZ; - rOStm << aHeader.aV5Endpoints.aXyzGreen.aXyzX; - rOStm << aHeader.aV5Endpoints.aXyzGreen.aXyzY; - rOStm << aHeader.aV5Endpoints.aXyzGreen.aXyzZ; - rOStm << aHeader.aV5Endpoints.aXyzBlue.aXyzX; - rOStm << aHeader.aV5Endpoints.aXyzBlue.aXyzY; - rOStm << aHeader.aV5Endpoints.aXyzBlue.aXyzZ; - - rOStm << aHeader.nV5GammaRed; - rOStm << aHeader.nV5GammaGreen; - rOStm << aHeader.nV5GammaBlue; - rOStm << aHeader.nV5Intent; - rOStm << aHeader.nV5ProfileData; - rOStm << aHeader.nV5ProfileSize; - rOStm << aHeader.nV5Reserved; + rOStm.WriteUInt32( aHeader.nV5RedMask ); + rOStm.WriteUInt32( aHeader.nV5GreenMask ); + rOStm.WriteUInt32( aHeader.nV5BlueMask ); + rOStm.WriteUInt32( aHeader.nV5AlphaMask ); + rOStm.WriteUInt32( aHeader.nV5CSType ); + + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzRed.aXyzX ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzRed.aXyzY ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzRed.aXyzZ ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzGreen.aXyzX ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzGreen.aXyzY ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzGreen.aXyzZ ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzBlue.aXyzX ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzBlue.aXyzY ); + rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzBlue.aXyzZ ); + + rOStm.WriteUInt32( aHeader.nV5GammaRed ); + rOStm.WriteUInt32( aHeader.nV5GammaGreen ); + rOStm.WriteUInt32( aHeader.nV5GammaBlue ); + rOStm.WriteUInt32( aHeader.nV5Intent ); + rOStm.WriteUInt32( aHeader.nV5ProfileData ); + rOStm.WriteUInt32( aHeader.nV5ProfileSize ); + rOStm.WriteUInt32( aHeader.nV5Reserved ); } if(ZCOMPRESS == aHeader.nCompression) @@ -1286,7 +1286,7 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess& nLastPos = rOStm.Tell(); nCodedSize = nLastPos - nCodedPos - 12; rOStm.Seek(nCodedPos); - rOStm << nCodedSize << nUncodedSize << nCompression; + rOStm.WriteUInt32( nCodedSize ).WriteUInt32( nUncodedSize ).WriteUInt32( nCompression ); rOStm.Seek(nLastPos); if(bRet) @@ -1306,7 +1306,7 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess& nEndPos = rOStm.Tell(); rOStm.Seek(nImageSizePos); - rOStm << aHeader.nSizeImage; + rOStm.WriteUInt32( aHeader.nSizeImage ); rOStm.Seek(nEndPos); return bRet; @@ -1317,11 +1317,11 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI const sal_uInt32 nPalCount((rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() : isBitfieldCompression(rAcc.GetScanlineFormat()) ? 3UL : 0UL)); const sal_uInt32 nOffset(14 + (bUseDIBV5 ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE) + nPalCount * 4UL); - rOStm << (sal_uInt16)0x4D42; // 'MB' from BITMAPFILEHEADER - rOStm << (sal_uInt32)(nOffset + (rAcc.Height() * rAcc.GetScanlineSize())); - rOStm << (sal_uInt16)0; - rOStm << (sal_uInt16)0; - rOStm << nOffset; + rOStm.WriteUInt16( (sal_uInt16)0x4D42 ); // 'MB' from BITMAPFILEHEADER + rOStm.WriteUInt32( (sal_uInt32)(nOffset + (rAcc.Height() * rAcc.GetScanlineSize())) ); + rOStm.WriteUInt16( (sal_uInt16)0 ); + rOStm.WriteUInt16( (sal_uInt16)0 ); + rOStm.WriteUInt32( nOffset ); return( rOStm.GetError() == 0UL ); } @@ -1550,9 +1550,9 @@ bool WriteDIBBitmapEx( { if(ImplWriteDIB(rSource.GetBitmap(), 0, rOStm, true, true)) { - rOStm << (sal_uInt32)0x25091962; - rOStm << (sal_uInt32)0xACB20201; - rOStm << (sal_uInt8)rSource.eTransparent; + rOStm.WriteUInt32( (sal_uInt32)0x25091962 ); + rOStm.WriteUInt32( (sal_uInt32)0xACB20201 ); + rOStm.WriteUChar( (sal_uInt8)rSource.eTransparent ); if(TRANSPARENT_BITMAP == rSource.eTransparent) { diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 9d0cee1650aa..492141d02b62 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -713,31 +713,31 @@ SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font ) rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() ); rOStm << rImpl_Font.maSize; - rOStm << (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ); - rOStm << (sal_uInt16) rImpl_Font.meFamily; - rOStm << (sal_uInt16) rImpl_Font.mePitch; - rOStm << (sal_uInt16) rImpl_Font.meWeight; - rOStm << (sal_uInt16) rImpl_Font.meUnderline; - rOStm << (sal_uInt16) rImpl_Font.meStrikeout; - rOStm << (sal_uInt16) rImpl_Font.meItalic; - rOStm << (sal_uInt16) rImpl_Font.maLanguageTag.getLanguageType( false); - rOStm << (sal_uInt16) rImpl_Font.meWidthType; - - rOStm << rImpl_Font.mnOrientation; - - rOStm << (sal_Bool) rImpl_Font.mbWordLine; - rOStm << (sal_Bool) rImpl_Font.mbOutline; - rOStm << (sal_Bool) rImpl_Font.mbShadow; - rOStm << (sal_uInt8) rImpl_Font.mnKerning; + rOStm.WriteUInt16( (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ) ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meFamily ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.mePitch ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meWeight ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meUnderline ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meStrikeout ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meItalic ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maLanguageTag.getLanguageType( false) ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meWidthType ); + + rOStm.WriteInt16( rImpl_Font.mnOrientation ); + + rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbWordLine ); + rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbOutline ); + rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbShadow ); + rOStm.WriteUChar( (sal_uInt8) rImpl_Font.mnKerning ); // new in version 2 - rOStm << (sal_uInt8) rImpl_Font.meRelief; - rOStm << (sal_uInt16) rImpl_Font.maCJKLanguageTag.getLanguageType( false); - rOStm << (sal_Bool) rImpl_Font.mbVertical; - rOStm << (sal_uInt16) rImpl_Font.meEmphasisMark; + rOStm.WriteUChar( (sal_uInt8) rImpl_Font.meRelief ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maCJKLanguageTag.getLanguageType( false) ); + rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbVertical ); + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meEmphasisMark ); // new in version 3 - rOStm << (sal_uInt16) rImpl_Font.meOverline; + rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meOverline ); return rOStm; } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 2e7417260c2f..6abda832bc90 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2847,10 +2847,10 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm ) pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 ); - rOStm << nStmCompressMode; + rOStm.WriteUInt32( nStmCompressMode ); rOStm << aPrefMapMode; rOStm << aPrefSize; - rOStm << (sal_uInt32) GetActionSize(); + rOStm.WriteUInt32( (sal_uInt32) GetActionSize() ); delete pCompat; diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 4dc576faa2b2..2bef53d0b3ba 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -274,7 +274,7 @@ SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink ) VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 ); // Version 1 - rOStream << (sal_uInt16) rGfxLink.GetType() << rGfxLink.GetDataSize() << rGfxLink.GetUserId(); + rOStream.WriteUInt16( (sal_uInt16) rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() ); // Version 2 rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode(); diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index 3d123bd4e1a1..9ad19b034010 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -310,16 +310,15 @@ SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImpl_Gradient ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - rOStm << (sal_uInt16) rImpl_Gradient.meStyle << - rImpl_Gradient.maStartColor << - rImpl_Gradient.maEndColor << - rImpl_Gradient.mnAngle << - rImpl_Gradient.mnBorder << - rImpl_Gradient.mnOfsX << - rImpl_Gradient.mnOfsY << - rImpl_Gradient.mnIntensityStart << - rImpl_Gradient.mnIntensityEnd << - rImpl_Gradient.mnStepCount; + rOStm.WriteUInt16( (sal_uInt16) rImpl_Gradient.meStyle ); + rOStm << rImpl_Gradient.maStartColor << rImpl_Gradient.maEndColor; + rOStm.WriteUInt16( rImpl_Gradient.mnAngle ) + .WriteUInt16( rImpl_Gradient.mnBorder ) + .WriteUInt16( rImpl_Gradient.mnOfsX ) + .WriteUInt16( rImpl_Gradient.mnOfsY ) + .WriteUInt16( rImpl_Gradient.mnIntensityStart ) + .WriteUInt16( rImpl_Gradient.mnIntensityEnd ) + .WriteUInt16( rImpl_Gradient.mnStepCount ); return rOStm; } diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 1a0190a4e91b..37c323c17591 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -142,18 +142,18 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass ) rClass.maPath.Write( rOStm ); rClass.maStartArrow.Write( rOStm ); rClass.maEndArrow.Write( rOStm ); - rOStm << rClass.mfTransparency; - rOStm << rClass.mfStrokeWidth; + rOStm.WriteDouble( rClass.mfTransparency ); + rOStm.WriteDouble( rClass.mfStrokeWidth ); sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maCapType ); - rOStm << nTmp; + rOStm.WriteUInt16( nTmp ); nTmp = sal::static_int_cast<sal_uInt16>( rClass.maJoinType ); - rOStm << nTmp; - rOStm << rClass.mfMiterLimit; + rOStm.WriteUInt16( nTmp ); + rOStm.WriteDouble( rClass.mfMiterLimit ); - rOStm << static_cast<sal_uInt32>(rClass.maDashArray.size()); + rOStm.WriteUInt32( static_cast<sal_uInt32>(rClass.maDashArray.size()) ); size_t i; for(i=0; i<rClass.maDashArray.size(); ++i) - rOStm << rClass.maDashArray[i]; + rOStm.WriteDouble( rClass.maDashArray[i] ); return rOStm; } @@ -293,24 +293,24 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass ) rClass.maPath.Write( rOStm ); rOStm << rClass.maFillColor; - rOStm << rClass.mfTransparency; + rOStm.WriteDouble( rClass.mfTransparency ); sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillRule ); - rOStm << nTmp; + rOStm.WriteUInt16( nTmp ); nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillType ); - rOStm << nTmp; + rOStm.WriteUInt16( nTmp ); int i; for(i=0; i<SvtGraphicFill::Transform::MatrixSize; ++i) - rOStm << rClass.maFillTransform.matrix[i]; + rOStm.WriteDouble( rClass.maFillTransform.matrix[i] ); nTmp = rClass.mbTiling; - rOStm << nTmp; + rOStm.WriteUInt16( nTmp ); nTmp = sal::static_int_cast<sal_uInt16>( rClass.maHatchType ); - rOStm << nTmp; + rOStm.WriteUInt16( nTmp ); rOStm << rClass.maHatchColor; nTmp = sal::static_int_cast<sal_uInt16>( rClass.maGradientType ); - rOStm << nTmp; + rOStm.WriteUInt16( nTmp ); rOStm << rClass.maGradient1stColor; rOStm << rClass.maGradient2ndColor; - rOStm << rClass.maGradientStepCount; + rOStm.WriteInt32( rClass.maGradientStepCount ); rOStm << rClass.maFillGraphic; return rOStm; diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index cf01b037d77d..d1867ce18600 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -137,9 +137,9 @@ SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - rOStm << (sal_uInt16) rImplHatch.meStyle << rImplHatch.maColor; + rOStm.WriteUInt16( (sal_uInt16) rImplHatch.meStyle ) << rImplHatch.maColor; //#fdo39428 SvStream no longer supports operator<<(long) - rOStm << sal::static_int_cast<sal_Int32>(rImplHatch.mnDistance) << rImplHatch.mnAngle; + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rImplHatch.mnDistance) ).WriteUInt16( rImplHatch.mnAngle ); return rOStm; } diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 5a3e3c0811af..96c12e2e7c6d 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -321,7 +321,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) { sal_uInt16 nLen = 0; if ( !rJobSetup.mpData ) - rOStream << nLen; + rOStream.WriteUInt16( nLen ); else { sal_uInt16 nSystem = JOBSET_FILE605_SYSTEM; @@ -346,8 +346,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 ); // nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen; int nPos = rOStream.Tell(); - rOStream << nLen; - rOStream << nSystem; + rOStream.WriteUInt16( nLen ); + rOStream.WriteUInt16( nSystem ); rOStream.Write( (char*)&aOldData, sizeof( aOldData ) ); rOStream.Write( (char*)&aOldJobData, nOldJobDataSize ); rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen ); @@ -375,7 +375,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) } nLen = sal::static_int_cast<sal_uInt16>(rOStream.Tell() - nPos); rOStream.Seek( nPos ); - rOStream << nLen; + rOStream.WriteUInt16( nLen ); rOStream.Seek( nPos + nLen ); } } diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index b0003268dae0..b7dc0f746feb 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -274,18 +274,18 @@ SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) //#fdo39428 SvStream no longer supports operator<<(long) // version 1 - rOStm << (sal_uInt16) rImplLineInfo.meStyle << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnWidth); + rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meStyle ).WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnWidth) ); // since version2 - rOStm << rImplLineInfo.mnDashCount << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDashLen); - rOStm << rImplLineInfo.mnDotCount << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDotLen); - rOStm << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDistance); + rOStm.WriteUInt16( rImplLineInfo.mnDashCount ).WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDashLen) ); + rOStm.WriteUInt16( rImplLineInfo.mnDotCount ).WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDotLen) ); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDistance) ); // since version3 - rOStm << (sal_uInt16) rImplLineInfo.meLineJoin; + rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meLineJoin ); // since version4 - rOStm << (sal_uInt16) rImplLineInfo.meLineCap; + rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meLineCap ); return rOStm; } diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 86302b527a65..8c1a53c914dc 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -59,11 +59,11 @@ SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rImplMapMode ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - rOStm << (sal_uInt16) rImplMapMode.meUnit << + rOStm.WriteUInt16( (sal_uInt16) rImplMapMode.meUnit ) << rImplMapMode.maOrigin << rImplMapMode.maScaleX << - rImplMapMode.maScaleY << - rImplMapMode.mbSimple; + rImplMapMode.maScaleY; + rOStm.WriteUChar( rImplMapMode.mbSimple ); return rOStm; } diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 5c23c6aa70d3..6b5fe5316b14 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -140,7 +140,7 @@ sal_Bool MetaAction::Compare( const MetaAction& ) const void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* ) { - rOStm << mnType; + rOStm.WriteUInt16( mnType ); } // ------------------------------------------------------------------------ @@ -588,7 +588,8 @@ sal_Bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << maRect << mnHorzRound << mnVertRound; + rOStm << maRect; + rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound ); } // ------------------------------------------------------------------------ @@ -967,7 +968,7 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm << maLineInfo; // Version 2 sal_uInt8 bHasPolyFlags = maPoly.HasFlags(); // Version 3 - rOStm << bHasPolyFlags; + rOStm.WriteUChar( bHasPolyFlags ); if ( bHasPolyFlags ) maPoly.Write( rOStm ); } @@ -1053,7 +1054,7 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm << aSimplePoly; sal_uInt8 bHasPolyFlags = maPoly.HasFlags(); // Version 2 - rOStm << bHasPolyFlags; + rOStm.WriteUChar( bHasPolyFlags ); if ( bHasPolyFlags ) maPoly.Write( rOStm ); } @@ -1135,7 +1136,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) sal_uInt16 i, nPolyCount = maPolyPoly.Count(); Polygon aSimplePoly; // Version 1 - rOStm << nPolyCount; + rOStm.WriteUInt16( nPolyCount ); for ( i = 0; i < nPolyCount; i++ ) { const Polygon& rPoly = maPolyPoly.GetObject( i ); @@ -1145,13 +1146,13 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) rOStm << aSimplePoly; } - rOStm << nNumberOfComplexPolygons; // Version 2 + rOStm.WriteUInt16( nNumberOfComplexPolygons ); // Version 2 for ( i = 0; nNumberOfComplexPolygons && ( i < nPolyCount ); i++ ) { const Polygon& rPoly = maPolyPoly.GetObject( i ); if ( rPoly.HasFlags() ) { - rOStm << i; + rOStm.WriteUInt16( i ); rPoly.Write( rOStm ); nNumberOfComplexPolygons--; @@ -1243,8 +1244,8 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); - rOStm << mnIndex; - rOStm << mnLen; + rOStm .WriteUInt16( mnIndex ); + rOStm .WriteUInt16( mnLen ); write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2 } @@ -1380,12 +1381,12 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maStartPt; rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); - rOStm << mnIndex; - rOStm << mnLen; - rOStm << nAryLen; + rOStm .WriteUInt16( mnIndex ); + rOStm .WriteUInt16( mnLen ); + rOStm .WriteUInt32( nAryLen ); for( sal_uLong i = 0UL; i < nAryLen; i++ ) - rOStm << mpDXAry[ i ]; + rOStm.WriteInt32( mpDXAry[ i ] ); write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2 } @@ -1517,9 +1518,9 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maPt; rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); - rOStm << mnWidth; - rOStm << mnIndex; - rOStm << mnLen; + rOStm .WriteUInt32( mnWidth ); + rOStm .WriteUInt16( mnIndex ); + rOStm .WriteUInt16( mnLen ); write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2 } @@ -1600,7 +1601,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) WRITE_BASE_COMPAT( rOStm, 2, pData ); rOStm << maRect; rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet ); - rOStm << mnStyle; + rOStm .WriteUInt16( mnStyle ); write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2 } @@ -1687,11 +1688,11 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) //#fdo39428 SvStream no longer supports operator<<(long) rOStm << maPos; - rOStm << sal::static_int_cast<sal_Int32>(mnWidth); - rOStm << static_cast<sal_uInt32>(meStrikeout); - rOStm << static_cast<sal_uInt32>(meUnderline); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnWidth) ); + rOStm.WriteUInt32( static_cast<sal_uInt32>(meStrikeout) ); + rOStm.WriteUInt32( static_cast<sal_uInt32>(meUnderline) ); // new in version 2 - rOStm << static_cast<sal_uInt32>(meOverline); + rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) ); } // ------------------------------------------------------------------------ @@ -2782,7 +2783,8 @@ sal_Bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << maRegion << mbClip; + rOStm << maRegion; + rOStm.WriteUChar( mbClip ); } // ------------------------------------------------------------------------ @@ -2974,7 +2976,7 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData { WRITE_BASE_COMPAT( rOStm, 1, pData ); //#fdo39428 SvStream no longer supports operator<<(long) - rOStm << sal::static_int_cast<sal_Int32>(mnHorzMove) << sal::static_int_cast<sal_Int32>(mnVertMove); + rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnHorzMove) ).WriteInt32( sal::static_int_cast<sal_Int32>(mnVertMove) ); } // ------------------------------------------------------------------------ @@ -3035,7 +3037,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, sal_True ); - rOStm << mbSet; + rOStm.WriteUChar( mbSet ); } // ------------------------------------------------------------------------ @@ -3093,7 +3095,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, sal_True ); - rOStm << mbSet; + rOStm.WriteUChar( mbSet ); } // ------------------------------------------------------------------------ @@ -3202,7 +3204,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, sal_True ); - rOStm << mbSet; + rOStm.WriteUChar( mbSet ); } // ------------------------------------------------------------------------ @@ -3260,7 +3262,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, sal_True ); - rOStm << mbSet; + rOStm.WriteUChar( mbSet ); } // ------------------------------------------------------------------------ @@ -3318,7 +3320,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); maColor.Write( rOStm, sal_True ); - rOStm << mbSet; + rOStm.WriteUChar( mbSet ); } // ------------------------------------------------------------------------ @@ -3370,7 +3372,7 @@ sal_Bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << (sal_uInt16) maAlign; + rOStm.WriteUInt16( (sal_uInt16) maAlign ); } // ------------------------------------------------------------------------ @@ -3560,7 +3562,7 @@ sal_Bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << mnFlags; + rOStm.WriteUInt16( mnFlags ); } // ------------------------------------------------------------------------ @@ -3645,7 +3647,7 @@ sal_Bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << (sal_uInt16) meRasterOp; + rOStm.WriteUInt16( (sal_uInt16) meRasterOp ); } // ------------------------------------------------------------------------ @@ -3729,7 +3731,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon); rOStm << aNoCurvePolyPolygon; - rOStm << mnTransPercent; + rOStm.WriteUInt16( mnTransPercent ); } // ------------------------------------------------------------------------ @@ -3944,7 +3946,8 @@ sal_Bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << maRefPoint << mbSet; + rOStm << maRefPoint; + rOStm.WriteUChar( mbSet ); } // ------------------------------------------------------------------------ @@ -4135,9 +4138,9 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) m21 *= fYScale; // prepare new data - aDest << nLeft << nTop << nRight << nBottom; - aDest << nPixX << nPixY << nMillX << nMillY; - aDest << m11 << m12 << m21 << m22 << mdx << mdy; + aDest.WriteInt32( nLeft ).WriteInt32( nTop ).WriteInt32( nRight ).WriteInt32( nBottom ); + aDest.WriteInt32( nPixX ).WriteInt32( nPixY ).WriteInt32( nMillX ).WriteInt32( nMillY ); + aDest.WriteFloat( m11 ).WriteFloat( m12 ).WriteFloat( m21 ).WriteFloat( m22 ).WriteFloat( mdx ).WriteFloat( mdy ); // save them ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() ); @@ -4162,7 +4165,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, maComment); - rOStm << mnValue << mnDataSize; + rOStm.WriteInt32( mnValue ).WriteUInt32( mnDataSize ); if ( mnDataSize ) rOStm.Write( mpData, mnDataSize ); @@ -4229,7 +4232,7 @@ sal_Bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << mnLayoutMode; + rOStm.WriteUInt32( mnLayoutMode ); } // ------------------------------------------------------------------------ @@ -4280,7 +4283,7 @@ sal_Bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { WRITE_BASE_COMPAT( rOStm, 1, pData ); - rOStm << meTextLanguage; + rOStm.WriteUInt16( meTextLanguage ); } // ------------------------------------------------------------------------ diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 0b1b00cf6c99..14e92f5a09a1 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10065,7 +10065,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const } SvMemoryStream* pStream = new SvMemoryStream; - *pStream << rDCTData; + pStream->WriteStream( rDCTData ); pStream->Seek( STREAM_SEEK_TO_END ); BitmapID aID; diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index f7c60860c67f..0e8160e02d91 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -238,8 +238,8 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) /* png signature is always an array of 8 bytes */ sal_uInt16 nOldMode = rOStm.GetNumberFormatInt(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); - rOStm << static_cast<sal_uInt32>(0x89504e47); - rOStm << static_cast<sal_uInt32>(0x0d0a1a0a); + rOStm.WriteUInt32( static_cast<sal_uInt32>(0x89504e47) ); + rOStm.WriteUInt32( static_cast<sal_uInt32>(0x0d0a1a0a) ); std::vector< vcl::PNGWriter::ChunkData >::iterator aBeg( maChunkSeq.begin() ); std::vector< vcl::PNGWriter::ChunkData >::iterator aEnd( maChunkSeq.end() ); @@ -253,11 +253,11 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) sal_uInt32 nDataSize = aBeg->aData.size(); if ( nDataSize ) nCRC = rtl_crc32( nCRC, &aBeg->aData[ 0 ], nDataSize ); - rOStm << nDataSize - << aBeg->nType; + rOStm.WriteUInt32( nDataSize ) + .WriteUInt32( aBeg->nType ); if ( nDataSize ) rOStm.Write( &aBeg->aData[ 0 ], nDataSize ); - rOStm << nCRC; + rOStm.WriteUInt32( nCRC ); ++aBeg; } rOStm.SetNumberFormatInt( nOldMode ); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index e2c4aebd1ad9..5ab65becab24 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -257,8 +257,8 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ) 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; + rOStream.WriteUInt32( rInfo.mnStatus ); + rOStream.WriteUInt32( rInfo.mnJobs ); return rOStream; } diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 3c1fee87e925..e013c1b6bc22 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1623,7 +1623,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion ) VersionCompat aCompat(rOStrm, STREAM_WRITE, nVersion); // put version - rOStrm << nVersion; + rOStrm.WriteUInt16( nVersion ); // put type enum RegionType { REGION_NULL, REGION_EMPTY, REGION_RECTANGLE, REGION_COMPLEX }; @@ -1655,7 +1655,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion ) aRegionType = REGION_RECTANGLE; } - rOStrm << (sal_uInt16)aRegionType; + rOStrm.WriteUInt16( (sal_uInt16)aRegionType ); // get RegionBand const RegionBand* pRegionBand = rRegion.getRegionBand(); @@ -1675,7 +1675,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion ) // write polypolygon if available const sal_Bool bHasPolyPolygon(rRegion.HasPolyPolygonOrB2DPolyPolygon()); - rOStrm << bHasPolyPolygon; + rOStrm.WriteUChar( bHasPolyPolygon ); if(bHasPolyPolygon) { diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 9e07a12e6fc3..a1366adbadd5 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -269,9 +269,9 @@ void RegionBand::save(SvStream& rOStrm) const while(pBand) { // put boundaries - rOStrm << (sal_uInt16)STREAMENTRY_BANDHEADER; - rOStrm << static_cast<sal_Int32>(pBand->mnYTop); - rOStrm << static_cast<sal_Int32>(pBand->mnYBottom); + rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_BANDHEADER ); + rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYTop) ); + rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYBottom) ); // put separations of current band ImplRegionBandSep* pSep = pBand->mpFirstSep; @@ -279,9 +279,9 @@ void RegionBand::save(SvStream& rOStrm) const while(pSep) { // put separation - rOStrm << (sal_uInt16)STREAMENTRY_SEPARATION; - rOStrm << static_cast<sal_Int32>(pSep->mnXLeft); - rOStrm << static_cast<sal_Int32>(pSep->mnXRight); + rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_SEPARATION ); + rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXLeft) ); + rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXRight) ); // next separation from current band pSep = pSep->mpNextSep; @@ -291,7 +291,7 @@ void RegionBand::save(SvStream& rOStrm) const } // put endmarker - rOStrm << (sal_uInt16)STREAMENTRY_END; + rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_END ); } bool RegionBand::isSingleRectangle() const diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 1b006559b9b7..0dad0148f842 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -161,10 +161,11 @@ SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ) sal_Bool bDummy = sal_False; // version 1 - rOStm << rImplWallpaper.maColor << (sal_uInt16) rImplWallpaper.meStyle; + rOStm << rImplWallpaper.maColor; + rOStm.WriteUInt16( (sal_uInt16) rImplWallpaper.meStyle ); // version 2 - rOStm << bRect << bGrad << bBmp << bDummy << bDummy << bDummy; + rOStm.WriteUChar( bRect ).WriteUChar( bGrad ).WriteUChar( bBmp ).WriteUChar( bDummy ).WriteUChar( bDummy ).WriteUChar( bDummy ); if( bRect ) rOStm << *rImplWallpaper.mpRect; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 5db691528df0..6568b8cfef09 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -680,7 +680,7 @@ int RTFDocumentImpl::resolvePict(bool bInline) count--; if (!count) { - aStream << (char)b; + aStream.WriteChar( (char)b ); count = 2; b = 0; } @@ -890,11 +890,11 @@ int RTFDocumentImpl::resolveChars(char ch) if (m_aStates.top().nInternalState == INTERNAL_BIN) { m_pBinaryData.reset(new SvMemoryStream()); - *m_pBinaryData << ch; + m_pBinaryData->WriteChar( ch ); for (int i = 0; i < m_aStates.top().nBinaryToRead - 1; ++i) { Strm() >> ch; - *m_pBinaryData << ch; + m_pBinaryData->WriteChar( ch ); } m_aStates.top().nInternalState = INTERNAL_NORMAL; return 0; @@ -4173,7 +4173,7 @@ int RTFDocumentImpl::popState() count--; if (!count) { - *m_pObjectData << (char)b; + m_pObjectData->WriteChar( (char)b ); count = 2; b = 0; } |