diff options
117 files changed, 536 insertions, 483 deletions
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 7ee860cc0d9b..1fbd1760b793 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -292,7 +292,7 @@ void ChartController::executeDispatch_Paste() // graphic exchange format (graphic manager bitmap format?) SotStorageStreamRef xStm; if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_SVXB, xStm )) - (*xStm) >> aGraphic; + ReadGraphic( *xStm, aGraphic ); } else if( aDataHelper.HasFormat( FORMAT_GDIMETAFILE )) { diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index d09ed1c1f62f..1d76ed703f45 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -147,7 +147,7 @@ static float GetSwapFloat( SvStream& rSt ) } #endif - friend SvStream& operator>>( SvStream& rIn, XForm& rXForm ) + friend SvStream& ReadXForm( SvStream& rIn, XForm& rXForm ) { if ( sizeof( float ) != 4 ) { diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 0160a4ddfff6..48e0cd36dd96 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -479,7 +479,7 @@ namespace cppcanvas if (additionalFlags & 0x02) { SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation"); - s >> transformation; + ReadXForm( s, transformation ); hasTransformation = true; SAL_INFO("cppcanvas.emf", "EMF+\tm11: " << transformation.eM11 << " m12: " << transformation.eM12 << @@ -557,7 +557,7 @@ namespace cppcanvas if (additionalFlags & 0x02) { SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation"); - s >> transformation; + ReadXForm( s, transformation ); hasTransformation = true; SAL_INFO("cppcanvas.emf", "EMF+\tm11: " << transformation.eM11 << " m12: " << transformation.eM12 << @@ -846,7 +846,7 @@ namespace cppcanvas " additional flags: 0x" << penFlags << " unknown: 0x" << unknown2 << " width: " << std::dec << width ); if (penFlags & 1) - s >> transformation; + ReadXForm( s, transformation ); if (penFlags & 2) { @@ -2089,7 +2089,7 @@ namespace cppcanvas case EmfPlusRecordTypeSetWorldTransform: { SAL_INFO("cppcanvas.emf", "EMF+ SetWorldTransform"); XForm transform; - rMF >> transform; + ReadXForm( rMF, transform ); aWorldTransform.Set (transform); SAL_INFO("cppcanvas.emf", "EMF+\tm11: " << aWorldTransform.eM11 << "\tm12: " << aWorldTransform.eM12 << @@ -2104,7 +2104,7 @@ namespace cppcanvas case EmfPlusRecordTypeMultiplyWorldTransform: { SAL_INFO("cppcanvas.emf", "EMF+ MultiplyWorldTransform"); XForm transform; - rMF >> transform; + ReadXForm( rMF, transform ); SAL_INFO("cppcanvas.emf", "EMF+\tmatrix m11: " << transform.eM11 << "m12: " << transform.eM12 << @@ -2209,7 +2209,7 @@ namespace cppcanvas XForm transform; if( hasMatrix ) { - rMF >> transform; + ReadXForm( rMF, transform ); SAL_INFO("cppcanvas.emf", "EMF+\tmatrix: " << transform.eM11 << ", " << transform.eM12 << ", " << transform.eM21 << ", " << transform.eM22 << ", " << transform.eDx << ", " << transform.eDy); } diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 9b65a41b416f..d5ec5425ccae 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1661,7 +1661,7 @@ namespace cppcanvas SvMemoryStream aMemStm( (void*)pData, pAct->GetDataSize(), STREAM_READ ); SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); // TODO(P2): Also handle gradients and // hatches like this @@ -1792,7 +1792,7 @@ namespace cppcanvas rMF >> nPixX >> nPixY >> nMmX >> nMmY; SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY); - rMF >> aBaseTransform; + ReadXForm( rMF, aBaseTransform ); //aWorldTransform.Set (aBaseTransform); } } diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index e50392867be9..2fc48d115dd6 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -70,7 +70,7 @@ namespace dbaui inline bool IsReadOnly() const { return m_bReadOnly; } friend SvStream& WriteOTableRow( SvStream& rStr,const OTableRow& _rRow ); - friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow ); + friend SvStream& ReadOTableRow( SvStream& rStr, OTableRow& _rRow ); }; } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 7f5cc4474f28..cfd9259a9b37 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -817,7 +817,7 @@ void OTableEditorCtrl::InsertRows( long nRow ) for(sal_Int32 i=0;i < nSize;++i) { pRow.reset(new OTableRow()); - (*aStreamRef) >> *pRow; + ReadOTableRow( *aStreamRef, *pRow ); pRow->SetReadOnly( false ); sal_Int32 nType = pRow->GetActFieldDescr()->GetType(); if ( pRow->GetActFieldDescr() ) diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index f996447c49e1..a53f69f0660d 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -136,7 +136,7 @@ namespace dbaui _rStr.WriteInt32( (sal_Int32)0 ); return _rStr; } - SvStream& operator>>( SvStream& _rStr, OTableRow& _rRow ) + SvStream& ReadOTableRow( SvStream& _rStr, OTableRow& _rRow ) { _rStr >> _rRow.m_nPos; sal_Int32 nValue = 0; diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 321907f9c5cd..d7af9a2e584b 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -65,7 +65,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer ) { Font aFont; Color aColor; - rStream >> aColor; aFont.SetColor( aColor ); + ReadColor( rStream, aColor ); aFont.SetColor( aColor ); sal_uInt16 nTemp; rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp); diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 213fd8bff71b..8c7c25c8ba85 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -125,7 +125,7 @@ namespace sal_uInt16 nOutline, nInline, nDistance; sal_uInt16 nStyle = NONE; Color aColor; - stream >> aColor >> nOutline >> nInline >> nDistance; + ReadColor( stream, aColor ) >> nOutline >> nInline >> nDistance; if (version >= BORDER_LINE_WITH_STYLE_VERSION) stream >> nStyle; @@ -1571,7 +1571,9 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const Color aFillColor; sal_Int8 nStyle; rStrm >> cLoc >> _nWidth - >> bTrans >> aColor >> aFillColor >> nStyle; + >> bTrans; + ReadColor( rStrm, aColor ); + ReadColor( rStrm, aFillColor ) >> nStyle; aColor.SetTransparency(bTrans ? 0xff : 0); return new SvxShadowItem( Which(), &aColor, _nWidth, (SvxShadowLocation)cLoc ); } @@ -2690,7 +2692,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const break; short nOutline, nInline, nDistance; Color aColor; - rStrm >> aColor >> nOutline >> nInline >> nDistance; + ReadColor( rStrm, aColor ) >> nOutline >> nInline >> nDistance; SvxBorderLine aBorder( &aColor ); aBorder.GuessLinesWidths(NONE, nOutline, nInline, nDistance); @@ -3319,7 +3321,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const short nOutline, nInline, nDistance; Color aColor; - rStrm >> aColor >> nOutline >> nInline >> nDistance; + ReadColor( rStrm, aColor ) >> nOutline >> nInline >> nDistance; if( nOutline ) { SvxBorderLine aLine( &aColor ); @@ -3477,8 +3479,8 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, sal_Int8 nStyle; rStream >> bTrans; - rStream >> aTempColor; - rStream >> aTempFillColor; + ReadColor( rStream, aTempColor ); + ReadColor( rStream, aTempFillColor ); rStream >> nStyle; switch ( nStyle ) @@ -3538,7 +3540,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion, { Graphic aGraphic; - rStream >> aGraphic; + ReadGraphic( rStream, aGraphic ); pImpl->pGraphicObject = new GraphicObject( aGraphic ); if( SVSTREAM_FILEFORMAT_ERROR == rStream.GetError() ) diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx index 47bf1e061af5..528142cd9066 100644 --- a/editeng/source/items/numitem.cxx +++ b/editeng/source/items/numitem.cxx @@ -214,12 +214,12 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream ) if ( hasBulletFont ) { pBulletFont = new Font( ); - rStream >> *pBulletFont; + ReadFont( rStream, *pBulletFont ); } else pBulletFont = NULL; - rStream >> aGraphicSize; + ReadPair( rStream, aGraphicSize ); - rStream >> nBulletColor; + ReadColor( rStream, nBulletColor ); rStream >> nBulletRelSize; rStream >> nTmp16; SetShowSymbol( nTmp16 ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 28f5f07a10ca..ca05faec0fcd 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1936,7 +1936,7 @@ SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) : SfxPoolItem( nId ) { Color aColor; - rStrm >> aColor; + ReadColor( rStrm, aColor ); mColor = aColor; } @@ -2093,7 +2093,8 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const { sal_uInt8 cSet; Color aColor; - rStrm >> cSet >> aColor; + rStrm >> cSet; + ReadColor( rStrm, aColor ); return new SvxCharSetColorItem( aColor, (rtl_TextEncoding)cSet, Which() ); } diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 482ab75d26ef..c7872750a61d 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1662,7 +1662,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); // read the fill info - aMemStm >> aFilling; + ReadSvtGraphicFill( aMemStm, aFilling ); // if impl_writeFilling can handle this high level filling, it returns true and we // skip all meta actions until "XPATHFILL_SEQ_END" @@ -1692,7 +1692,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf ) SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); // read the fill info - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); // if impl_writeStroke can handle this high level stroke, it returns true and we // skip all meta actions until "XPATHSTROKE_SEQ_END" diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 07864762af68..05283165fcf8 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -1252,7 +1252,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { sSeqEnd = "XPATHSTROKE_SEQ_END"; SvtGraphicStroke aStroke; - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); Polygon aPath; aStroke.getPath( aPath ); @@ -1288,7 +1288,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { sSeqEnd = "XPATHFILL_SEQ_END"; SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); switch( aFill.getFillType() ) { case SvtGraphicFill::fillSolid : diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index a3c81cc80d47..206d66369c0e 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -150,7 +150,7 @@ class CGM sal_Bool IsFinished() const { return mbIsFinished; }; sal_Bool Write( SvStream& rIStm ); - friend SvStream& operator>>( SvStream& rOStm, CGM& rCGM ); + friend SvStream& ReadCGM( SvStream& rOStm, CGM& rCGM ); }; #endif diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index dbc3316c79c1..695ecde7f4d6 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1093,7 +1093,7 @@ DffPropSet::~DffPropSet() void DffPropSet::ReadPropSet( SvStream& rIn, bool bSetUninitializedOnly ) { DffRecordHeader aHd; - rIn >> aHd; + ReadDffRecordHeader( rIn, aHd ); if ( !bSetUninitializedOnly ) { @@ -1213,7 +1213,7 @@ void DffPropSet::ReadPropSet( SvStream& rIn, bool bSetUninitializedOnly ) aHd.SeekToEndOfRecord( rIn ); } -SvStream& operator>>( SvStream& rIn, DffPropSet& rRec ) +SvStream& ReadDffPropSet( SvStream& rIn, DffPropSet& rRec ) { rRec.ReadPropSet( rIn, false ); return rIn; diff --git a/filter/source/msfilter/dffrecordheader.cxx b/filter/source/msfilter/dffrecordheader.cxx index 74c2c8566456..3d9bae91cefa 100644 --- a/filter/source/msfilter/dffrecordheader.cxx +++ b/filter/source/msfilter/dffrecordheader.cxx @@ -19,7 +19,7 @@ #include <filter/msfilter/dffrecordheader.hxx> -SvStream& operator>>( SvStream& rIn, DffRecordHeader& rRec ) +SvStream& ReadDffRecordHeader( SvStream& rIn, DffRecordHeader& rRec ) { rRec.nFilePos = rIn.Tell(); sal_uInt16 nTmp(0); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 7c50cf5f6551..7e6c7f3c3c6e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -212,13 +212,13 @@ void DffPropertyReader::SetDefaultPropSet( SvStream& rStCtrl, sal_uInt32 nOffsDg sal_uInt32 nMerk = rStCtrl.Tell(); rStCtrl.Seek( nOffsDgg ); DffRecordHeader aRecHd; - rStCtrl >> aRecHd; + ReadDffRecordHeader( rStCtrl, aRecHd ); if ( aRecHd.nRecType == DFF_msofbtDggContainer ) { if ( rManager.SeekToRec( rStCtrl, DFF_msofbtOPT, aRecHd.GetRecEndFilePos() ) ) { ( (DffPropertyReader*) this )->pDefaultPropSet = new DffPropSet; - rStCtrl >> *pDefaultPropSet; + ReadDffPropSet( rStCtrl, *pDefaultPropSet ); } } rStCtrl.Seek( nMerk ); @@ -231,14 +231,14 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const #endif { sal_uLong nFilePos = rIn.Tell(); - rIn >> (DffPropertyReader&)*this; + ReadDffPropSet( rIn, (DffPropertyReader&)*this ); if ( IsProperty( DFF_Prop_hspMaster ) ) { if ( rManager.SeekToShape( rIn, pClientData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) { DffRecordHeader aRecHd; - rIn >> aRecHd; + ReadDffRecordHeader( rIn, aRecHd ); if ( rManager.SeekToRec( rIn, DFF_msofbtOPT, aRecHd.GetRecEndFilePos() ) ) { rIn |= (DffPropertyReader&)*this; @@ -391,16 +391,16 @@ SvxMSDffSolverContainer::~SvxMSDffSolverContainer() aCList.clear(); } -SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rContainer ) +SvStream& ReadSvxMSDffSolverContainer( SvStream& rIn, SvxMSDffSolverContainer& rContainer ) { DffRecordHeader aHd; - rIn >> aHd; + ReadDffRecordHeader( rIn, aHd ); if ( aHd.nRecType == DFF_msofbtSolverContainer ) { DffRecordHeader aCRule; while ( ( rIn.GetError() == 0 ) && ( rIn.Tell() < aHd.GetRecEndFilePos() ) ) { - rIn >> aCRule; + ReadDffRecordHeader( rIn, aCRule ); if ( aCRule.nRecType == DFF_msofbtConnectorRule ) { SvxMSDffConnectorRule* pRule = new SvxMSDffConnectorRule; @@ -2881,7 +2881,7 @@ void DffRecordManager::Consume( SvStream& rIn, sal_Bool bAppend, sal_uInt32 nStO if ( !nStOfs ) { DffRecordHeader aHd; - rIn >> aHd; + ReadDffRecordHeader( rIn, aHd ); if ( aHd.nRecVer == DFF_PSFLAG_CONTAINER ) nStOfs = aHd.GetRecEndFilePos(); } @@ -2894,7 +2894,7 @@ void DffRecordManager::Consume( SvStream& rIn, sal_Bool bAppend, sal_uInt32 nStO { if ( pCList->nCount == DFF_RECORD_MANAGER_BUF_SIZE ) pCList = new DffRecordList( pCList ); - rIn >> pCList->mHd[ pCList->nCount ]; + ReadDffRecordHeader( rIn, pCList->mHd[ pCList->nCount ] ); bool bSeekSucceeded = pCList->mHd[ pCList->nCount++ ].SeekToEndOfRecord(rIn); if (!bSeekSucceeded) break; @@ -3154,12 +3154,12 @@ sal_Bool SvxMSDffManager::SeekToShape( SvStream& rSt, void* /* pClientData */, s sal_IntPtr nOfs = it->second; rSt.Seek( nOfs ); DffRecordHeader aEscherF002Hd; - rSt >> aEscherF002Hd; + ReadDffRecordHeader( rSt, aEscherF002Hd ); sal_uLong nEscherF002End = aEscherF002Hd.GetRecEndFilePos(); DffRecordHeader aEscherObjListHd; while (rSt.good() && rSt.Tell() < nEscherF002End) { - rSt >> aEscherObjListHd; + ReadDffRecordHeader( rSt, aEscherObjListHd ); if ( aEscherObjListHd.nRecVer != 0xf ) aEscherObjListHd.SeekToEndOfRecord( rSt ); else if ( aEscherObjListHd.nRecType == DFF_msofbtSpContainer ) @@ -3193,7 +3193,7 @@ bool SvxMSDffManager::SeekToRec( SvStream& rSt, sal_uInt16 nRecId, sal_uLong nMa DffRecordHeader aHd; do { - rSt >> aHd; + ReadDffRecordHeader( rSt, aHd ); if (!rSt.good()) break; if (aHd.nRecLen > nMaxLegalDffRecordLength) @@ -3231,7 +3231,7 @@ bool SvxMSDffManager::SeekToRec2( sal_uInt16 nRecId1, sal_uInt16 nRecId2, sal_uL DffRecordHeader aHd; do { - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); if ( aHd.nRecType == nRecId1 || aHd.nRecType == nRecId2 ) { if ( nSkipCount ) @@ -3515,13 +3515,13 @@ Color SvxMSDffManager::MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nConte void SvxMSDffManager::ReadObjText( SvStream& rStream, SdrObject* pObj ) { DffRecordHeader aRecHd; - rStream >> aRecHd; + ReadDffRecordHeader( rStream, aRecHd ); if( aRecHd.nRecType == DFF_msofbtClientTextbox || aRecHd.nRecType == 0x1022 ) { while( rStream.GetError() == 0 && rStream.Tell() < aRecHd.GetRecEndFilePos() ) { DffRecordHeader aHd; - rStream >> aHd; + ReadDffRecordHeader( rStream, aHd ); switch( aHd.nRecType ) { case DFF_PST_TextBytesAtom: @@ -3724,7 +3724,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons */ rObjData.rSpHd.SeekToEndOfRecord( rSt ); DffRecordHeader aHd; - rSt >> aHd; + ReadDffRecordHeader( rSt, aHd ); if( DFF_msofbtBSE == aHd.nRecType ) { const sal_uLong nSkipBLIPLen = 20; @@ -3947,7 +3947,7 @@ SdrObject* SvxMSDffManager::ImportObj( SvStream& rSt, void* pClientData, { SdrObject* pRet = NULL; DffRecordHeader aObjHd; - rSt >> aObjHd; + ReadDffRecordHeader( rSt, aObjHd ); if ( aObjHd.nRecType == DFF_msofbtSpgrContainer ) { pRet = ImportGroup( aObjHd, rSt, pClientData, rClientRect, rGlobalChildRect, nCalledByGroup, pShapeId ); @@ -3973,7 +3973,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r return pRet; DffRecordHeader aRecHd; // the first atom has to be the SpContainer for the GroupObject - rSt >> aRecHd; + ReadDffRecordHeader( rSt, aRecHd ); if ( aRecHd.nRecType == DFF_msofbtSpContainer ) { mnFix16Angle = 0; @@ -4013,7 +4013,7 @@ SdrObject* SvxMSDffManager::ImportGroup( const DffRecordHeader& rHd, SvStream& r while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) ) { DffRecordHeader aRecHd2; - rSt >> aRecHd2; + ReadDffRecordHeader( rSt, aRecHd2 ); if ( aRecHd2.nRecType == DFF_msofbtSpgrContainer ) { Rectangle aGroupClientAnchor, aGroupChildAnchor; @@ -4730,17 +4730,17 @@ Rectangle SvxMSDffManager::GetGlobalChildAnchor( const DffRecordHeader& rHd, SvS while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) ) { DffRecordHeader aShapeHd; - rSt >> aShapeHd; + ReadDffRecordHeader( rSt, aShapeHd ); if ( ( aShapeHd.nRecType == DFF_msofbtSpContainer ) || ( aShapeHd.nRecType == DFF_msofbtSpgrContainer ) ) { DffRecordHeader aShapeHd2( aShapeHd ); if ( aShapeHd.nRecType == DFF_msofbtSpgrContainer ) - rSt >> aShapeHd2; + ReadDffRecordHeader( rSt, aShapeHd2 ); while( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aShapeHd2.GetRecEndFilePos() ) ) { DffRecordHeader aShapeAtom; - rSt >> aShapeAtom; + ReadDffRecordHeader( rSt, aShapeAtom ); if ( aShapeAtom.nRecType == DFF_msofbtClientAnchor ) { @@ -4807,17 +4807,17 @@ void SvxMSDffManager::GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt DffRecordHeader aShapeHd; while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < rHd.GetRecEndFilePos() ) ) { - rSt >> aShapeHd; + ReadDffRecordHeader( rSt, aShapeHd ); if ( ( aShapeHd.nRecType == DFF_msofbtSpContainer ) || ( aShapeHd.nRecType == DFF_msofbtSpgrContainer ) ) { DffRecordHeader aShapeHd2( aShapeHd ); if ( aShapeHd.nRecType == DFF_msofbtSpgrContainer ) - rSt >> aShapeHd2; + ReadDffRecordHeader( rSt, aShapeHd2 ); while( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aShapeHd2.GetRecEndFilePos() ) ) { DffRecordHeader aShapeAtom; - rSt >> aShapeAtom; + ReadDffRecordHeader( rSt, aShapeAtom ); if ( aShapeAtom.nRecType == DFF_msofbtChildAnchor ) { sal_Int32 l, o, r, u; @@ -5556,12 +5556,12 @@ void SvxMSDffManager::SetDgContainer( SvStream& rSt ) { sal_uInt32 nFilePos = rSt.Tell(); DffRecordHeader aDgContHd; - rSt >> aDgContHd; + ReadDffRecordHeader( rSt, aDgContHd ); // insert this container only if there is also a DgAtom if ( SeekToRec( rSt, DFF_msofbtDg, aDgContHd.GetRecEndFilePos() ) ) { DffRecordHeader aRecHd; - rSt >> aRecHd; + ReadDffRecordHeader( rSt, aRecHd ); sal_uInt32 nDrawingId = aRecHd.nRecInstance; maDgOffsetTable[ nDrawingId ] = nFilePos; rSt.Seek( nFilePos ); @@ -5578,7 +5578,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) if (nOffsDggL == rStCtrl.Seek(nOffsDggL)) { DffRecordHeader aRecHd; - rStCtrl >> aRecHd; + ReadDffRecordHeader( rStCtrl, aRecHd ); DffRecordHeader aDggAtomHd; if ( SeekToRec( rStCtrl, DFF_msofbtDgg, aRecHd.GetRecEndFilePos(), &aDggAtomHd ) ) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 18e380df0bc3..da8cf92ea580 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -154,10 +154,10 @@ PowerPointImportParam::PowerPointImportParam( SvStream& rDocStrm, sal_uInt32 nFl { } -SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom ) +SvStream& ReadPptCurrentUserAtom( SvStream& rIn, PptCurrentUserAtom& rAtom ) { DffRecordHeader aHd; - rIn >> aHd; + ReadDffRecordHeader( rIn, aHd ); if ( aHd.nRecType == PPT_PST_CurrentUserAtom ) { sal_uInt32 nLen; @@ -181,10 +181,10 @@ void PptSlidePersistAtom::Clear() nReserved = nPsrReference = nFlags = nNumberTexts = nSlideId = 0; } -SvStream& operator>>( SvStream& rIn, PptSlidePersistAtom& rAtom ) +SvStream& ReadPptSlidePersistAtom( SvStream& rIn, PptSlidePersistAtom& rAtom ) { DffRecordHeader aHd; - rIn >> aHd + ReadDffRecordHeader( rIn, aHd ) >> rAtom.nPsrReference >> rAtom.nFlags >> rAtom.nNumberTexts @@ -202,7 +202,7 @@ sal_uInt16 PptSlidePersistList::FindPage(sal_uInt32 nId) const return PPTSLIDEPERSIST_ENTRY_NOTFOUND; } -SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ) +SvStream& ReadPptInteractiveInfoAtom( SvStream& rIn, PptInteractiveInfoAtom& rAtom ) { rIn >> rAtom.nSoundRef >> rAtom.nExHyperlinkId @@ -217,7 +217,7 @@ SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ) return rIn; } -SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom ) +SvStream& ReadPptExOleObjAtom( SvStream& rIn, PptExOleObjAtom& rAtom ) { sal_uInt32 nDummy1; sal_uInt32 nDummy2; @@ -237,7 +237,7 @@ Size PptDocumentAtom::GetPageSize(const Size& rSiz) const return rSiz; } -SvStream& operator>>(SvStream& rIn, PptDocumentAtom& rAtom) +SvStream& ReadPptDocumentAtom(SvStream& rIn, PptDocumentAtom& rAtom) { // Actual format: // 00 aSlidePageSizeXY 8 @@ -257,7 +257,7 @@ SvStream& operator>>(SvStream& rIn, PptDocumentAtom& rAtom) sal_uInt16 nSlidePageFormat; sal_Int8 nEmbeddedTrueType, nTitlePlaceHoldersOmitted, nRightToLeft, nShowComments; - rIn >> aHd + ReadDffRecordHeader( rIn, aHd ) >> nSlideX >> nSlideY >> nNoticeX >> nNoticeY >> nDummy >> nDummy // skip ZoomRation @@ -289,19 +289,19 @@ void PptSlideLayoutAtom::Clear() aPlaceholderId[ i ] = 0; } -SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom ) +SvStream& ReadPptSlideLayoutAtom( SvStream& rIn, PptSlideLayoutAtom& rAtom ) { rIn >> rAtom.eLayout; rIn.Read( rAtom.aPlaceholderId, 8 ); return rIn; } -SvStream& operator>>( SvStream& rIn, PptSlideAtom& rAtom ) +SvStream& ReadPptSlideAtom( SvStream& rIn, PptSlideAtom& rAtom ) { DffRecordHeader aHd; - rIn >> aHd - >> rAtom.aLayout - >> rAtom.nMasterId + ReadDffRecordHeader( rIn, aHd ); + ReadPptSlideLayoutAtom( rIn, rAtom.aLayout ); + rIn >> rAtom.nMasterId >> rAtom.nNotesId >> rAtom.nFlags; aHd.SeekToEndOfRecord( rIn ); @@ -314,10 +314,10 @@ void PptSlideAtom::Clear() nFlags = 0; } -SvStream& operator>>( SvStream& rIn, PptNotesAtom& rAtom ) +SvStream& ReadPptNotesAtom( SvStream& rIn, PptNotesAtom& rAtom ) { DffRecordHeader aHd; - rIn >> aHd + ReadDffRecordHeader( rIn, aHd ) >> rAtom.nSlideId >> rAtom.nFlags; aHd.SeekToEndOfRecord( rIn ); @@ -348,19 +348,19 @@ Color PptColorSchemeAtom::GetColor( sal_uInt16 nNum ) const return aRetval; } -SvStream& operator>>( SvStream& rIn, PptColorSchemeAtom& rAtom ) +SvStream& ReadPptColorSchemeAtom( SvStream& rIn, PptColorSchemeAtom& rAtom ) { DffRecordHeader aHd; - rIn >> aHd; + ReadDffRecordHeader( rIn, aHd ); rIn.Read( rAtom.aData, 32 ); aHd.SeekToEndOfRecord( rIn ); return rIn; } -SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom ) +SvStream& ReadPptFontEntityAtom( SvStream& rIn, PptFontEntityAtom& rAtom ) { DffRecordHeader aHd; - rIn >> aHd; + ReadDffRecordHeader( rIn, aHd ); sal_Unicode nTemp, cData[ 32 ]; rIn.Read( cData, 64 ); @@ -442,9 +442,9 @@ SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom ) class PptFontCollection: public boost::ptr_vector<PptFontEntityAtom> { }; -SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom ) +SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom ) { - rIn >> rAtom.aHd + ReadDffRecordHeader( rIn, rAtom.aHd ) >> rAtom.nLastSlideID >> rAtom.nVersion >> rAtom.nOffsetLastEdit @@ -462,7 +462,7 @@ void PptOEPlaceholderAtom::Clear() nPlaceholderSize = nPlaceholderId = 0; } -SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom ) +SvStream& ReadPptOEPlaceholderAtom( SvStream& rIn, PptOEPlaceholderAtom& rAtom ) { rIn >> rAtom.nPlacementId >> rAtom.nPlaceholderId @@ -531,7 +531,7 @@ sal_Bool SdrEscherImport::ReadString( OUString& rStr ) const { sal_Bool bRet = sal_False; DffRecordHeader aStrHd; - rStCtrl >> aStrHd; + ReadDffRecordHeader( rStCtrl, aStrHd ); if (aStrHd.nRecType == PPT_PST_TextBytesAtom || aStrHd.nRecType == PPT_PST_TextCharsAtom || aStrHd.nRecType == PPT_PST_CString) @@ -727,13 +727,13 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi DffRecordHeader aClientDataHd; while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < maShapeRecords.Current()->GetRecEndFilePos() ) ) { - rSt >> aClientDataHd; + ReadDffRecordHeader( rSt, aClientDataHd ); switch ( aClientDataHd.nRecType ) { // importing header/footer object from master page case PPT_PST_OEPlaceholderAtom : { - rSt >> aPlaceholderAtom; + ReadPptOEPlaceholderAtom( rSt, aPlaceholderAtom ); if ( nHeaderFooterInstance == -1 ) { switch ( aPlaceholderAtom.nPlaceholderId ) @@ -1288,7 +1288,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( nCurrentUserEdit ) { rStCtrl.Seek( nCurrentUserEdit ); - rStCtrl >> aUserEditAtom; + ReadPptUserEditAtom( rStCtrl, aUserEditAtom ); } if ( !aUserEditAtom.nOffsetPersistDirectory ) { // if there is no UserEditAtom try to search the last one @@ -1301,7 +1301,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( pHd->nRecType == PPT_PST_UserEditAtom ) { pHd->SeekToBegOfRecord( rStCtrl ); - rStCtrl >> aUserEditAtom; + ReadPptUserEditAtom( rStCtrl, aUserEditAtom ); break; } } @@ -1337,7 +1337,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O { rStCtrl.Seek( nPersistIncPos ); DffRecordHeader aPersistHd; - rStCtrl >> aPersistHd; + ReadDffRecordHeader( rStCtrl, aPersistHd ); if ( aPersistHd.nRecType == PPT_PST_PersistPtrIncrementalBlock ) { sal_uLong nPibLen = aPersistHd.GetRecEndFilePos(); @@ -1376,7 +1376,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( nCurrentEditAtomStrmPos ) { rStCtrl.Seek( nCurrentEditAtomStrmPos ); - rStCtrl >> aCurrentEditAtom; + ReadPptUserEditAtom( rStCtrl, aCurrentEditAtom ); } } } @@ -1407,14 +1407,14 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O aDocRecManager.Consume( rStCtrl ); DffRecordHeader aDocHd; - rStCtrl >> aDocHd; + ReadDffRecordHeader( rStCtrl, aDocHd ); // read DocumentAtom DffRecordHeader aDocAtomHd; - rStCtrl >> aDocAtomHd; + ReadDffRecordHeader( rStCtrl, aDocAtomHd ); if ( aDocHd.nRecType == PPT_PST_Document && aDocAtomHd.nRecType == PPT_PST_DocumentAtom ) { aDocAtomHd.SeekToBegOfRecord( rStCtrl ); - rStCtrl >> aDocAtom; + ReadPptDocumentAtom( rStCtrl, aDocAtom ); } else bOk = sal_False; @@ -1482,7 +1482,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( pPreviousPersist ) pPreviousPersist->nSlidePersistEndOffset = rStCtrl.Tell(); PptSlidePersistEntry* pE2 = new PptSlidePersistEntry; - rStCtrl >> pE2->aPersistAtom; + ReadPptSlidePersistAtom( rStCtrl, pE2->aPersistAtom ); pE2->nSlidePersistStartOffset = rStCtrl.Tell(); pE2->ePageKind = PptPageKind( nPageListNum ); pPageList->push_back( pE2 ); @@ -1534,11 +1534,11 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O { rStCtrl.Seek( nFPos ); DffRecordHeader aSlideHd; - rStCtrl >> aSlideHd; + ReadDffRecordHeader( rStCtrl, aSlideHd ); if ( SeekToRec( rStCtrl, PPT_PST_SlideAtom, aSlideHd.GetRecEndFilePos() ) ) - rStCtrl >> pE2->aSlideAtom; + ReadPptSlideAtom( rStCtrl, pE2->aSlideAtom ); else if ( SeekToRec( rStCtrl, PPT_PST_NotesAtom, aSlideHd.GetRecEndFilePos() ) ) - rStCtrl >> pE2->aNotesAtom; + ReadPptNotesAtom( rStCtrl, pE2->aNotesAtom ); aSlideHd.SeekToContent( rStCtrl ); DffRecordHeader aPPTDrawingHd; @@ -1550,14 +1550,14 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( SeekToRec( rStCtrl, DFF_msofbtDg, aPPTDrawingHd.GetRecEndFilePos() ) ) { DffRecordHeader aDgRecordHeader; - rStCtrl >> aDgRecordHeader; + ReadDffRecordHeader( rStCtrl, aDgRecordHeader ); pE2->nDrawingDgId = aDgRecordHeader.nRecInstance; aDgRecordHeader.SeekToEndOfRecord( rStCtrl ); } if ( SeekToRec( rStCtrl, DFF_msofbtSolverContainer, aPPTDgContainer.GetRecEndFilePos() ) ) { pE2->pSolverContainer = new SvxMSDffSolverContainer; - rStCtrl >> *( pE2->pSolverContainer ); + ReadSvxMSDffSolverContainer( rStCtrl, *( pE2->pSolverContainer ) ); } aPPTDgContainer.SeekToBegOfRecord( rStCtrl ); SetDgContainer( rStCtrl ); // set this, so that the escherimport is knowing of our drawings @@ -1574,7 +1574,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O pDefaultSheet = pE2->pStyleSheet; } if ( SeekToRec( rStCtrl, PPT_PST_ColorSchemeAtom, aSlideHd.GetRecEndFilePos() ) ) - rStCtrl >> pE2->aColorScheme; + ReadPptColorSchemeAtom( rStCtrl, pE2->aColorScheme ); else { OSL_FAIL( "SdrPowerPointImport::Ctor(): could not get SlideColorScheme! (SJ)" ); @@ -1770,7 +1770,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < ((SdrPowerPointImport*)this)->maShapeRecords.Current()->GetRecEndFilePos() ) ) { - rStCtrl >> aPlaceHd; + ReadDffRecordHeader( rStCtrl, aPlaceHd ); if ( aPlaceHd.nRecType == PPT_PST_RecolorInfoAtom ) { ((SdrPowerPointImport*)this)->RecolorGraphic( rStCtrl, aPlaceHd.nRecLen, aGraphic ); @@ -1791,7 +1791,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, rStCtrl.Seek( pOe->nRecHdOfs ); DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); sal_uInt32 nLen = aHd.nRecLen - 4; if ( (sal_Int32)nLen > 0 ) @@ -1936,7 +1936,7 @@ SvMemoryStream* SdrPowerPointImport::ImportExOleObjStg( sal_uInt32 nPersistPtr, nOldPos = rStCtrl.Tell(); rStCtrl.Seek( nOfs ); DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); if ( aHd.nRecType == DFF_PST_ExOleObjStg ) { sal_uInt32 nLen = aHd.nRecLen - 4; @@ -2023,7 +2023,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt if ( nPersistPtr && ( nPersistPtr < nPersistPtrAnz ) ) { rStCtrl.Seek( pPersistPtr[ nPersistPtr ] ); - rStCtrl >> *pHd; + ReadDffRecordHeader( rStCtrl, *pHd ); xOriginal->WriteUInt32( nIDoNotKnow1 ) .WriteUInt32( nIDoNotKnow2 ); @@ -2083,14 +2083,14 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt if ( SeekToRec( rStCtrl, PPT_PST_ExOleObjAtom, pExEmbed->GetRecEndFilePos(), &aExOleAtHd ) ) { PptExOleObjAtom aAt; - rStCtrl >> aAt; + ReadPptExOleObjAtom( rStCtrl, aAt ); if ( aAt.nPersistPtr && ( aAt.nPersistPtr < nPersistPtrAnz ) ) { sal_uInt32 nId; rStCtrl.Seek( pPersistPtr[ aAt.nPersistPtr ] ); DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); if ( aHd.nRecType == DFF_PST_ExOleObjStg ) { rStCtrl >> nId; @@ -2125,7 +2125,7 @@ sal_Bool SdrPowerPointImport::ReadFontCollection() if ( !pFonts ) pFonts = new PptFontCollection; PptFontEntityAtom* pFont = new PptFontEntityAtom; - rStCtrl >> *pFont; + ReadPptFontEntityAtom( rStCtrl, *pFont ); Font aFont; aFont.SetCharSet( pFont->eCharSet ); @@ -2326,7 +2326,7 @@ sal_Bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it should the situation arise rStCtrl.Seek( nDocStreamPos ); DffRecordHeader aDocHd; - rStCtrl >> aDocHd; + ReadDffRecordHeader( rStCtrl, aDocHd ); bRet = aDocHd.nRecType == PPT_PST_Document; if ( bRet ) { @@ -2355,7 +2355,7 @@ sal_Bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStre { while( SeekToRec( rSt, PPT_PST_ProgBinaryTag, aProgTagsHd.GetRecEndFilePos(), &aProgTagBinaryDataHd ) ) { - rSt >> rContentHd; + ReadDffRecordHeader( rSt, rContentHd ); if ( rContentHd.nRecType == PPT_PST_CString ) { sal_uInt16 n = 6; @@ -2369,7 +2369,7 @@ sal_Bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStre if ( ( nV == nVersion ) && ( aPre == "___PPT" ) ) { rContentHd.SeekToEndOfRecord( rSt ); - rSt >> rContentHd; + ReadDffRecordHeader( rSt, rContentHd ); if ( rContentHd.nRecType == PPT_PST_BinaryTagData ) { bRetValue = sal_True; @@ -2409,7 +2409,7 @@ sal_Bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const { rStCtrl.Seek( nFPos ); if ( pRecHd ) - rStCtrl >> *pRecHd; + ReadDffRecordHeader( rStCtrl, *pRecHd ); bRet = sal_True; } } @@ -2633,7 +2633,7 @@ void ImportComment10( SvxMSDffManager& rMan, SvStream& rStCtrl, SdrPage* pPage, while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < rComment10Hd.GetRecEndFilePos() ) ) { DffRecordHeader aCommentHd; - rStCtrl >> aCommentHd; + ReadDffRecordHeader( rStCtrl, aCommentHd ); switch( aCommentHd.nRecType ) { case PPT_PST_CString : @@ -2708,7 +2708,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) ) { DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); switch ( aHd.nRecType ) { case PPT_PST_HeadersFooters : @@ -2743,7 +2743,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPPDrawHd.GetRecEndFilePos() ) ) { DffRecordHeader aEscherObjListHd; - rStCtrl >> aEscherObjListHd; + ReadDffRecordHeader( rStCtrl, aEscherObjListHd ); switch ( aEscherObjListHd.nRecType ) { case DFF_msofbtSpContainer : @@ -2779,7 +2779,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* else { DffRecordHeader aShapeHd; - rStCtrl >> aShapeHd; + ReadDffRecordHeader( rStCtrl, aShapeHd ); if ( aShapeHd.nRecType == DFF_msofbtSp ) { sal_uInt32 nSpFlags; @@ -2805,7 +2805,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPPDrawHd.GetRecEndFilePos() ) ) { DffRecordHeader aEscherObjListHd; - rStCtrl >> aEscherObjListHd; + ReadDffRecordHeader( rStCtrl, aEscherObjListHd ); switch ( aEscherObjListHd.nRecType ) { case DFF_msofbtSpgrContainer : @@ -2816,7 +2816,7 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* aShapeHd.SeekToEndOfRecord( rStCtrl ); while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aEscherObjListHd.GetRecEndFilePos() ) ) { - rStCtrl >> aShapeHd; + ReadDffRecordHeader( rStCtrl, aShapeHd ); if ( ( aShapeHd.nRecType == DFF_msofbtSpContainer ) || ( aShapeHd.nRecType == DFF_msofbtSpgrContainer ) ) { Rectangle aEmpty; @@ -2982,7 +2982,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage //DffRecordHeader aEscherPropertiesHd; if ( SeekToRec( rStCtrl, DFF_msofbtOPT,nEscherF002End ) ) { - rStCtrl >> (DffPropertyReader&)*this; + ReadDffPropSet( rStCtrl, (DffPropertyReader&)*this ); mnFix16Angle = Fix16ToAngle( GetPropertyValue( DFF_Prop_Rotation, 0 ) ); sal_uInt32 nColor = GetPropertyValue( DFF_Prop_fillColor, 0xffffff ); pSet = new SfxItemSet( pSdrModel->GetItemPool() ); @@ -3092,7 +3092,7 @@ void SdrEscherImport::ImportHeaderFooterContainer( DffRecordHeader& rHd, HeaderF while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < rHd.GetRecEndFilePos() ) ) { DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); switch ( aHd.nRecType ) { case PPT_PST_HeadersFootersAtom : @@ -3135,7 +3135,7 @@ PPTExtParaLevel::PPTExtParaLevel() , mbSet( sal_False ) {} -SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rLevel ) +SvStream& ReadPPTExtParaLevel( SvStream& rIn, PPTExtParaLevel& rLevel ) { rLevel.mbSet = sal_True; rIn >> rLevel.mnExtParagraphMask; @@ -3199,7 +3199,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const break; while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aContentDataHd.GetRecEndFilePos() ) ) { - rSt >> aHd; + ReadDffRecordHeader( rSt, aHd ); switch ( aHd.nRecType ) { case PPT_PST_ExtendedBuGraContainer : @@ -3208,7 +3208,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const { sal_uInt16 nType; DffRecordHeader aBuGraAtomHd; - rSt >> aBuGraAtomHd; + ReadDffRecordHeader( rSt, aBuGraAtomHd ); if ( aBuGraAtomHd.nRecType == PPT_PST_ExtendedBuGraAtom ) { rSt >> nType; @@ -3280,7 +3280,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const break; while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aContentDataHd.GetRecEndFilePos() ) ) { - rSt >> aHd; + ReadDffRecordHeader( rSt, aHd ); switch ( aHd.nRecType ) { case PPT_PST_ExtendedParagraphMasterAtom : @@ -3295,7 +3295,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const while ( ( rSt.GetError() == 0 ) && ( rSt.Tell() < aHd.GetRecEndFilePos() ) && ( i < nDepth ) ) { bStyles = sal_True; - rSt >> aExtParaSheet[ aHd.nRecInstance ].aExtParaLevel[ i++ ]; + ReadPPTExtParaLevel( rSt, aExtParaSheet[ aHd.nRecInstance ].aExtParaLevel[ i++ ] ); } #ifdef DBG_UTIL if ( rSt.Tell() != aHd.GetRecEndFilePos() ) @@ -4046,7 +4046,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd DffRecordHeader aTxMasterStyleHd; while ( rIn.Tell() < pEnvHeader->GetRecEndFilePos() ) { - rIn >> aTxMasterStyleHd; + ReadDffRecordHeader( rIn, aTxMasterStyleHd ); if ( aTxMasterStyleHd.nRecType == PPT_PST_TxMasterStyleAtom ) { sal_uInt16 nLevelAnz; @@ -4094,7 +4094,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd DffRecordHeader aTxMasterStyleHd; while ( rIn.Tell() < rSlideHd.GetRecEndFilePos() ) { - rIn >> aTxMasterStyleHd; + ReadDffRecordHeader( rIn, aTxMasterStyleHd ); if ( aTxMasterStyleHd.nRecType == PPT_PST_TxMasterStyleAtom ) break; else @@ -4200,7 +4200,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd #endif } aTxMasterStyleHd.SeekToEndOfRecord( rIn ); - rIn >> aTxMasterStyleHd; + ReadDffRecordHeader( rIn, aTxMasterStyleHd ); } if ( !mpCharSheet[ TSS_TYPE_SUBTITLE ] ) { @@ -4231,7 +4231,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd DffRecordHeader aTxMasterStyleHd2; while ( rIn.Tell() < pEnvHeader2->GetRecEndFilePos() ) { - rIn >> aTxMasterStyleHd2; + ReadDffRecordHeader( rIn, aTxMasterStyleHd2 ); if ( aTxMasterStyleHd2.nRecType == PPT_PST_TxMasterStyleAtom ) { sal_uInt16 nLevelAnz; @@ -4514,7 +4514,7 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerP if ( nFileOfs ) { rIn.Seek( nFileOfs ); - rIn >> rHd; + ReadDffRecordHeader( rIn, rHd ); } else { @@ -5084,7 +5084,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con OUString aString; DffRecordHeader aTextHd; - rIn >> aTextHd; + ReadDffRecordHeader( rIn, aTextHd ); sal_uInt32 nMaxLen = aTextHd.nRecLen; if ( nMaxLen >= 0xFFFF ) nMaxLen = 0xFFFE; @@ -6365,7 +6365,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport bool bStatus = true; DffRecordHeader aShapeContainerHd; - rIn >> aShapeContainerHd; + ReadDffRecordHeader( rIn, aShapeContainerHd ); if ( ( pObjData == NULL ) || ( pObjData->bShapeType ) ) { @@ -6385,13 +6385,13 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_OEPlaceholderAtom, aClientDataContainerHd.GetRecEndFilePos(), &aPlaceHolderAtomHd ) ) { mpImplTextObj->mpPlaceHolderAtom = new PptOEPlaceholderAtom; - rIn >> *( mpImplTextObj->mpPlaceHolderAtom ); + ReadPptOEPlaceholderAtom( rIn, *( mpImplTextObj->mpPlaceHolderAtom ) ); } rIn.Seek( nOldPos ); DffRecordHeader aProgTagHd; if ( rSdrPowerPointImport.SeekToContentOfProgTag( 9, rIn, aClientDataContainerHd, aProgTagHd ) ) { - rIn >> aExtParaHd; + ReadDffRecordHeader( rIn, aExtParaHd ); } } @@ -6457,7 +6457,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport if ( ( nTmpSlideId == nSlideId ) && ( pHd->nRecInstance == nRefNum ) ) { pHd->SeekToEndOfRecord( rIn ); - rIn >> aPresRuleHd; + ReadDffRecordHeader( rIn, aPresRuleHd ); if ( aPresRuleHd.nRecType == PPT_PST_ExtendedParagraphAtom ) { aExtParaHd = aPresRuleHd; @@ -6486,7 +6486,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport // TextHeaderAtom while ( rIn.Tell() < pE->nSlidePersistEndOffset ) { - rIn >> aClientTextBoxHd; + ReadDffRecordHeader( rIn, aClientTextBoxHd ); if ( aClientTextBoxHd.nRecType == PPT_PST_TextHeaderAtom ) { if ( aClientTextBoxHd.nRecInstance == nRefNum ) @@ -6510,7 +6510,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport DffRecordHeader aTmpHd; while ( rIn.Tell() < pE->nSlidePersistEndOffset ) { - rIn >> aTmpHd; + ReadDffRecordHeader( rIn, aTmpHd ); if ( ( aTmpHd.nRecType == PPT_PST_SlidePersistAtom ) || ( aTmpHd.nRecType == PPT_PST_TextHeaderAtom ) ) break; aTmpHd.SeekToEndOfRecord( rIn ); @@ -6616,7 +6616,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport ::std::vector< PPTFieldEntry* > FieldList; while ( rIn.Tell() < aClientTextBoxHd.GetRecEndFilePos() ) { - rIn >> aTextHd; + ReadDffRecordHeader( rIn, aTextHd ); sal_uInt16 nVal = 0; PPTFieldEntry* pEntry = NULL; switch ( aTextHd.nRecType ) @@ -6742,14 +6742,14 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport if ( rSdrPowerPointImport.SeekToRec( rIn, PPT_PST_InteractiveInfoAtom, aTextHd.GetRecEndFilePos(), &aHdInteractiveInfoAtom ) ) { PptInteractiveInfoAtom aInteractiveInfoAtom; - rIn >> aInteractiveInfoAtom; + ReadPptInteractiveInfoAtom( rIn, aInteractiveInfoAtom ); for ( size_t i = 0; i < rSdrPowerPointImport.aHyperList.size(); ++i ) { SdHyperlinkEntry* pHyperlink = rSdrPowerPointImport.aHyperList[ i ]; if ( pHyperlink->nIndex == aInteractiveInfoAtom.nExHyperlinkId ) { aTextHd.SeekToEndOfRecord( rIn ); - rIn >> aTextHd; + ReadDffRecordHeader( rIn, aTextHd ); if ( aTextHd.nRecType != PPT_PST_TxInteractiveInfoAtom ) { aTextHd.SeekToBegOfRecord( rIn ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index a0ec7daf03bc..19691fe01dd7 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -3000,7 +3000,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, SvMemoryStream aMemStm( (void*) pA->GetData(), pA->GetDataSize(), STREAM_READ ); SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); sal_Bool bGradient = SvtGraphicFill::fillGradient == aFill.getFillType() && ( SvtGraphicFill::gradientLinear == aFill.getGradientType() || @@ -3077,7 +3077,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, SvtGraphicStroke aStroke; PolyPolygon aStartArrow, aEndArrow; - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); aStroke.getStartArrow( aStartArrow ); aStroke.getEndArrow( aEndArrow ); @@ -3630,7 +3630,7 @@ void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler, SvMemoryStream aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), STREAM_READ ); GDIMetaFile aMtf; - aMemStm >> aMtf; + ReadGDIMetaFile( aMemStm, aMtf ); const Reference< XDocumentHandler > xDocumentHandler( rxDocHandler ); SVGExport* pWriter = new SVGExport( mxContext, xDocumentHandler, maFilterData ); diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index 92976810350e..6237e8d84485 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.hxx @@ -61,7 +61,7 @@ class MSFILTER_DLLPUBLIC DffPropSet sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const; void InitializePropSet( sal_uInt16 nPropSetType ) const; - friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet ); + friend SvStream& ReadDffPropSet( SvStream& rIn, DffPropSet& rPropSet ); friend SvStream& operator|=( SvStream& rIn, DffPropSet& rPropSet ); }; diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx index 9453a0dd5f90..a36521785f8a 100644 --- a/include/filter/msfilter/dffrecordheader.hxx +++ b/include/filter/msfilter/dffrecordheader.hxx @@ -56,7 +56,7 @@ public: return nFilePos == rIn.Seek(nFilePos); } - MSFILTER_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec); + MSFILTER_DLLPUBLIC friend SvStream& ReadDffRecordHeader(SvStream& rIn, DffRecordHeader& rRec); }; #endif diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 37157e539eb6..c2bf0391c26b 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -179,7 +179,7 @@ struct SvxMSDffConnectorRule SvxMSDffConnectorRule() : nSpFlagsA( 0 ), nSpFlagsB( 0 ), pAObj( NULL ), pBObj( NULL ), pCObj( NULL ) {}; - friend SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); + friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); }; typedef ::std::vector< SvxMSDffConnectorRule* > SvxMSDffConnectorRuleList; @@ -191,7 +191,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer SvxMSDffSolverContainer(); ~SvxMSDffSolverContainer(); - MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rAtom ); + MSFILTER_DLLPUBLIC friend SvStream& ReadSvxMSDffSolverContainer( SvStream& rIn, SvxMSDffSolverContainer& rAtom ); }; struct FIDCL diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index eee319253955..f76123abcb68 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -73,7 +73,7 @@ public: nMajorVersion ( 0 ), nMinorVersion ( 0 ) {} - MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom ); + MSFILTER_DLLPUBLIC friend SvStream& ReadPptCurrentUserAtom( SvStream& rIn, PptCurrentUserAtom& rAtom ); }; struct MSFILTER_DLLPUBLIC PowerPointImportParam @@ -121,7 +121,7 @@ struct MSFILTER_DLLPUBLIC PptInteractiveInfoAtom public: - MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ); + MSFILTER_DLLPUBLIC friend SvStream& ReadPptInteractiveInfoAtom( SvStream& rIn, PptInteractiveInfoAtom& rAtom ); }; enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE }; @@ -188,7 +188,7 @@ public: Size GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); } Size GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); } - friend SvStream& operator>>( SvStream& rIn, PptDocumentAtom& rAtom ); + friend SvStream& ReadPptDocumentAtom( SvStream& rIn, PptDocumentAtom& rAtom ); }; struct PptSlideLayoutAtom @@ -201,7 +201,7 @@ public: void Clear(); // SlideLayoutAtom is read without header! - friend SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom ); + friend SvStream& ReadPptSlideLayoutAtom( SvStream& rIn, PptSlideLayoutAtom& rAtom ); }; struct PptSlideAtom @@ -215,7 +215,7 @@ public: PptSlideAtom() { Clear(); } void Clear(); - friend SvStream& operator>>(SvStream& rIn, PptSlideAtom& rAtom); + friend SvStream& ReadPptSlideAtom(SvStream& rIn, PptSlideAtom& rAtom); }; struct PptSlidePersistAtom @@ -230,7 +230,7 @@ public: PptSlidePersistAtom() { Clear(); } void Clear(); - friend SvStream& operator>>(SvStream& rIn, PptSlidePersistAtom& rAtom); + friend SvStream& ReadPptSlidePersistAtom(SvStream& rIn, PptSlidePersistAtom& rAtom); }; struct PptNotesAtom @@ -242,7 +242,7 @@ public: PptNotesAtom() { Clear(); } void Clear(); - friend SvStream& operator>>(SvStream& rIn, PptNotesAtom& rAtom); + friend SvStream& ReadPptNotesAtom(SvStream& rIn, PptNotesAtom& rAtom); }; struct PptColorSchemeAtom @@ -254,7 +254,7 @@ public: void Clear(); Color GetColor( sal_uInt16 nNum ) const; - friend SvStream& operator>>(SvStream& rIn, PptColorSchemeAtom& rAtom); + friend SvStream& ReadPptColorSchemeAtom(SvStream& rIn, PptColorSchemeAtom& rAtom); }; struct PptFontEntityAtom @@ -270,7 +270,7 @@ struct PptFontEntityAtom FontPitch ePitch; sal_Bool bAvailable; - friend SvStream& operator>>(SvStream& rIn, PptFontEntityAtom& rAtom); + friend SvStream& ReadPptFontEntityAtom(SvStream& rIn, PptFontEntityAtom& rAtom); }; class PptFontCollection; @@ -288,7 +288,7 @@ struct PptUserEditAtom public: PptUserEditAtom() : nOffsetPersistDirectory( 0 ) {} - friend SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom ); + friend SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom ); }; struct PptOEPlaceholderAtom @@ -301,7 +301,7 @@ public: PptOEPlaceholderAtom() { Clear(); } void Clear(); - friend SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom ); + friend SvStream& ReadPptOEPlaceholderAtom( SvStream& rIn, PptOEPlaceholderAtom& rAtom ); }; struct ProcessData; @@ -382,7 +382,7 @@ struct PptExOleObjAtom public: - friend SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom ); + friend SvStream& ReadPptExOleObjAtom( SvStream& rIn, PptExOleObjAtom& rAtom ); }; typedef ::std::vector< PPTOleEntry* > PPTOleEntryList; @@ -691,7 +691,7 @@ struct PPTExtParaLevel sal_Bool mbSet; PPTExtParaLevel(); - friend SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rL ); + friend SvStream& ReadPPTExtParaLevel( SvStream& rIn, PPTExtParaLevel& rL ); }; struct PPTExtParaSheet diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index 6149ddfc85bf..220b5121adf2 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -52,7 +52,7 @@ public: // Im-/Export SOT_DLLPUBLIC friend SvStream& WriteFileList( SvStream& rOStm, const FileList& rFileList ); - SOT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, FileList& rFileList ); + SOT_DLLPUBLIC friend SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList ); // Liste fuellen/abfragen void AppendFile( const OUString& rStr ); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 8e0a330e1596..88ba220ce3e9 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -151,7 +151,7 @@ public: } friend SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ); - friend SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ); + friend SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ); }; class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream @@ -485,7 +485,7 @@ public: void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L ); friend SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj ); - friend SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ); + friend SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ); static GraphicObject CreateGraphicObjectFromURL( const OUString &rURL ); // will inspect an object ( e.g. a control ) for any 'ImageURL' diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 89e8130ed8e4..7e97838dbe1c 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -79,7 +79,7 @@ struct TransferableObjectDescriptor , mbCanLink(false) {} - SVT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ); + SVT_DLLPUBLIC friend SvStream& ReadTransferableObjectDescriptor( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc ); SVT_DLLPUBLIC friend SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc ); }; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index f657a0085e03..0f76524abfec 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -231,7 +231,7 @@ public: }; SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme ); -SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ); +SvStream& ReadGalleryTheme( SvStream& rIn, GalleryTheme& rTheme ); #endif diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index 18a15a716fb5..150d29a3dd73 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -91,7 +91,7 @@ public: void operator|=(const SetOfByte& r2ndSet); friend inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet); - friend inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet); + friend inline SvStream& ReadSetOfByte(SvStream& rIn, SetOfByte& rSet); // initialize this set with a uno sequence of sal_Int8 void PutValue(const com::sun::star::uno::Any & rAny); @@ -106,7 +106,7 @@ inline SvStream& WriteSetOfByte(SvStream& rOut, const SetOfByte& rSet) return rOut; } -inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet) +inline SvStream& ReadSetOfByte(SvStream& rIn, SetOfByte& rSet) { rIn.Read((char*)rSet.aData,32); return rIn; diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx index 4cba3bca8833..0154adfc9e2e 100644 --- a/include/svx/xexch.hxx +++ b/include/svx/xexch.hxx @@ -49,7 +49,7 @@ public: XFillExchangeData& operator=( const XFillExchangeData& rXFillExchangeData ); SVX_DLLPUBLIC friend SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData ); - SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData ); + SVX_DLLPUBLIC friend SvStream& ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rXFillExchangeData ); XFillAttrSetItem* GetXFillAttrSetItem() { return pXFillAttrSetItem; } }; diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 626f6255a990..9fedd25f4c5b 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -160,7 +160,7 @@ public: SvStream& Read( SvStream& rIStm, bool bNewFormat = true ); SvStream& Write( SvStream& rOStm, bool bNewFormat = true ); - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Color& rColor ); + TOOLS_DLLPUBLIC friend SvStream& ReadColor( SvStream& rIStream, Color& rColor ); TOOLS_DLLPUBLIC friend SvStream& WriteColor( SvStream& rOStream, const Color& rColor ); // get ::basegfx::BColor from this color diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx index 2e1bb2005e4d..41820e71c377 100644 --- a/include/tools/fract.hxx +++ b/include/tools/fract.hxx @@ -65,7 +65,7 @@ public: friend inline bool operator<=( const Fraction& rVal1, const Fraction& rVal2 ); friend inline bool operator>=( const Fraction& rVal1, const Fraction& rVal2 ); - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Fraction& rFract ); + TOOLS_DLLPUBLIC friend SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract ); TOOLS_DLLPUBLIC friend SvStream& WriteFraction( SvStream& rOStream, const Fraction& rFract ); }; diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index e3a33ca4f8c1..bc3fb35dd5ab 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -45,7 +45,7 @@ public: bool operator == ( const Pair& rPair ) const; bool operator != ( const Pair& rPair ) const; - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Pair& rPair ); + TOOLS_DLLPUBLIC friend SvStream& ReadPair( SvStream& rIStream, Pair& rPair ); TOOLS_DLLPUBLIC friend SvStream& WritePair( SvStream& rOStream, const Pair& rPair ); protected: @@ -417,7 +417,7 @@ public: friend inline Rectangle operator + ( const Rectangle& rRect, const Point& rPt ); friend inline Rectangle operator - ( const Rectangle& rRect, const Point& rPt ); - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ); + TOOLS_DLLPUBLIC friend SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect ); TOOLS_DLLPUBLIC friend SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect ); // ONE diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx index 4c07726bed42..1f9e47715e71 100644 --- a/include/tools/inetmsg.hxx +++ b/include/tools/inetmsg.hxx @@ -70,7 +70,7 @@ public: return rStrm; } - friend SvStream& operator>> ( + friend SvStream& ReadINetMessageHeader ( SvStream& rStrm, INetMessageHeader& rHdr) { rHdr.m_aName = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStrm); @@ -200,7 +200,7 @@ public: return rMsg.operator<< (rStrm); } - friend SvStream& operator>> ( + friend SvStream& ReadINetMessage ( SvStream& rStrm, INetMessage& rMsg) { return rMsg.operator>> (rStrm); diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index ce96dc5ad008..5f5171c99005 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -177,7 +177,7 @@ public: // streaming a Polygon does ignore PolyFlags, so use the Write Or Read // method to take care of PolyFlags - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, Polygon& rPoly ); + TOOLS_DLLPUBLIC friend SvStream& ReadPolygon( SvStream& rIStream, Polygon& rPoly ); TOOLS_DLLPUBLIC friend SvStream& WritePolygon( SvStream& rOStream, const Polygon& rPoly ); void Read( SvStream& rIStream ); @@ -262,7 +262,7 @@ public: bool IsEqual( const PolyPolygon& rPolyPoly ) const; - TOOLS_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly ); + TOOLS_DLLPUBLIC friend SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly ); TOOLS_DLLPUBLIC friend SvStream& WritePolyPolygon( SvStream& rOStream, const PolyPolygon& rPolyPoly ); void Read( SvStream& rIStream ); diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 966703832b1f..7d5c7310d7b0 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -229,7 +229,7 @@ public: const Link* pProgress = NULL ); - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Animation& rAnimation ); + friend VCL_DLLPUBLIC SvStream& ReadAnimation( SvStream& rIStream, Animation& rAnimation ); friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation ); }; diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 8a2fb764282a..d49d647f3655 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -131,7 +131,7 @@ public: { return !(Font::operator==( rFont )); } sal_Bool IsSameInstance( const Font& ) const; - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Font& ); + friend VCL_DLLPUBLIC SvStream& ReadFont( SvStream& rIStm, Font& ); friend VCL_DLLPUBLIC SvStream& WriteFont( SvStream& rOStm, const Font& ); static Font identifyFont( const void* pBuffer, sal_uInt32 nLen ); diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index a922709e59ee..a322f8e2cf4f 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -210,7 +210,7 @@ public: // Stream-operators write (still) the old format // and read both the old and the new format - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ); + friend VCL_DLLPUBLIC SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ); friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ); /// Creates an antialiased thumbnail, with maximum width or height of nMaximumExtent. diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 15c91705b2e9..1bf3f68e2691 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -174,7 +174,7 @@ public: public: friend VCL_DLLPUBLIC SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ); - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink ); + friend VCL_DLLPUBLIC SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink ); }; #endif diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index e0cb0f4fdce0..3a10dc083ee3 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -49,7 +49,7 @@ public: sal_uInt16 mnIntensityEnd; sal_uInt16 mnStepCount; - friend SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImplGradient ); + friend SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImplGradient ); friend SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImplGradient ); Impl_Gradient(); @@ -109,7 +109,7 @@ public: sal_Bool IsSameInstance( const Gradient& rGradient ) const { return (mpImplGradient == rGradient.mpImplGradient); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Gradient& rGradient ); + friend VCL_DLLPUBLIC SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient ); friend VCL_DLLPUBLIC SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient ); }; diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 12221ece82d6..ec04cd7dcf57 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -189,7 +189,7 @@ public: sal_Bool ExportNative( SvStream& rOStream ) const; friend VCL_DLLPUBLIC SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic ); - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic ); + friend VCL_DLLPUBLIC SvStream& ReadGraphic( SvStream& rIStream, Graphic& rGraphic ); public: diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx index ff170f56a255..0140b5df8384 100644 --- a/include/vcl/graphictools.hxx +++ b/include/vcl/graphictools.hxx @@ -176,7 +176,7 @@ public: private: // friends VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass ); - VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass ); + VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass ); Polygon maPath; PolyPolygon maStartArrow; @@ -353,7 +353,7 @@ public: private: // friends VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass ); - VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass ); + VCL_DLLPUBLIC friend SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass ); PolyPolygon maPath; Color maFillColor; diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index da669b3ad1e6..7ba89eb46598 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -42,7 +42,7 @@ struct ImplHatch ImplHatch(); ImplHatch( const ImplHatch& rImplHatch ); - friend SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch ); + friend SvStream& ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch ); friend SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch ); }; @@ -80,7 +80,7 @@ public: void SetAngle( sal_uInt16 nAngle10 ); sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Hatch& rHatch ); + friend VCL_DLLPUBLIC SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ); friend VCL_DLLPUBLIC SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ); }; diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx index fb0f8ba8e8f9..180b4ba369f2 100644 --- a/include/vcl/jobset.hxx +++ b/include/vcl/jobset.hxx @@ -59,7 +59,7 @@ public: sal_Bool operator!=( const JobSetup& rJobSetup ) const { return !(JobSetup::operator==( rJobSetup )); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ); + friend VCL_DLLPUBLIC SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ); friend VCL_DLLPUBLIC SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup ); }; diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index e1989704c336..9f72675786e3 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -52,7 +52,7 @@ struct ImplLineInfo bool operator==( const ImplLineInfo& ) const; - friend SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo ); + friend SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ); friend SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ); }; @@ -108,7 +108,7 @@ public: sal_Bool IsDefault() const; - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo ); + friend VCL_DLLPUBLIC SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ); friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo ); // helper to get decomposed polygon data with the LineInfo applied. The source diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 17beccf14123..bfdc284fb35e 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -48,7 +48,7 @@ private: Fraction maScaleY; sal_Bool mbSimple; - friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode ); + friend SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rMapMode ); friend SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rMapMode ); static ImplMapMode* ImplGetStaticMapMode( MapUnit eUnit ); @@ -101,7 +101,7 @@ public: sal_Bool IsSameInstance( const MapMode& rMapMode ) const { return (mpImplMapMode == rMapMode.mpImplMapMode); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode ); + friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); }; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 44ffa713527a..e0e113519bf5 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -114,7 +114,7 @@ public: bool operator==( const QueueInfo& rInfo ) const; - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ); + friend VCL_DLLPUBLIC SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ); friend VCL_DLLPUBLIC SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ); }; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 3a3a64b78dcd..af4941df5470 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -111,7 +111,7 @@ public: bool operator==( const Region& rRegion ) const; bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion ); + friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, Region& rRegion ); friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const Region& rRegion ); /* workaround: faster conversion for PolyPolygons diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index f7a46080e50e..4f4113f8a444 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -115,7 +115,7 @@ public: sal_Bool IsSameInstance( const Wallpaper& rWallpaper ) const { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper ); + friend VCL_DLLPUBLIC SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ); }; diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index 6e8aed4ab2c8..5166d838b2a4 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -72,7 +72,7 @@ public: { return !operator==( r ); } friend inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr ); - friend inline SvStream& operator>> ( SvStream& rStream, ScBigAddress& rAdr ); + friend inline SvStream& ReadScBigAddress( SvStream& rStream, ScBigAddress& rAdr ); }; @@ -138,7 +138,7 @@ inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr } -inline SvStream& operator>> ( SvStream& rStream, ScBigAddress& rAdr ) +inline SvStream& ReadScBigAddress( SvStream& rStream, ScBigAddress& rAdr ) { rStream >> rAdr.nCol >> rAdr.nRow >> rAdr.nTab; return rStream; @@ -197,8 +197,8 @@ public: bool operator!=( const ScBigRange& r ) const { return !operator==( r ); } - friend inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange ); - friend inline SvStream& operator>> ( SvStream& rStream, ScBigRange& rRange ); + friend inline SvStream& WriteScBigRange( SvStream& rStream, const ScBigRange& rRange ); + friend inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange ); }; @@ -238,10 +238,10 @@ inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange ) } -inline SvStream& operator>> ( SvStream& rStream, ScBigRange& rRange ) +inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange ) { - rStream >> rRange.aStart; - rStream >> rRange.aEnd; + ReadScBigAddress( rStream, rRange.aStart ); + ReadScBigAddress( rStream, rRange.aEnd ); return rStream; } diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 8c54263594f7..29dcb6f58129 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3368,7 +3368,7 @@ void XclImpDffConverter::ProcessDrawing( SvStream& rDffStrm ) { rDffStrm.Seek( STREAM_SEEK_TO_BEGIN ); DffRecordHeader aHeader; - rDffStrm >> aHeader; + ReadDffRecordHeader( rDffStrm, aHeader ); OSL_ENSURE( aHeader.nRecType == DFF_msofbtDgContainer, "XclImpDffConverter::ProcessDrawing - unexpected record" ); if( aHeader.nRecType == DFF_msofbtDgContainer ) ProcessDgContainer( rDffStrm, aHeader ); @@ -3710,7 +3710,7 @@ void XclImpDffConverter::ProcessDgContainer( SvStream& rDffStrm, const DffRecord while( rDffStrm.Tell() < nEndPos ) { DffRecordHeader aHeader; - rDffStrm >> aHeader; + ReadDffRecordHeader( rDffStrm, aHeader ); switch( aHeader.nRecType ) { case DFF_msofbtSolverContainer: @@ -3739,7 +3739,7 @@ void XclImpDffConverter::ProcessShGrContainer( SvStream& rDffStrm, const DffReco while( rDffStrm.Tell() < nEndPos ) { DffRecordHeader aHeader; - rDffStrm >> aHeader; + ReadDffRecordHeader( rDffStrm, aHeader ); switch( aHeader.nRecType ) { case DFF_msofbtSpgrContainer: @@ -3759,7 +3759,7 @@ void XclImpDffConverter::ProcessSolverContainer( SvStream& rDffStrm, const DffRe // solver container wants to read the solver container header again rSolverHeader.SeekToBegOfRecord( rDffStrm ); // read the entire solver container - rDffStrm >> GetConvData().maSolverCont; + ReadSvxMSDffSolverContainer( rDffStrm, GetConvData().maSolverCont ); // seek to end of solver container rSolverHeader.SeekToEndOfRecord( rDffStrm ); } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 63f4a448b65e..e501458c8685 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -705,7 +705,7 @@ sal_Bool ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTran if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_SVXB, xStm ) ) { Graphic aGraphic; - *xStm >> aGraphic; + ReadGraphic( *xStm, aGraphic ); bRet = ApplyGraphicToObject( pHitObj, aGraphic ); } } diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index a4d5394051c3..26e543928a4f 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -471,7 +471,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_SVXB, xStm ) ) { Graphic aGraphic; - *xStm >> aGraphic; + ReadGraphic( *xStm, aGraphic ); bRet = PasteGraphic( aPos, aGraphic, EMPTY_OUSTRING, EMPTY_OUSTRING ); } } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index e2ac8f0d1fc3..9004f17299a8 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -270,11 +270,11 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; rIn >> rDesign.m_bUserAttr; - rIn >> rDesign.m_aBackColor; - rIn >> rDesign.m_aTextColor; - rIn >> rDesign.m_aLinkColor; - rIn >> rDesign.m_aVLinkColor; - rIn >> rDesign.m_aALinkColor; + ReadColor( rIn, rDesign.m_aBackColor ); + ReadColor( rIn, rDesign.m_aTextColor ); + ReadColor( rIn, rDesign.m_aLinkColor ); + ReadColor( rIn, rDesign.m_aVLinkColor ); + ReadColor( rIn, rDesign.m_aALinkColor ); rIn >> rDesign.m_bUseAttribs; rIn >> rDesign.m_bUseColor; diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index 4340967ffbf9..bf9ddf2e7a44 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -214,7 +214,7 @@ public: } public: - friend SvStream& operator>>(SvStream& rIn, AnimationNode& rAtom); + friend SvStream& ReadAnimationNode(SvStream& rIn, AnimationNode& rAtom); friend SvStream& WriteAnimationNode(SvStream& rOut, AnimationNode& rAtom); }; diff --git a/sd/source/filter/ppt/pptatom.cxx b/sd/source/filter/ppt/pptatom.cxx index 51afde39e573..69d964a7dba7 100644 --- a/sd/source/filter/ppt/pptatom.cxx +++ b/sd/source/filter/ppt/pptatom.cxx @@ -46,7 +46,7 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream ) && ( mrStream.Tell() < nStreamSize ) && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) ) { - mrStream >> aChildHeader; + ReadDffRecordHeader( mrStream, aChildHeader ); if( mrStream.GetError() == 0 ) { diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index e28dba65afc0..5398d39eba9c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -129,7 +129,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto SvStream* pCurrentUserStream = rStorage.OpenSotStream( OUString( "Current User" ), STREAM_STD_READ ); if( pCurrentUserStream ) { - *pCurrentUserStream >> aParam.aCurrentUserAtom; + ReadPptCurrentUserAtom( *pCurrentUserStream, aParam.aCurrentUserAtom ); delete pCurrentUserStream; } @@ -760,7 +760,7 @@ sal_Bool ImplSdPPTImport::Import() while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) ) { DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); switch( aHd.nRecType ) { case PPT_PST_PPDrawing : @@ -781,7 +781,7 @@ sal_Bool ImplSdPPTImport::Import() while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aEscherObjListHd.GetRecEndFilePos() ) ) { DffRecordHeader aHd2; - rStCtrl >> aHd2; + ReadDffRecordHeader( rStCtrl, aHd2 ); if ( ( aHd2.nRecType == DFF_msofbtSpContainer ) || ( aHd2.nRecType == DFF_msofbtSpgrContainer ) ) { if ( nObjCount++ ) // skipping the first object @@ -812,7 +812,7 @@ sal_Bool ImplSdPPTImport::Import() while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aProgTagHd.GetRecEndFilePos() ) ) { DffRecordHeader aProgTagContentHd; - rStCtrl >> aProgTagContentHd; + ReadDffRecordHeader( rStCtrl, aProgTagContentHd ); switch( aProgTagContentHd.nRecType ) { case DFF_msofbtAnimGroup : @@ -918,7 +918,7 @@ sal_Bool ImplSdPPTImport::Import() while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) ) { DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); switch ( aHd.nRecType ) { case PPT_PST_ProgTags : @@ -929,7 +929,7 @@ sal_Bool ImplSdPPTImport::Import() while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aProgTagHd.GetRecEndFilePos() ) ) { DffRecordHeader aProgTagContentHd; - rStCtrl >> aProgTagContentHd; + ReadDffRecordHeader( rStCtrl, aProgTagContentHd ); switch( aProgTagContentHd.nRecType ) { case DFF_msofbtAnimGroup : @@ -1517,7 +1517,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) ) { DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); switch ( aHd.nRecType ) { case PPT_PST_SSSlideInfoAtom: @@ -1980,7 +1980,7 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const while ( ( rStCtrl.Tell() < pHd->GetRecEndFilePos() ) && aRetVal.isEmpty() ) { DffRecordHeader aHdMovie; - rStCtrl >> aHdMovie; + ReadDffRecordHeader( rStCtrl, aHdMovie ); switch( aHdMovie.nRecType ) { case PPT_PST_ExAviMovie : @@ -2000,7 +2000,7 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const while( rStCtrl.Tell() < aExVideoHd.GetRecEndFilePos() ) { DffRecordHeader aHd; - rStCtrl >> aHd; + ReadDffRecordHeader( rStCtrl, aHd ); switch( aHd.nRecType ) { case PPT_PST_CString : @@ -2575,7 +2575,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi DffRecordHeader aHd; do { - rSt >> aHd; + ReadDffRecordHeader( rSt, aHd ); sal_uInt32 nHdRecEnd = aHd.GetRecEndFilePos(); switch ( aHd.nRecType ) { @@ -2638,7 +2638,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( SeekToRec( rSt, PPT_PST_InteractiveInfoAtom, nHdRecEnd, &aHdInteractiveInfoAtom ) ) { PptInteractiveInfoAtom aInteractiveInfoAtom; - rSt >> aInteractiveInfoAtom; + ReadPptInteractiveInfoAtom( rSt, aInteractiveInfoAtom ); // interactive object SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj, true); @@ -2691,7 +2691,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi bInhabitanceChecked = sal_True; if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) ) break; - rSt >> aMasterShapeHd; + ReadDffRecordHeader( rSt, aMasterShapeHd ); if ( !SeekToRec( rSt, DFF_msofbtClientData, aMasterShapeHd.GetRecEndFilePos(), &aMasterShapeHd ) ) break; aMasterShapeHd.SeekToContent( rSt ); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index cc6229fc8f7f..d7317f4cc1eb 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -717,7 +717,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar { XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) ); - *xStm >> aFillData; + ReadXFillExchangeData( *xStm, aFillData ); const Color aColor( ( (XFillColorItem&) aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR ) ).GetColorValue() ); static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, sal_True ); nRet = nDropAction; diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index e3e4efac6ebc..3b755f1026bc 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1177,7 +1177,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, Point aInsertPos( rPos ); Graphic aGraphic; - *xStm >> aGraphic; + ReadGraphic( *xStm, aGraphic ); if( pOwnData && pOwnData->GetWorkDocument() ) { @@ -1293,7 +1293,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) ); - *xStm >> aFillData; + ReadXFillExchangeData( *xStm, aFillData ); if( IsUndoEnabled() ) { diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index f72d436b6a9c..61bdf8c3de67 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -520,7 +520,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType, { case SOT_FORMATSTR_ID_SVXB: { - aMemStm >> rGrf; + ReadGraphic( aMemStm, rGrf ); bRet = sal_True; } break; diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 1e8d2bf49f7d..a0d0168872bd 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -76,7 +76,7 @@ SfxPrinter* SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions ) { // Load JobSetup JobSetup aFileJobSetup; - rStream >> aFileJobSetup; + ReadJobSetup( rStream, aFileJobSetup ); // Get printers SfxPrinter *pPrinter = new SfxPrinter( pOptions, aFileJobSetup ); diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index ab0c4920cacb..9eddbc9eb619 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -63,7 +63,7 @@ FileList& FileList::operator=( const FileList& rFileList ) void FileList::Load( SvStream& rIStm ) { - rIStm >> *this; + ReadFileList( rIStm, *this ); } void FileList::Save( SvStream& rOStm ) @@ -99,7 +99,7 @@ SvStream& WriteFileList( SvStream& rOStm, SAL_UNUSED_PARAMETER const FileList& ) instead of the original Windows Sv_DROPFILES structure. All strings in this list are UTF16 strings. Shell link files will be already resolved by the Windows clipboard bridge.*/ -SvStream& operator>>( SvStream& rIStm, FileList& rFileList ) +SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList ) { rFileList.ClearAll(); diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 5ce1548ebb0d..46d43c210da7 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1429,7 +1429,7 @@ static sal_uInt16 GetTransferableAction_Impl( SvMemoryStream aMemStm( (void*) aSeq.getConstArray(), aSeq.getLength(), STREAM_READ ); FileList aFileList; - aMemStm >> aFileList; + ReadFileList( aMemStm, aFileList ); if( !aMemStm.GetError() && ( aFileList.Count() == 1 ) ) { diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index a2e1718639a4..0ac6bae0988f 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -35,7 +35,7 @@ static const sal_uInt8 cStgSignature[ 8 ] = { 0xD0,0xCF,0x11,0xE0,0xA1,0xB1,0x1A ////////////////////////////// struct ClsId ///////////////////////////// -SvStream& operator >>( SvStream& r, ClsId& rId ) +SvStream& ReadClsId( SvStream& r, ClsId& rId ) { r >> rId.n1 >> rId.n2 @@ -131,8 +131,8 @@ bool StgHeader::Load( SvStream& r ) { r.Seek( 0L ); r.Read( cSignature, 8 ); - r >> aClsId // 08 Class ID - >> nVersion // 1A version number + ReadClsId( r, aClsId ); // 08 Class ID + r >> nVersion // 1A version number >> nByteOrder // 1C Unicode byte order indicator >> nPageSize // 1E 1 << nPageSize = block size >> nDataPageSize; // 20 1 << this size == data block size @@ -380,9 +380,9 @@ bool StgEntry::Load( const void* pFrom, sal_uInt32 nBufSize ) >> 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(?) + >> nChild; // 4C 1st child entry if storage + ReadClsId( r, aClsId ); // 50 class ID (optional) + r >> nFlags // 60 state flags(?) >> nMtime[ 0 ] // 64 modification time >> nMtime[ 1 ] // 64 modification time >> nAtime[ 0 ] // 6C creation and access time diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index 8598efc175b6..a00658634ca6 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -28,7 +28,7 @@ class StgIo; class SvStream; -SvStream& operator>>( SvStream&, ClsId& ); +SvStream& ReadClsId( SvStream&, ClsId& ); SvStream& WriteClsId( SvStream&, const ClsId& ); class StgHeader diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 0f87b5411983..3bae8d637d33 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -109,7 +109,7 @@ bool StgCompObjStream::Load() *this >> nMarker; if( nMarker == -1L ) { - *this >> aClsId; + ReadClsId( *this, aClsId ); sal_Int32 nLen1 = 0; *this >> nLen1; if ( nLen1 > 0 ) diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 92c78256f99b..5adf1b9b6e50 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -102,7 +102,7 @@ SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const { DBG_CHKTHIS(SfxPointItem, 0); Point aStr; - rStream >> aStr; + ReadPair( rStream, aStr ); return new SfxPointItem(Which(), aStr); } diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index d9e9677e784a..1c676767bc20 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -102,7 +102,7 @@ SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const { DBG_CHKTHIS(SfxRectangleItem, 0); Rectangle aStr; - rStream >> aStr; + ReadRectangle( rStream, aStr ); return new SfxRectangleItem(Which(), aStr); } diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 6889a78eb36c..b5d09d19e9bc 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -98,7 +98,7 @@ SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const { DBG_CHKTHIS(SfxSizeItem, 0); Size aStr; - rStream >> aStr; + ReadPair( rStream, aStr ); return new SfxSizeItem(Which(), aStr); } diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 2514ed73b65c..95b92d782968 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -73,7 +73,7 @@ sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const // ------------------------------------------------------------------------ -SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ) +SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt32 nTmp32; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 41049c7afb0f..ae5a73400729 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -214,7 +214,7 @@ void GraphicObject::ImplAutoSwapIn() if( pIStm ) { - (*pIStm) >> maGraphic; + ReadGraphic( *pIStm, maGraphic ); mbAutoSwapped = ( maGraphic.GetType() != GRAPHIC_NONE ); delete pIStm; } @@ -347,7 +347,7 @@ sal_Bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const void GraphicObject::Load( SvStream& rIStm ) { - rIStm >> *this; + ReadGraphicObject( rIStm, *this ); } void GraphicObject::Save( SvStream& rOStm ) @@ -1144,14 +1144,16 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) return 0L; } -SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) +SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) { VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; sal_Bool bLink; - rIStm >> aGraphic >> aAttr >> bLink; + ReadGraphic( rIStm, aGraphic ); + ReadGraphicAttr( rIStm, aAttr ); + rIStm >> bLink; rGraphicObj.SetGraphic( aGraphic ); rGraphicObj.SetAttr( aAttr ); diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index d38995ef69af..b989171e5e04 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -194,7 +194,7 @@ void IMapRectangleObject::WriteIMapObject( SvStream& rOStm ) const void IMapRectangleObject::ReadIMapObject( SvStream& rIStm ) { - rIStm >> aRect; + ReadRectangle( rIStm, aRect ); } @@ -307,7 +307,7 @@ void IMapCircleObject::ReadIMapObject( SvStream& rIStm ) { sal_uInt32 nTmp; - rIStm >> aCenter; + ReadPair( rIStm, aCenter ); rIStm >> nTmp; nRadius = nTmp; @@ -445,13 +445,13 @@ void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const void IMapPolygonObject::ReadIMapObject( SvStream& rIStm ) { - rIStm >> aPoly; + ReadPolygon( rIStm, aPoly ); // Version >= 2 has additional ellipses information if ( nReadVersion >= 2 ) { rIStm >> bEllipse; - rIStm >> aEllipse; + ReadRectangle( rIStm, aEllipse ); } } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index fe15173ff927..e587d7d1ee59 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -383,7 +383,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); GDIMetaFile aMtf; - *pSrcStm >> aMtf; + ReadGDIMetaFile( *pSrcStm, aMtf ); delete pSrcStm; Graphic aGraphic( aMtf ); @@ -413,7 +413,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); GDIMetaFile aMtf; - *pSrcStm >> aMtf; + ReadGDIMetaFile( *pSrcStm, aMtf ); delete pSrcStm; SvMemoryStream aDstStm( 65535, 65535 ); @@ -1793,7 +1793,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM if( GetSotStorageStream( rFlavor, xStm ) ) { - *xStm >> rMtf; + ReadGDIMetaFile( *xStm, rMtf ); bRet = ( xStm->GetError() == ERRCODE_NONE ); } @@ -1888,7 +1888,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe if( GetSotStorageStream( rFlavor, xStm ) ) { - *xStm >> rGraphic; + ReadGraphic( *xStm, rGraphic ); bRet = ( xStm->GetError() == ERRCODE_NONE ); } } @@ -2143,7 +2143,7 @@ sal_Bool TransferableDataHelper::GetFileList( bRet = sal_True; } else - bRet = ( ( *xStm >> rFileList ).GetError() == ERRCODE_NONE ); + bRet = ( ( ReadFileList( *xStm, rFileList ) ).GetError() == ERRCODE_NONE ); } } } diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 8a68903bb3e1..ad04daad9a70 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -87,7 +87,7 @@ public: void SetTitle( const OUString& rTitle ); friend SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj ); - friend SvStream& operator>>( SvStream& rIn, SgaObject& rObj ); + friend SvStream& ReadSgaObject( SvStream& rIn, SgaObject& rObj ); BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const; }; diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index c9c034868070..d250c6fa0d59 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -624,7 +624,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry if( pIStm ) { pTheme = new GalleryTheme( this, (GalleryThemeEntry*) pThemeEntry ); - *pIStm >> *pTheme; + ReadGalleryTheme( *pIStm, *pTheme ); if( pIStm->GetError() ) { diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 6d85fa8da31c..17f5da756217 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -208,7 +208,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) } else { - rIn >> aThumbMtf; + ReadGDIMetaFile( rIn, aThumbMtf ); } OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8); @@ -258,7 +258,7 @@ SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj ) return rOut; } -SvStream& operator>>( SvStream& rIn, SgaObject& rObj ) +SvStream& ReadSgaObject( SvStream& rIn, SgaObject& rObj ) { sal_uInt16 nReadVersion; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 182c207c0a4a..3fc57358f03a 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -174,7 +174,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry ) if( pSgaObj ) { - *pIStm >> *pSgaObj; + ReadSgaObject( *pIStm, *pSgaObj ); pSgaObj->ImplUpdateURL( pEntry->aURL ); } } @@ -644,7 +644,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg if( pObj ) { pIStm->Seek( pEntry->nOffset ); - *pIStm >> *pObj; + ReadSgaObject( *pIStm, *pObj); pEntry->nOffset = pTmpStm->Tell(); WriteSgaObject( *pTmpStm, *pObj ); delete pObj; @@ -1517,7 +1517,7 @@ SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme ) return rTheme.WriteData( rOut ); } -SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) +SvStream& ReadGalleryTheme( SvStream& rIn, GalleryTheme& rTheme ) { return rTheme.ReadData( rIn ); } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 92c94d2ec87c..3350feb0523a 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -294,7 +294,7 @@ XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) : { if (!IsIndex()) { - rIn >> aColor; + ReadColor( rIn, aColor ); } } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 04e8c8c7f490..a52c0d1fd116 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -318,8 +318,8 @@ XFillBitmapItem::XFillBitmapItem(SvStream& rIn, sal_uInt16 nVer) Color aColorPix; Color aColorBack; - rIn >> aColorPix; - rIn >> aColorBack; + ReadColor( rIn, aColorPix ); + ReadColor( rIn, aColorBack ); const Bitmap aBitmap(createHistorical8x8FromArray(aArray, aColorPix, aColorBack)); diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 54ef1f447b75..693f6a7f6a6f 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -87,7 +87,7 @@ SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rDat } /// binary export (currently w/o version control because it is not persistent) -SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData ) +SvStream& ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rData ) { DBG_ASSERT( rData.pPool, "XFillExchangeData has no pool" ); diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 466aca42fc58..ae1da814e4b4 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2234,7 +2234,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, if(rData.GetSotStorageStream(SOT_FORMATSTR_ID_SVXB, xStm)) { - *xStm >> aGraphic; + ReadGraphic( *xStm, aGraphic ); nRet = (GRAPHIC_NONE != aGraphic.GetType() && GRAPHIC_DEFAULT != aGraphic.GetType()); } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 9e452a6ea3a4..f1202e7d5f9f 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -256,7 +256,7 @@ void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequen if ( nMarker == BINARYSETUPMARKER ) { JobSetup aSetup; - aMem >> aSetup; + ReadJobSetup( aMem, aSetup ); GetPrinter()->SetJobSetup( aSetup ); } } diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index 9ed8d618989b..2c3fc5ade570 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -217,7 +217,7 @@ SvStream& Color::Read( SvStream& rIStm, bool bNewFormat ) if ( bNewFormat ) rIStm >> mnColor; else - rIStm >> *this; + ReadColor( rIStm, *this ); return rIStm; } @@ -234,7 +234,7 @@ SvStream& Color::Write( SvStream& rOStm, bool bNewFormat ) #define COL_NAME_USER ((sal_uInt16)0x8000) -SvStream& operator>>( SvStream& rIStream, Color& rColor ) +SvStream& ReadColor( SvStream& rIStream, Color& rColor ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "Color::>> - Solar-Version not set on rIStream" ); diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index a8a550675ac6..0bfae055ac81 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -482,7 +482,7 @@ bool operator > ( const Fraction& rVal1, const Fraction& rVal2 ) return nN > nD; } -SvStream& operator >> ( SvStream& rIStream, Fraction& rFract ) +SvStream& ReadFraction( SvStream& rIStream, Fraction& rFract ) { //fdo#39428 SvStream no longer supports operator>>(long&) sal_Int32 nTmp(0); diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index 9643a8115219..0a49fd40bb5f 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -21,7 +21,7 @@ #include <tools/gen.hxx> #include <tools/stream.hxx> -SvStream& operator>>( SvStream& rIStream, Pair& rPair ) +SvStream& ReadPair( SvStream& rIStream, Pair& rPair ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "Pair::>> - Solar-Version not set on rIStream" ); @@ -169,7 +169,7 @@ bool Rectangle::IsOver( const Rectangle& rRect ) const return !GetIntersection( rRect ).IsEmpty(); } -SvStream& operator>>( SvStream& rIStream, Rectangle& rRect ) +SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "Rectangle::>> - Solar-Version not set on rIStream" ); diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 538a608b4aee..2da3bb396694 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1501,7 +1501,7 @@ bool Polygon::IsEqual( const Polygon& rPoly ) const return bIsEqual; } -SvStream& operator>>( SvStream& rIStream, Polygon& rPoly ) +SvStream& ReadPolygon( SvStream& rIStream, Polygon& rPoly ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" ); @@ -1590,8 +1590,8 @@ void Polygon::ImplRead( SvStream& rIStream ) { sal_uInt8 bHasPolyFlags; - rIStream >> *this - >> bHasPolyFlags; + ReadPolygon( rIStream, *this ); + rIStream >> bHasPolyFlags; if ( bHasPolyFlags ) { diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index affa44debc81..c168196ee2ff 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -553,7 +553,7 @@ bool PolyPolygon::IsEqual( const PolyPolygon& rPolyPoly ) const return bIsEqual; } -SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly ) +SvStream& ReadPolyPolygon( SvStream& rIStream, PolyPolygon& rPolyPoly ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); @@ -575,7 +575,7 @@ SvStream& operator>>( SvStream& rIStream, PolyPolygon& rPolyPoly ) for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) { pPoly = new Polygon; - rIStream >> *pPoly; + ReadPolygon( rIStream, *pPoly ); rPolyPoly.mpImplPolyPolygon->mpPolyAry[i] = pPoly; } } diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index 427cc26cbc78..7bc94e5ecb0d 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -135,7 +135,7 @@ SvStream& INetMessage::operator>> (SvStream& rStrm) for (i = 0; i < n; i++) { INetMessageHeader *p = new INetMessageHeader(); - rStrm >> *p; + ReadINetMessageHeader( rStrm, *p ); m_aHeaderList.push_back( p ); } diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 0a9266013f99..0bdd8edb2969 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -82,7 +82,7 @@ private: mbVertical:1, mbTransparent:1; // compatibility, now on output device - friend SvStream& operator>>( SvStream& rIStm, Impl_Font& ); + friend SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& ); friend SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& ); }; diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 76cacb7f8f47..6926aee63c64 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -161,7 +161,7 @@ private: sal_Bool ImplExportNative( SvStream& rOStm ) const; friend SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ); - friend SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ); + friend SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ); // SvgData support const SvgDataPtr& getSvgData() const; diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index c6329b6abbe4..14c5e1fa753b 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -35,7 +35,7 @@ private: sal_uLong mnRefCount; BitmapEx* mpCache; - friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ); + friend SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ); friend SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ); public: diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 67e1d2bc1700..a1a731eeaed3 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1573,13 +1573,13 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat aFilterName.equalsIgnoreAsciiCase( IMP_SVMETAFILE ) ) { // SV internal filters for import bitmaps and MetaFiles - rIStream >> rGraphic; + ReadGraphic( rIStream, rGraphic ); if( rIStream.GetError() ) nStatus = GRFILTER_FORMATERROR; } else if( aFilterName.equalsIgnoreAsciiCase( IMP_MOV ) ) { - rIStream >> rGraphic; + ReadGraphic( rIStream, rGraphic ); if( rIStream.GetError() ) nStatus = GRFILTER_FORMATERROR; else @@ -1620,7 +1620,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat else { aTempStream.Seek( 0L ); - aTempStream >> rGraphic; + ReadGraphic( aTempStream, rGraphic ); if( aTempStream.GetError() ) nStatus = GRFILTER_FILTERERROR; diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 352e4de56c96..c2d169e06d93 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -1065,8 +1065,8 @@ sal_Bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo MapMode aMapMode; rStm.SeekRel( 0x06 ); - rStm >> aMapMode; - rStm >> aLogSize; + ReadMapMode( rStm, aMapMode ); + ReadPair( rStm, aLogSize ); aLogSize = OutputDevice::LogicToLogic( aLogSize, aMapMode, MapMode( MAP_100TH_MM ) ); } } diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index 92a4334ce129..c9ac38865640 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -27,7 +27,7 @@ #include "sgffilt.hxx" #include "sgfbram.hxx" -SvStream& operator>>(SvStream& rIStream, SgfHeader& rHead) +SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead) { rIStream.Read((char*)&rHead.Magic,SgfHeaderSize); #if defined OSL_BIGENDIAN @@ -52,7 +52,7 @@ bool SgfHeader::ChkMagic() sal_uInt32 SgfHeader::GetOffset() { return sal_uInt32(OfsLo)+0x00010000*sal_uInt32(OfsHi); } -SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr) +SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr) { rIStream.Read((char*)&rEntr.Typ,SgfEntrySize); #if defined OSL_BIGENDIAN @@ -69,7 +69,7 @@ SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr) sal_uInt32 SgfEntry::GetOffset() { return sal_uInt32(OfsLo)+0x00010000*sal_uInt32(OfsHi); } -SvStream& operator>>(SvStream& rIStream, SgfVector& rVect) +SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rVect) { rIStream.Read((char*)&rVect,sizeof(rVect)); #if defined OSL_BIGENDIAN @@ -337,13 +337,13 @@ bool SgfBMapFilter(SvStream& rInp, SvStream& rOut) bool bRet=false; // return value nFileStart=rInp.Tell(); - rInp>>aHead; + ReadSgfHeader( rInp, aHead ); if (aHead.ChkMagic() && (aHead.Typ==SgfBitImag0 || aHead.Typ==SgfBitImag1 || aHead.Typ==SgfBitImag2 || aHead.Typ==SgfBitImgMo)) { nNext=aHead.GetOffset(); while (nNext && !bRdFlag && !rInp.GetError() && !rOut.GetError()) { rInp.Seek(nFileStart+nNext); - rInp>>aEntr; + ReadSgfEntry( rInp, aEntr ); nNext=aEntr.GetOffset(); if (aEntr.Typ==aHead.Typ) { bRdFlag=true; @@ -415,7 +415,7 @@ bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& rMt aOutDev.SetFillColor(Color(COL_BLACK)); while (!bEoDt && !rInp.GetError()) { - rInp>>aVect; RecNr++; + ReadSgfVector( rInp, aVect ); RecNr++; nFarb=(sal_uInt8) (aVect.Flag & 0x000F); nLTyp=(sal_uInt8)((aVect.Flag & 0x00F0) >>4); nOTyp=(sal_uInt8)((aVect.Flag & 0x0F00) >>8); @@ -472,12 +472,12 @@ bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf) bool bRet=false; // return value nFileStart=rInp.Tell(); - rInp>>aHead; + ReadSgfHeader( rInp, aHead ); if (aHead.ChkMagic() && aHead.Typ==SGF_SIMPVECT) { nNext=aHead.GetOffset(); while (nNext && !rInp.GetError()) { rInp.Seek(nFileStart+nNext); - rInp>>aEntr; + ReadSgfEntry( rInp, aEntr ); nNext=aEntr.GetOffset(); if (aEntr.Typ==aHead.Typ) { bRet=SgfFilterVect(rInp,aHead,aEntr,rMtf); @@ -509,7 +509,7 @@ sal_uInt8 CheckSgfTyp(SvStream& rInp, sal_uInt16& nVersion) SgfHeader aHead; nVersion=0; nPos=rInp.Tell(); - rInp>>aHead; + ReadSgfHeader( rInp, aHead ); rInp.Seek(nPos); if (aHead.ChkMagic()) { nVersion=aHead.Version; diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx index 1af6f56ef815..cd34217edc9c 100644 --- a/vcl/source/filter/sgfbram.hxx +++ b/vcl/source/filter/sgfbram.hxx @@ -56,7 +56,7 @@ public: sal_uInt16 OfsLo,OfsHi; // DWord allignment is necessary (38 mod 4 =2) ! sal_uInt32 GetOffset(); - friend SvStream& operator>>(SvStream& rIStream, SgfHeader& rHead); + friend SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead); bool ChkMagic(); }; @@ -71,7 +71,7 @@ public: sal_uInt16 OfsLo,OfsHi; // DWord allignment is necessary (18 mod 4 =2) ! sal_uInt32 GetOffset(); - friend SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr); + friend SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr); }; #define SgfVectorSize 10 @@ -83,7 +83,7 @@ public: sal_Int16 y; sal_uInt16 OfsLo,OfsHi; // DWord allignment is necessary (6 mod 4 =2) ! - friend SvStream& operator>>(SvStream& rIStream, SgfVector& rEntr); + friend SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rEntr); }; extern long SgfVectXofs; diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index f6eb1ee98bc9..7b4648e03fea 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -144,7 +144,7 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div) // SgfFilterSDrw /////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -SvStream& operator>>(SvStream& rIStream, DtHdType& rDtHd) +SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd) { rIStream.Read((char*)&rDtHd.Reserved[0],DtHdSize); return rIStream; @@ -158,7 +158,7 @@ void DtHdOverSeek(SvStream& rInp) } -SvStream& operator>>(SvStream& rIStream, PageType& rPage) +SvStream& ReadPageType(SvStream& rIStream, PageType& rPage) { rIStream.Read((char*)&rPage.Next,PageSize); #if defined OSL_BIGENDIAN @@ -174,7 +174,7 @@ void ObjkOverSeek(SvStream& rInp, ObjkType& rObjk) rInp.Seek(rInp.Tell()+Siz); } -SvStream& operator>>(SvStream& rInp, ObjkType& rObjk) +SvStream& ReadObjkType(SvStream& rInp, ObjkType& rObjk) { // fileposition in stream is not changed! sal_uLong nPos; @@ -193,7 +193,7 @@ SvStream& operator>>(SvStream& rInp, ObjkType& rObjk) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, StrkType& rStrk) +SvStream& ReadStrkType(SvStream& rInp, StrkType& rStrk) { rInp.Read((char*)&rStrk.Last,StrkSize); #if defined OSL_BIGENDIAN @@ -204,7 +204,7 @@ SvStream& operator>>(SvStream& rInp, StrkType& rStrk) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, RectType& rRect) +SvStream& ReadRectType(SvStream& rInp, RectType& rRect) { rInp.Read((char*)&rRect.Last,RectSize); #if defined OSL_BIGENDIAN @@ -219,7 +219,7 @@ SvStream& operator>>(SvStream& rInp, RectType& rRect) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, PolyType& rPoly) +SvStream& ReadPolyType(SvStream& rInp, PolyType& rPoly) { rInp.Read((char*)&rPoly.Last,PolySize); #if defined OSL_BIGENDIAN @@ -229,7 +229,7 @@ SvStream& operator>>(SvStream& rInp, PolyType& rPoly) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, SplnType& rSpln) +SvStream& ReadSplnType(SvStream& rInp, SplnType& rSpln) { rInp.Read((char*)&rSpln.Last,SplnSize); #if defined OSL_BIGENDIAN @@ -239,7 +239,7 @@ SvStream& operator>>(SvStream& rInp, SplnType& rSpln) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, CircType& rCirc) +SvStream& ReadCircType(SvStream& rInp, CircType& rCirc) { rInp.Read((char*)&rCirc.Last,CircSize); #if defined OSL_BIGENDIAN @@ -254,7 +254,7 @@ SvStream& operator>>(SvStream& rInp, CircType& rCirc) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, TextType& rText) +SvStream& ReadTextType(SvStream& rInp, TextType& rText) { rInp.Read((char*)&rText.Last,TextSize); #if defined OSL_BIGENDIAN @@ -272,7 +272,7 @@ SvStream& operator>>(SvStream& rInp, TextType& rText) rText.Buffer=NULL; return rInp; } -SvStream& operator>>(SvStream& rInp, BmapType& rBmap) +SvStream& ReadBmapType(SvStream& rInp, BmapType& rBmap) { rInp.Read((char*)&rBmap.Last,BmapSize); #if defined OSL_BIGENDIAN @@ -286,7 +286,7 @@ SvStream& operator>>(SvStream& rInp, BmapType& rBmap) #endif return rInp; } -SvStream& operator>>(SvStream& rInp, GrupType& rGrup) +SvStream& ReadGrupType(SvStream& rInp, GrupType& rGrup) { rInp.Read((char*)&rGrup.Last,GrupSize); #if defined OSL_BIGENDIAN @@ -768,15 +768,15 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) sal_uInt16 nGrpCnt=0; bool bEnde=false; do { - rInp>>aObjk; + ReadObjkType( rInp, aObjk ); if (!rInp.GetError()) { switch(aObjk.Art) { - case ObjStrk: { StrkType aStrk; rInp>>aStrk; if (!rInp.GetError()) aStrk.Draw(rOut); } break; - case ObjRect: { RectType aRect; rInp>>aRect; if (!rInp.GetError()) aRect.Draw(rOut); } break; - case ObjCirc: { CircType aCirc; rInp>>aCirc; if (!rInp.GetError()) aCirc.Draw(rOut); } break; + case ObjStrk: { StrkType aStrk; ReadStrkType( rInp, aStrk ); if (!rInp.GetError()) aStrk.Draw(rOut); } break; + case ObjRect: { RectType aRect; ReadRectType( rInp, aRect ); if (!rInp.GetError()) aRect.Draw(rOut); } break; + case ObjCirc: { CircType aCirc; ReadCircType( rInp, aCirc ); if (!rInp.GetError()) aCirc.Draw(rOut); } break; case ObjText: { TextType aText; - rInp>>aText; + ReadTextType( rInp, aText ); if (!rInp.GetError()) { aText.Buffer=new UCHAR[aText.BufSize+1]; // add one for LookAhead at CK-separation rInp.Read((char* )aText.Buffer,aText.BufSize); @@ -786,14 +786,14 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) } break; case ObjBmap: { BmapType aBmap; - rInp>>aBmap; + ReadBmapType( rInp, aBmap ); if (!rInp.GetError()) { aBmap.Draw(rOut); } } break; case ObjPoly: { PolyType aPoly; - rInp>>aPoly; + ReadPolyType( rInp, aPoly ); if (!rInp.GetError()) { aPoly.EckP=new PointType[aPoly.nPoints]; rInp.Read((char*)aPoly.EckP,4*aPoly.nPoints); @@ -806,7 +806,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) } break; case ObjSpln: { SplnType aSpln; - rInp>>aSpln; + ReadSplnType( rInp, aSpln ); if (!rInp.GetError()) { aSpln.EckP=new PointType[aSpln.nPoints]; rInp.Read((char*)aSpln.EckP,4*aSpln.nPoints); @@ -819,7 +819,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut ) } break; case ObjGrup: { GrupType aGrup; - rInp>>aGrup; + ReadGrupType( rInp, aGrup ); if (!rInp.GetError()) { rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix if(aGrup.GetSubPtr()!=0L) nGrpCnt++; // DrawObjkList(rInp,rOut ); @@ -852,10 +852,10 @@ void SkipObjkList(SvStream& rInp) ObjkType aObjk; do { - rInp>>aObjk; + ReadObjkType( rInp, aObjk ); if(aObjk.Art==ObjGrup) { GrupType aGrup; - rInp>>aGrup; + ReadGrupType( rInp, aGrup ); rInp.Seek(rInp.Tell()+aGrup.Last); // object appendix if(aGrup.GetSubPtr()!=0L) SkipObjkList(rInp); } else { @@ -884,28 +884,28 @@ bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, GDIMetaFile& rMtf ) nStdPos=rInp.Tell(); do { // read standard page - rInp>>aPage; + ReadPageType( rInp, aPage ); if (aPage.nList!=0) SkipObjkList(rInp); } while (aPage.Next!=0L && !rInp.GetError()); // ShowMsg("Drawingpage(n)\n"); nZchPos=rInp.Tell(); - rInp>>aPage; + ReadPageType( rInp, aPage ); rMtf.Record(pOutDev); Num=aPage.StdPg; if (Num!=0) { rInp.Seek(nStdPos); while(Num>1 && aPage.Next!=0L && !rInp.GetError()) { // search standard page - rInp>>aPage; + ReadPageType( rInp, aPage ); if (aPage.nList!=0) SkipObjkList(rInp); Num--; } - rInp>>aPage; + ReadPageType( rInp, aPage ); if(Num==1 && aPage.nList!=0L) DrawObjkList( rInp,*pOutDev ); rInp.Seek(nZchPos); nZchPos=rInp.Tell(); - rInp>>aPage; + ReadPageType( rInp, aPage ); } if (aPage.nList!=0L) DrawObjkList(rInp,*pOutDev ); @@ -943,12 +943,12 @@ bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath ) pSgfFonts->AssignFN( aIniPath.GetMainURL( INetURLObject::NO_DECODE ) ); nFileStart=rInp.Tell(); - rInp>>aHead; + ReadSgfHeader( rInp, aHead ); if (aHead.ChkMagic() && aHead.Typ==SgfStarDraw && aHead.Version==SGV_VERSION) { nNext=aHead.GetOffset(); while (nNext && !rInp.GetError()) { rInp.Seek(nFileStart+nNext); - rInp>>aEntr; + ReadSgfEntry( rInp, aEntr ); nNext=aEntr.GetOffset(); if (aEntr.Typ==aHead.Typ) { bRet=SgfFilterSDrw( rInp,aHead,aEntr,rMtf ); diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 8dbc5955bb2d..3c58f128e512 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -37,7 +37,7 @@ struct PointType { class DtHdType { public: sal_uInt8 Reserved[256]; - friend SvStream& operator>>(SvStream& rIStream, DtHdType& rDtHd); + friend SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd); friend void DtHdOverSeek(SvStream& rInp); }; @@ -66,7 +66,7 @@ public: sal_uInt8 LnAnzH; sal_uInt8 LnAnzV; UCHAR PgName[32]; // page name - friend SvStream& operator>>(SvStream& rIStream, PageType& rPage); + friend SvStream& ReadPageType(SvStream& rIStream, PageType& rPage); }; enum ObjArtType {ObjStrk,ObjRect,ObjPoly,ObjCirc,ObjSpln, @@ -137,7 +137,7 @@ public: PointType ObjMax; // XY maximum of the object sal_uInt8 Art; sal_uInt8 Layer; - friend SvStream& operator>>(SvStream& rIStream, ObjkType& rObjk); + friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk); friend sal_Bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); virtual void Draw(OutputDevice& rOut); }; @@ -150,7 +150,7 @@ public: ObjLineType L; PointType Pos1; // start point PointType Pos2; // end point - friend SvStream& operator>>(SvStream& rIStream, StrkType& rStrk); + friend SvStream& ReadStrkType(SvStream& rIStream, StrkType& rStrk); virtual void Draw(OutputDevice& rOut); }; @@ -166,7 +166,7 @@ public: sal_Int16 Radius; // radius of corner sal_uInt16 DrehWink; // 315...<45 sal_uInt16 Slant; // >270...<90 - friend SvStream& operator>>(SvStream& rIStream, RectType& rRect); + friend SvStream& ReadRectType(SvStream& rIStream, RectType& rRect); virtual void Draw(OutputDevice& rOut); }; @@ -181,7 +181,7 @@ public: sal_uInt8 Reserve; sal_uInt32 SD_EckP; // pointer to corner point (StarDraw) PointType* EckP; // pointer to corner points (StarView (is not read from disk!)) - friend SvStream& operator>>(SvStream& rIStream, PolyType& rPoly); + friend SvStream& ReadPolyType(SvStream& rIStream, PolyType& rPoly); virtual void Draw(OutputDevice& rOut); }; #define PolyClosBit 0x01 // kinds of Poly: 0: polyLine 1: polygon @@ -197,7 +197,7 @@ public: sal_uInt8 Reserve; sal_uInt32 SD_EckP; // pointer to corner points (StarDraw) PointType* EckP; // pointer to corner points (StarView (is not read from disk!)) - friend SvStream& operator>>(SvStream& rIStream, SplnType& rSpln); + friend SvStream& ReadSplnType(SvStream& rIStream, SplnType& rSpln); virtual void Draw(OutputDevice& rOut); }; // kinds of Spline: see Poly @@ -214,7 +214,7 @@ public: sal_uInt16 DrehWink; // only ellipses sal_uInt16 StartWink; // and not for full circles sal_uInt16 RelWink; // and full ellipses - friend SvStream& operator>>(SvStream& rIStream, CircType& rCirc); + friend SvStream& ReadCircType(SvStream& rIStream, CircType& rCirc); virtual void Draw(OutputDevice& rOut); }; #define CircFull 0x00 /* kinds of circle: 0: full circle */ @@ -239,7 +239,7 @@ public: PointType FitSize; // size of origin for Fit2Size sal_Int16 FitBreit; // width to format for Fit2Size UCHAR* Buffer; // this variable is not set by reading from disk, but explicit! - friend SvStream& operator>>(SvStream& rIStream, TextType& rText); + friend SvStream& ReadTextType(SvStream& rIStream, TextType& rText); virtual void Draw(OutputDevice& rOut); }; #define TextOutlBit 0x01 /* 1=Sourcecode for outliner (ignored byDrawObjekt()) */ @@ -269,7 +269,7 @@ public: sal_Bool LightOut; // brighten? (SD20) sal_uInt8 GrfFlg; // (SD20) 0=nSGF 1=Pcx 2=HPGL 4=Raw $FF=Undef (to fix DrawBmp) INetURLObject aFltPath; // for GraphicFilter - friend SvStream& operator>>(SvStream& rIStream, BmapType& rBmap); + friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap); virtual void Draw(OutputDevice& rOut); void SetPaths( const INetURLObject rFltPath ); }; @@ -284,7 +284,7 @@ public: sal_uInt16 ChartSize; // required amount of memory for structure of diagram structure sal_uInt32 ChartPtr; // diagram structure sal_uInt32 GetSubPtr(); // only to check if Sublist is empty - friend SvStream& operator>>(SvStream& rIStream, GrupType& rGrup); + friend SvStream& ReadGrupType(SvStream& rIStream, GrupType& rGrup); }; void SetLine(ObjLineType& rLine, OutputDevice& rOut); diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 9db92458cb24..dcb0b8641280 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -460,8 +460,6 @@ struct XForm eM11 = eM22 = 1.0f; eDx = eDy = eM12 = eM21 = 0.0f; } - - friend SvStream& operator>>( SvStream& rIn, XForm& rXForm ); }; // ----------------------------------------------------------------------------- diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index 2c1d817519d2..dc228087dd07 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -738,7 +738,7 @@ SvStream& WriteAnimation( SvStream& rOStm, const Animation& rAnimation ) return rOStm; } -SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) +SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) { Bitmap aBmp; sal_uLong nStmPos = rIStm.Tell(); @@ -782,9 +782,9 @@ SvStream& operator>>( SvStream& rIStm, Animation& rAnimation ) do { ReadDIBBitmapEx(aAnimBmp.aBmpEx, rIStm); - rIStm >> aAnimBmp.aPosPix; - rIStm >> aAnimBmp.aSizePix; - rIStm >> rAnimation.maGlobalSize; + ReadPair( rIStm, aAnimBmp.aPosPix ); + ReadPair( rIStm, aAnimBmp.aSizePix ); + ReadPair( rIStm, rAnimation.maGlobalSize ); rIStm >> nTmp16; aAnimBmp.nWait = ( ( 65535 == nTmp16 ) ? ANIMATION_TIMEOUT_ON_CLICK : nTmp16 ); rIStm >> nTmp16; aAnimBmp.eDisposal = ( Disposal) nTmp16; rIStm >> cTmp; aAnimBmp.bUserInput = (sal_Bool) cTmp; diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index bad3016c6c19..75461611d20d 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -37,8 +37,8 @@ void ImplReadRect( SvStream& rIStm, Rectangle& rRect ) Point aTL; Point aBR; - rIStm >> aTL; - rIStm >> aBR; + ReadPair( rIStm, aTL ); + ReadPair( rIStm, aBR ); rRect = Rectangle( aTL, aBR ); } @@ -57,7 +57,7 @@ void ImplReadPoly( SvStream& rIStm, Polygon& rPoly ) rPoly = Polygon( (sal_uInt16) nSize ); for( sal_uInt16 i = 0; i < (sal_uInt16) nSize; i++ ) - rIStm >> rPoly[ i ]; + ReadPair( rIStm, rPoly[ i ] ); } void ImplReadPolyPoly( SvStream& rIStm, PolyPolygon& rPolyPoly ) @@ -135,7 +135,9 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode ) sal_Int32 nYDenom; sal_Int16 nUnit; - rIStm >> nUnit >> aOrg >> nXNum >> nXDenom >> nYNum >> nYDenom; + rIStm >> nUnit; + ReadPair( rIStm, aOrg ); + rIStm >> nXNum >> nXDenom >> nYNum >> nYDenom; rMapMode = MapMode( (MapUnit) nUnit, aOrg, Fraction( nXNum, nXDenom ), Fraction( nYNum, nYDenom ) ); } @@ -403,7 +405,7 @@ void ImplReadExtendedPolyPolygonAction(SvStream& rIStm, PolyPolygon& rPolyPoly) { for(sal_uInt16 b(0); b < nPointCount; b++) { - rIStm >> aCandidate[b]; + ReadPair( rIStm , aCandidate[b] ); } sal_uInt8 bHasFlags(false); @@ -509,7 +511,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { case( GDI_PIXEL_ACTION ): { - rIStm >> aPt; + ReadPair( rIStm, aPt ); ImplReadColor( rIStm, aActionColor ); rMtf.AddAction( new MetaPixelAction( aPt, aActionColor ) ); } @@ -517,14 +519,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_POINT_ACTION ): { - rIStm >> aPt; + ReadPair( rIStm, aPt ); rMtf.AddAction( new MetaPointAction( aPt ) ); } break; case( GDI_LINE_ACTION ): { - rIStm >> aPt >> aPt1; + ReadPair( rIStm, aPt ); + ReadPair( rIStm, aPt1 ); rMtf.AddAction( new MetaLineAction( aPt, aPt1, aLineInfo ) ); } break; @@ -672,7 +675,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_ARC_ACTION ): { ImplReadRect( rIStm, aRect ); - rIStm >> aPt >> aPt1; + ReadPair( rIStm, aPt ); + ReadPair( rIStm, aPt1 ); if( bFatLine ) { @@ -692,7 +696,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_PIE_ACTION ): { ImplReadRect( rIStm, aRect ); - rIStm >> aPt >> aPt1; + ReadPair( rIStm, aPt ); + ReadPair( rIStm, aPt1 ); if( bFatLine ) { @@ -827,7 +832,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { sal_Int32 nIndex, nLen; - rIStm >> aPt >> nIndex >> nLen >> nTmp; + ReadPair( rIStm, aPt ) >> nIndex >> nLen >> nTmp; if (nTmp > 0) { OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); @@ -849,7 +854,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_Int32* pDXAry = NULL; sal_Int32 nIndex, nLen, nAryLen; - rIStm >> aPt >> nIndex >> nLen >> nTmp >> nAryLen; + ReadPair( rIStm, aPt ) >> nIndex >> nLen >> nTmp >> nAryLen; if (nTmp > 0) { OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); @@ -911,7 +916,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { sal_Int32 nIndex, nLen, nWidth; - rIStm >> aPt >> nIndex >> nLen >> nTmp >> nWidth; + ReadPair( rIStm, aPt ) >> nIndex >> nLen >> nTmp >> nWidth; if (nTmp > 0) { OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); @@ -932,7 +937,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { Bitmap aBmp; - rIStm >> aPt; + ReadPair( rIStm, aPt ); ReadDIB(aBmp, rIStm, true); rMtf.AddAction( new MetaBmpAction( aPt, aBmp ) ); } @@ -942,7 +947,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { Bitmap aBmp; - rIStm >> aPt >> aSz; + ReadPair( rIStm, aPt ); + ReadPair( rIStm, aSz ); ReadDIB(aBmp, rIStm, true); rMtf.AddAction( new MetaBmpScaleAction( aPt, aSz, aBmp ) ); } @@ -953,7 +959,10 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) Bitmap aBmp; Size aSz2; - rIStm >> aPt >> aSz >> aPt1 >> aSz2; + ReadPair( rIStm, aPt ); + ReadPair( rIStm, aSz ); + ReadPair( rIStm, aPt1 ); + ReadPair( rIStm, aSz2 ); ReadDIB(aBmp, rIStm, true); rMtf.AddAction( new MetaBmpScalePartAction( aPt, aSz, aPt1, aSz2, aBmp ) ); } @@ -1170,7 +1179,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_Int32 nFollowingActionCount; sal_Int16 nTrans; - rIStm >> aPolyPoly >> nTrans >> nFollowingActionCount; + ReadPolyPolygon( rIStm, aPolyPoly ); + rIStm >> nTrans >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaTransparentAction( aPolyPoly, nTrans ) ); @@ -1186,7 +1196,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) Gradient aGradient; sal_Int32 nFollowingActionCount; - rIStm >> aMtf >> aPos >> aSize >> aGradient >> nFollowingActionCount; + ReadGDIMetaFile( rIStm, aMtf ); + ReadPair( rIStm, aPos ); + ReadPair( rIStm, aSize ); + ReadGradient( rIStm, aGradient ); + rIStm >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaFloatTransparentAction( aMtf, aPos, aSize, aGradient ) ); @@ -1200,7 +1214,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) Hatch aHatch; sal_Int32 nFollowingActionCount; - rIStm >> aPolyPoly >> aHatch >> nFollowingActionCount; + ReadPolyPolygon( rIStm, aPolyPoly ); + ReadHatch( rIStm, aHatch ); + rIStm >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaHatchAction( aPolyPoly, aHatch ) ); @@ -1214,7 +1230,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_Bool bSet; sal_Int32 nFollowingActionCount; - rIStm >> aRefPoint >> bSet >> nFollowingActionCount; + ReadPair( rIStm, aRefPoint ); + rIStm >> bSet >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaRefPointAction( aRefPoint, bSet ) ); @@ -1234,7 +1251,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_Bool bSet; sal_Int32 nFollowingActionCount; - rIStm >> aColor >> bSet >> nFollowingActionCount; + ReadColor( rIStm, aColor ); + rIStm >> bSet >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaTextLineColorAction( aColor, bSet ) ); @@ -1251,7 +1269,8 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_uInt32 nUnderline; sal_Int32 nFollowingActionCount; - rIStm >> aStartPt >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount; + ReadPair( rIStm, aStartPt ); + rIStm >> nWidth >> nStrikeout >> nUnderline >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaTextLineAction( aStartPt, nWidth, (FontStrikeout) nStrikeout, @@ -1268,7 +1287,9 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) Gradient aGradient; sal_Int32 nFollowingActionCount; - rIStm >> aPolyPoly >> aGradient >> nFollowingActionCount; + ReadPolyPolygon( rIStm, aPolyPoly ); + ReadGradient( rIStm, aGradient ); + rIStm >> nFollowingActionCount; ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaGradientExAction( aPolyPoly, aGradient ) ); diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 389f17ec198d..9de7205622be 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1491,7 +1491,7 @@ bool ReadDIBBitmapEx( { Color aTransparentColor; - rIStm >> aTransparentColor; + ReadColor( rIStm, aTransparentColor ); bRetval = !rIStm.GetError(); if(bRetval) diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 2da441818035..fb2c49bafa9d 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -655,7 +655,7 @@ void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const rAttrs.SetSymbolFlag( mpImplFont->meCharSet == RTL_TEXTENCODING_SYMBOL ); } -SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) +SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; @@ -664,7 +664,7 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) rImpl_Font.maFamilyName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); rImpl_Font.maStyleName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); - rIStm >> rImpl_Font.maSize; + ReadPair( rIStm, rImpl_Font.maSize ); rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; rIStm >> nTmp16; rImpl_Font.meFamily = (FontFamily) nTmp16; @@ -736,10 +736,10 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) return rOStm; } -SvStream& operator>>( SvStream& rIStm, Font& rFont ) +SvStream& ReadFont( SvStream& rIStm, Font& rFont ) { rFont.MakeUnique(); - return( rIStm >> *rFont.mpImplFont ); + return ReadImpl_Font( rIStm, *rFont.mpImplFont ); } SvStream& WriteFont( SvStream& rOStm, const Font& rFont ) diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 6d3e213be91d..45623853bfda 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -880,7 +880,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) { // read SvtGraphicFill SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ); - aMemStm >> aFilling; + ReadSvtGraphicFill( aMemStm, aFilling ); } aFilling.getPath(aPath); @@ -921,7 +921,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) { // read SvtGraphicFill SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ); - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); } aStroke.getPath(aPath); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index cdef014221c7..d11fbbbbd9ee 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1197,7 +1197,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) if ( bPathStroke ) { SvtGraphicStroke aStroke; - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); Polygon aPath; aStroke.getPath( aPath ); aStroke.setPath( ImplGetRotatedPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) ); @@ -1208,7 +1208,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) else { SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); PolyPolygon aPath; aFill.getPath( aPath ); aFill.setPath( ImplGetRotatedPolyPolygon( aPath, aRotAnchor, aRotOffset, fSin, fCos ) ); @@ -2726,7 +2726,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const return( nSizeBytes ); } -SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) +SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) { if( !rIStm.GetError() ) { @@ -2751,8 +2751,8 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) pCompat = new VersionCompat( rIStm, STREAM_READ ); rIStm >> nStmCompressMode; - rIStm >> rGDIMetaFile.aPrefMapMode; - rIStm >> rGDIMetaFile.aPrefSize; + ReadMapMode( rIStm, rGDIMetaFile.aPrefMapMode ); + ReadPair( rIStm, rGDIMetaFile.aPrefSize ); rIStm >> nCount; delete pCompat; @@ -2830,7 +2830,7 @@ Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior" SvStream& GDIMetaFile::Read( SvStream& rIStm ) { Clear(); - rIStm >> *this; + ReadGDIMetaFile( rIStm, *this ); return rIStm; } diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index de5daf3444d2..51f9cc344d01 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -293,7 +293,7 @@ SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink ) return rOStream; } -SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink) +SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink) { Size aSize; MapMode aMapMode; @@ -309,7 +309,8 @@ SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink) if( pCompat->GetVersion() >= 2 ) { - rIStream >> aSize >> aMapMode; + ReadPair( rIStream, aSize ); + ReadMapMode( rIStream, aMapMode ); bMapAndSizeValid = true; } diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index 89d3ec182b62..73ca288f8ddf 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -286,16 +286,16 @@ sal_Bool Gradient::operator==( const Gradient& rGradient ) const return sal_False; } -SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImpl_Gradient ) +SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImpl_Gradient ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; rIStm >> nTmp16; rImpl_Gradient.meStyle = (GradientStyle) nTmp16; - rIStm >> rImpl_Gradient.maStartColor >> - rImpl_Gradient.maEndColor >> - rImpl_Gradient.mnAngle >> + ReadColor( rIStm, rImpl_Gradient.maStartColor ); + ReadColor( rIStm, rImpl_Gradient.maEndColor ); + rIStm >> rImpl_Gradient.mnAngle >> rImpl_Gradient.mnBorder >> rImpl_Gradient.mnOfsX >> rImpl_Gradient.mnOfsY >> @@ -324,10 +324,10 @@ SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImpl_Gradie return rOStm; } -SvStream& operator>>( SvStream& rIStm, Gradient& rGradient ) +SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient ) { rGradient.MakeUnique(); - return( rIStm >> *rGradient.mpImplGradient ); + return ReadImpl_Gradient( rIStm, *rGradient.mpImplGradient ); } SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient ) diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index afa17a3aff5f..20b1b090464c 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -306,7 +306,7 @@ sal_Bool Graphic::operator!() const void Graphic::Load( SvStream& rIStm ) { - rIStm >> *this; + ReadGraphic( rIStm, *this ); } void Graphic::Save( SvStream& rOStm ) @@ -571,10 +571,10 @@ sal_Bool Graphic::ExportNative( SvStream& rOStream ) const return mpImpGraphic->ImplExportNative( rOStream ); } -SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic ) +SvStream& ReadGraphic( SvStream& rIStream, Graphic& rGraphic ) { rGraphic.ImplTestRefCount(); - return rIStream >> *rGraphic.mpImpGraphic; + return ReadImpGraphic( rIStream, *rGraphic.mpImpGraphic ); } SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic ) diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 31d9d61d23a7..b2a6eda87cfd 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -158,7 +158,7 @@ SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass return rOStm; } -SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass ) +SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass ) { VersionCompat aCompat( rIStm, STREAM_READ ); @@ -316,12 +316,12 @@ SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass ) return rOStm; } -SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass ) +SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass ) { VersionCompat aCompat( rIStm, STREAM_READ ); rClass.maPath.Read( rIStm ); - rIStm >> rClass.maFillColor; + ReadColor( rIStm, rClass.maFillColor ); rIStm >> rClass.mfTransparency; sal_uInt16 nTmp; rIStm >> nTmp; @@ -335,13 +335,13 @@ SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass ) rClass.mbTiling = nTmp; rIStm >> nTmp; rClass.maHatchType = SvtGraphicFill::HatchType( nTmp ); - rIStm >> rClass.maHatchColor; + ReadColor( rIStm, rClass.maHatchColor ); rIStm >> nTmp; rClass.maGradientType = SvtGraphicFill::GradientType( nTmp ); - rIStm >> rClass.maGradient1stColor; - rIStm >> rClass.maGradient2ndColor; + ReadColor( rIStm, rClass.maGradient1stColor ); + ReadColor( rIStm, rClass.maGradient2ndColor ); rIStm >> rClass.maGradientStepCount; - rIStm >> rClass.maFillGraphic; + ReadGraphic( rIStm, rClass.maFillGraphic ); return rIStm; } diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index b55b22abed2a..8ad2368da8f0 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -119,7 +119,7 @@ void Hatch::SetAngle( sal_uInt16 nAngle10 ) mpImplHatch->mnAngle = nAngle10; } -SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch ) +SvStream& ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; @@ -127,7 +127,7 @@ SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch ) rIStm >> nTmp16; rImplHatch.meStyle = (HatchStyle) nTmp16; //#fdo39428 SvStream no longer supports operator>>(long&) - rIStm >> rImplHatch.maColor >> nTmp32 >> rImplHatch.mnAngle; + ReadColor( rIStm, rImplHatch.maColor ) >> nTmp32 >> rImplHatch.mnAngle; rImplHatch.mnDistance = nTmp32; return rIStm; @@ -145,10 +145,10 @@ SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch ) return rOStm; } -SvStream& operator>>( SvStream& rIStm, Hatch& rHatch ) +SvStream& ReadHatch( SvStream& rIStm, Hatch& rHatch ) { rHatch.ImplMakeUnique(); - return( rIStm >> *rHatch.mpImplHatch ); + return ReadImplHatch( rIStm, *rHatch.mpImplHatch ); } SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch ) diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 5fe15726bdd8..b1b04606e497 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1015,8 +1015,8 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) rIStm >> nType; rIStm >> nLen; - rIStm >> aSize; - rIStm >> aMapMode; + ReadPair( rIStm, aSize ); + ReadMapMode( rIStm, aMapMode ); delete pCompat; } @@ -1173,7 +1173,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) } else if( meType == GRAPHIC_BITMAP || meType == GRAPHIC_GDIMETAFILE ) { - rIStm >> *this; + ReadImpGraphic( rIStm, *this ); bRet = ( rIStm.GetError() == 0UL ); } else if( sal::static_int_cast<sal_uLong>(meType) >= SYS_WINMETAFILE @@ -1587,7 +1587,7 @@ const SvgDataPtr& ImpGraphic::getSvgData() const return maSvgData; } -SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) +SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) { if( !rIStm.GetError() ) { @@ -1616,7 +1616,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) pCompat = new VersionCompat( rIStm, STREAM_READ ); delete pCompat; - rIStm >> aLink; + ReadGfxLink( rIStm, aLink ); // set dummy link to avoid creation of additional link after filtering; // we set a default link to avoid unnecessary swapping of native data @@ -1668,7 +1668,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) { delete rImpGraphic.mpAnimation; rImpGraphic.mpAnimation = new Animation; - rIStm >> *rImpGraphic.mpAnimation; + ReadAnimation( rIStm, *rImpGraphic.mpAnimation ); // #108077# manually set loaded BmpEx to Animation // (which skips loading its BmpEx if already done) @@ -1683,7 +1683,7 @@ SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ) rIStm.Seek( nStmPos1 ); rIStm.ResetError(); - rIStm >> aMtf; + ReadGDIMetaFile( rIStm, aMtf ); if( !rIStm.GetError() ) { diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index b0204af4cc39..35133b88ca30 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -221,7 +221,7 @@ sal_Bool JobSetup::operator==( const JobSetup& rJobSetup ) const return sal_False; } -SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ) +SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ) { DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version not set on rOStream" ); diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 0151836257ba..c733808b2ca5 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -229,7 +229,7 @@ sal_Bool LineInfo::IsDefault() const // ----------------------------------------------------------------------- -SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) +SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16(0); @@ -292,10 +292,10 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo // ----------------------------------------------------------------------- -SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo ) +SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo ) { rLineInfo.ImplMakeUnique(); - return( rIStm >> *rLineInfo.mpImplLineInfo ); + return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index d4286d57361d..56d8380e589a 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -43,14 +43,16 @@ ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) : mbSimple = sal_False; } -SvStream& operator>>( SvStream& rIStm, ImplMapMode& rImplMapMode ) +SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rImplMapMode ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; rIStm >> nTmp16; rImplMapMode.meUnit = (MapUnit) nTmp16; - rIStm >> rImplMapMode.maOrigin >> rImplMapMode.maScaleX >> - rImplMapMode.maScaleY >> rImplMapMode.mbSimple; + ReadPair( rIStm, rImplMapMode.maOrigin ); + ReadFraction( rIStm, rImplMapMode.maScaleX ); + ReadFraction( rIStm, rImplMapMode.maScaleY ); + rIStm >> rImplMapMode.mbSimple; return rIStm; } @@ -231,10 +233,10 @@ sal_Bool MapMode::IsDefault() const return sal_False; } -SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode ) +SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ) { rMapMode.ImplMakeUnique(); - return (rIStm >> *rMapMode.mpImplMapMode); + return ReadImplMapMode( rIStm, *rMapMode.mpImplMapMode ); } SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 307e81088fd0..30fcd3909153 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -298,7 +298,7 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPt; + ReadPair( rIStm, maPt ); maColor.Read( rIStm, true ); } @@ -364,7 +364,7 @@ void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPt; + ReadPair( rIStm, maPt ); } // ======================================================================== @@ -454,12 +454,13 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) COMPAT( rIStm ); // Version 1 - rIStm >> maStartPt >> maEndPt; + ReadPair( rIStm, maStartPt ); + ReadPair( rIStm, maEndPt ); // Version 2 if( aCompat.GetVersion() >= 2 ) { - rIStm >> maLineInfo; + ReadLineInfo( rIStm, maLineInfo ); } } @@ -525,7 +526,7 @@ void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect; + ReadRectangle( rIStm, maRect ); } // ======================================================================== @@ -598,7 +599,7 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect >> mnHorzRound >> mnVertRound; + ReadRectangle( rIStm, maRect ) >> mnHorzRound >> mnVertRound; } // ======================================================================== @@ -663,7 +664,7 @@ void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect; + ReadRectangle( rIStm, maRect ); } // ======================================================================== @@ -739,7 +740,9 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect >> maStartPt >> maEndPt; + ReadRectangle( rIStm, maRect ); + ReadPair( rIStm, maStartPt ); + ReadPair( rIStm, maEndPt ); } // ======================================================================== @@ -815,7 +818,9 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect >> maStartPt >> maEndPt; + ReadRectangle( rIStm, maRect ); + ReadPair( rIStm, maStartPt ); + ReadPair( rIStm, maEndPt ); } // ======================================================================== @@ -891,7 +896,9 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect >> maStartPt >> maEndPt; + ReadRectangle( rIStm, maRect ); + ReadPair( rIStm, maStartPt ); + ReadPair( rIStm, maEndPt ); } // ======================================================================== @@ -987,11 +994,11 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) COMPAT( rIStm ); // Version 1 - rIStm >> maPoly; + ReadPolygon( rIStm, maPoly ); // Version 2 if( aCompat.GetVersion() >= 2 ) - rIStm >> maLineInfo; + ReadLineInfo( rIStm, maLineInfo ); if ( aCompat.GetVersion() >= 3 ) { sal_uInt8 bHasPolyFlags; @@ -1072,7 +1079,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPoly; // Version 1 + ReadPolygon( rIStm, maPoly ); // Version 1 if( aCompat.GetVersion() >= 2 ) // Version 2 { @@ -1172,7 +1179,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPolyPoly; // Version 1 + ReadPolyPolygon( rIStm, maPolyPoly ); // Version 1 if ( aCompat.GetVersion() >= 2 ) // Version 2 { @@ -1262,7 +1269,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); - rIStm >> maPt; + ReadPair( rIStm, maPt ); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnIndex; rIStm >> mnLen; @@ -1407,7 +1414,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) delete[] mpDXAry; COMPAT( rIStm ); - rIStm >> maStartPt; + ReadPair( rIStm, maStartPt ); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnIndex; rIStm >> mnLen; @@ -1537,7 +1544,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); - rIStm >> maPt; + ReadPair( rIStm, maPt ); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnWidth; rIStm >> mnIndex; @@ -1618,7 +1625,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); - rIStm >> maRect; + ReadRectangle( rIStm, maRect ); maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet); rIStm >> mnStyle; @@ -1711,7 +1718,7 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* ) //#fdo39428 SvStream no longer supports operator>>(long&) sal_uInt32 nTemp; sal_Int32 nTemp2; - rIStm >> maPos; + ReadPair( rIStm, maPos ); rIStm >> nTemp2; mnWidth = nTemp2; rIStm >> nTemp; @@ -1793,7 +1800,7 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIB(maBmp, rIStm, true); - rIStm >> maPt; + ReadPair( rIStm, maPt ); } // ======================================================================== @@ -1872,7 +1879,8 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIB(maBmp, rIStm, true); - rIStm >> maPt >> maSz; + ReadPair( rIStm, maPt ); + ReadPair( rIStm, maSz ); } // ======================================================================== @@ -1958,7 +1966,10 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIB(maBmp, rIStm, true); - rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz; + ReadPair( rIStm, maDstPt ); + ReadPair( rIStm, maDstSz ); + ReadPair( rIStm, maSrcPt ); + ReadPair( rIStm, maSrcSz ); } // ======================================================================== @@ -2030,7 +2041,7 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIBBitmapEx(maBmpEx, rIStm); - rIStm >> maPt; + ReadPair( rIStm, maPt ); } // ======================================================================== @@ -2109,7 +2120,8 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIBBitmapEx(maBmpEx, rIStm); - rIStm >> maPt >> maSz; + ReadPair( rIStm, maPt ); + ReadPair( rIStm, maSz ); } // ======================================================================== @@ -2195,7 +2207,10 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIBBitmapEx(maBmpEx, rIStm); - rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz; + ReadPair( rIStm, maDstPt ); + ReadPair( rIStm, maDstSz ); + ReadPair( rIStm, maSrcPt ); + ReadPair( rIStm, maSrcSz ); } // ======================================================================== @@ -2271,7 +2286,7 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIB(maBmp, rIStm, true); - rIStm >> maPt; + ReadPair( rIStm, maPt ); } // ======================================================================== @@ -2353,7 +2368,8 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadDIB(maBmp, rIStm, true); - rIStm >> maPt >> maSz; + ReadPair( rIStm, maPt ); + ReadPair( rIStm, maSz ); } // ======================================================================== @@ -2444,7 +2460,10 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* ) COMPAT( rIStm ); ReadDIB(maBmp, rIStm, true); maColor.Read( rIStm, true ); - rIStm >> maDstPt >> maDstSz >> maSrcPt >> maSrcSz; + ReadPair( rIStm, maDstPt ); + ReadPair( rIStm, maDstSz ); + ReadPair( rIStm, maSrcPt ); + ReadPair( rIStm, maSrcSz ); } // ======================================================================== @@ -2512,7 +2531,8 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect >> maGradient; + ReadRectangle( rIStm, maRect ); + ReadGradient( rIStm, maGradient ); } // ======================================================================== @@ -2599,7 +2619,8 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPolyPoly >> maGradient; + ReadPolyPolygon( rIStm, maPolyPoly ); + ReadGradient( rIStm, maGradient ); } // ======================================================================== @@ -2673,7 +2694,8 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPolyPoly >> maHatch; + ReadPolyPolygon( rIStm, maPolyPoly ); + ReadHatch( rIStm, maHatch ); } // ======================================================================== @@ -2741,7 +2763,7 @@ void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maWallpaper; + ReadWallpaper( rIStm, maWallpaper ); } // ======================================================================== @@ -2812,7 +2834,8 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRegion >> mbClip; + ReadRegion( rIStm, maRegion ); + rIStm >> mbClip; } // ======================================================================== @@ -2877,7 +2900,7 @@ void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* p void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRect; + ReadRectangle( rIStm, maRect ); } // ======================================================================== @@ -2942,7 +2965,7 @@ void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRegion; + ReadRegion( rIStm, maRegion ); } // ======================================================================== @@ -3463,7 +3486,7 @@ void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maMapMode; + ReadMapMode( rIStm, maMapMode ); } // ======================================================================== @@ -3536,7 +3559,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData ) { COMPAT( rIStm ); - rIStm >> maFont; + ReadFont( rIStm, maFont ); pData->meActualCharSet = maFont.GetCharSet(); if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW ) pData->meActualCharSet = osl_getThreadTextEncoding(); @@ -3759,7 +3782,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maPolyPoly; + ReadPolyPolygon( rIStm, maPolyPoly ); rIStm >> mnTransPercent; } @@ -3839,7 +3862,10 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maMtf >> maPoint >> maSize >> maGradient; + ReadGDIMetaFile( rIStm, maMtf ); + ReadPair( rIStm, maPoint ); + ReadPair( rIStm, maSize ); + ReadGradient( rIStm, maGradient ); } // ======================================================================== @@ -3917,10 +3943,10 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maGfxLink; - rIStm >> maPoint; - rIStm >> maSize; - rIStm >> maSubst; + ReadGfxLink( rIStm, maGfxLink ); + ReadPair( rIStm, maPoint ); + ReadPair( rIStm, maSize ); + ReadGDIMetaFile( rIStm, maSubst ); } // ======================================================================== @@ -3977,7 +4003,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - rIStm >> maRefPoint >> mbSet; + ReadPair( rIStm, maRefPoint ) >> mbSet; } // ======================================================================== @@ -4067,7 +4093,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) if ( bPathStroke ) { SvtGraphicStroke aStroke; - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); Polygon aPath; aStroke.getPath( aPath ); @@ -4089,7 +4115,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove ) else { SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); PolyPolygon aPath; aFill.getPath( aPath ); @@ -4124,14 +4150,14 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) if ( bPathStroke ) { SvtGraphicStroke aStroke; - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); aStroke.scale( fXScale, fYScale ); WriteSvtGraphicStroke( aDest, aStroke ); } else { SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); PolyPolygon aPath; aFill.getPath( aPath ); aPath.Scale( fXScale, fYScale ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index b04565905a47..135d5b0a43a2 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -563,7 +563,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa { sSeqEnd = OString("XPATHSTROKE_SEQ_END"); SvtGraphicStroke aStroke; - aMemStm >> aStroke; + ReadSvtGraphicStroke( aMemStm, aStroke ); Polygon aPath; aStroke.getPath( aPath ); @@ -648,7 +648,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa { sSeqEnd = OString("XPATHFILL_SEQ_END"); SvtGraphicFill aFill; - aMemStm >> aFill; + ReadSvtGraphicFill( aMemStm, aFill ); if ( ( aFill.getFillType() == SvtGraphicFill::fillSolid ) && ( aFill.getFillRule() == SvtGraphicFill::fillEvenOdd ) ) { diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 5fd03256fa84..a77bdce9ec51 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -264,7 +264,7 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) } -SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ) +SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) { VersionCompat aCompat( rIStream, STREAM_READ ); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index b2ad73285b05..5432c9b79267 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1558,7 +1558,7 @@ bool Region::operator==( const Region& rRegion ) const return false; } -SvStream& operator>>(SvStream& rIStrm, Region& rRegion) +SvStream& ReadRegion(SvStream& rIStrm, Region& rRegion) { VersionCompat aCompat(rIStrm, STREAM_READ); sal_uInt16 nVersion(0); @@ -1605,7 +1605,7 @@ SvStream& operator>>(SvStream& rIStrm, Region& rRegion) if(bHasPolyPolygon) { PolyPolygon* pNewPoly = new PolyPolygon(); - rIStrm >> *pNewPoly; + ReadPolyPolygon( rIStrm, *pNewPoly ); rRegion.mpPolyPolygon.reset(pNewPoly); } } diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 3b7bbab66562..a303d25ca508 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -97,7 +97,7 @@ void ImplWallpaper::ImplReleaseCachedBitmap() // ----------------------------------------------------------------------- -SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) +SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; @@ -112,7 +112,7 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) rImplWallpaper.mpBitmap = NULL; // version 1 - rIStm >> rImplWallpaper.maColor; + ReadColor( rIStm, rImplWallpaper.maColor ); rIStm >> nTmp16; rImplWallpaper.meStyle = (WallpaperStyle) nTmp16; // version 2 @@ -125,13 +125,13 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) if( bRect ) { rImplWallpaper.mpRect = new Rectangle; - rIStm >> *rImplWallpaper.mpRect; + ReadRectangle( rIStm, *rImplWallpaper.mpRect ); } if( bGrad ) { rImplWallpaper.mpGradient = new Gradient; - rIStm >> *rImplWallpaper.mpGradient; + ReadGradient( rIStm, *rImplWallpaper.mpGradient ); } if( bBmp ) @@ -549,10 +549,10 @@ sal_Bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const // ----------------------------------------------------------------------- -SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper ) +SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) { rWallpaper.ImplMakeUnique(); - return( rIStm >> *rWallpaper.mpImplWallpaper ); + return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper ); } // ----------------------------------------------------------------------- |