[Libreoffice-commits] core.git: chart2/source cppcanvas/source dbaccess/source editeng/source filter/source include/filter include/sot include/svtools include/svx include/tools include/vcl sc/inc sc/source sd/source sfx2/source sot/source svl/source svtools/source svx/inc svx/source sw/source toolkit/source tools/source vcl/inc vcl/source
Noel Grandin
noel at peralex.com
Tue Feb 4 14:51:14 PST 2014
chart2/source/controller/main/ChartController_Tools.cxx | 2
cppcanvas/source/inc/implrenderer.hxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 12 -
cppcanvas/source/mtfrenderer/implrenderer.cxx | 4
dbaccess/source/ui/inc/TableRow.hxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
dbaccess/source/ui/tabledesign/TableRow.cxx | 2
editeng/source/items/bulitem.cxx | 2
editeng/source/items/frmitems.cxx | 16 -
editeng/source/items/numitem.cxx | 6
editeng/source/items/textitem.cxx | 5
filter/source/flash/swfwriter1.cxx | 4
filter/source/graphicfilter/eps/eps.cxx | 4
filter/source/graphicfilter/icgm/cgm.hxx | 2
filter/source/msfilter/dffpropset.cxx | 4
filter/source/msfilter/dffrecordheader.cxx | 2
filter/source/msfilter/msdffimp.cxx | 56 ++---
filter/source/msfilter/svdfppt.cxx | 156 ++++++++--------
filter/source/svg/svgwriter.cxx | 6
include/filter/msfilter/dffpropset.hxx | 2
include/filter/msfilter/dffrecordheader.hxx | 2
include/filter/msfilter/msdffimp.hxx | 4
include/filter/msfilter/svdfppt.hxx | 26 +-
include/sot/filelist.hxx | 2
include/svtools/grfmgr.hxx | 4
include/svtools/transfer.hxx | 2
include/svx/galtheme.hxx | 2
include/svx/svdsob.hxx | 4
include/svx/xexch.hxx | 2
include/tools/color.hxx | 2
include/tools/fract.hxx | 2
include/tools/gen.hxx | 4
include/tools/inetmsg.hxx | 4
include/tools/poly.hxx | 4
include/vcl/animate.hxx | 2
include/vcl/font.hxx | 2
include/vcl/gdimtf.hxx | 2
include/vcl/gfxlink.hxx | 2
include/vcl/gradient.hxx | 4
include/vcl/graph.hxx | 2
include/vcl/graphictools.hxx | 4
include/vcl/hatch.hxx | 4
include/vcl/jobset.hxx | 2
include/vcl/lineinfo.hxx | 4
include/vcl/mapmod.hxx | 4
include/vcl/print.hxx | 2
include/vcl/region.hxx | 2
include/vcl/wall.hxx | 2
sc/inc/bigrange.hxx | 14 -
sc/source/filter/excel/xiescher.cxx | 8
sc/source/ui/view/viewfun3.cxx | 2
sc/source/ui/view/viewfun5.cxx | 2
sd/source/filter/html/pubdlg.cxx | 10 -
sd/source/filter/ppt/pptanimations.hxx | 2
sd/source/filter/ppt/pptatom.cxx | 2
sd/source/filter/ppt/pptin.cxx | 24 +-
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/sdview3.cxx | 4
sfx2/source/appl/linkmgr2.cxx | 2
sfx2/source/view/printer.cxx | 2
sot/source/base/filelist.cxx | 4
sot/source/base/formats.cxx | 2
sot/source/sdstor/stgelem.cxx | 12 -
sot/source/sdstor/stgelem.hxx | 2
sot/source/sdstor/stgole.cxx | 2
svl/source/items/ptitem.cxx | 2
svl/source/items/rectitem.cxx | 2
svl/source/items/szitem.cxx | 2
svtools/source/graphic/grfattr.cxx | 2
svtools/source/graphic/grfmgr.cxx | 10 -
svtools/source/misc/imap.cxx | 8
svtools/source/misc/transfer.cxx | 10 -
svx/inc/galobj.hxx | 2
svx/source/gallery2/gallery1.cxx | 2
svx/source/gallery2/galobj.cxx | 4
svx/source/gallery2/galtheme.cxx | 6
svx/source/xoutdev/xattr.cxx | 2
svx/source/xoutdev/xattrbmp.cxx | 4
svx/source/xoutdev/xexch.cxx | 2
sw/source/ui/dochdl/swdtflvr.cxx | 2
toolkit/source/awt/vclxprinter.cxx | 2
tools/source/generic/color.cxx | 4
tools/source/generic/fract.cxx | 2
tools/source/generic/gen.cxx | 4
tools/source/generic/poly.cxx | 6
tools/source/generic/poly2.cxx | 4
tools/source/inet/inetmsg.cxx | 2
vcl/inc/impfont.hxx | 2
vcl/inc/impgraph.hxx | 2
vcl/inc/wall2.hxx | 2
vcl/source/filter/graphicfilter.cxx | 6
vcl/source/filter/graphicfilter2.cxx | 4
vcl/source/filter/sgfbram.cxx | 18 -
vcl/source/filter/sgfbram.hxx | 6
vcl/source/filter/sgvmain.cxx | 58 ++---
vcl/source/filter/sgvmain.hxx | 22 +-
vcl/source/filter/wmf/winmtf.hxx | 2
vcl/source/gdi/animate.cxx | 8
vcl/source/gdi/cvtsvm.cxx | 67 ++++--
vcl/source/gdi/dibtools.cxx | 2
vcl/source/gdi/font.cxx | 8
vcl/source/gdi/gdimetafiletools.cxx | 4
vcl/source/gdi/gdimtf.cxx | 12 -
vcl/source/gdi/gfxlink.cxx | 5
vcl/source/gdi/gradient.cxx | 12 -
vcl/source/gdi/graph.cxx | 6
vcl/source/gdi/graphictools.cxx | 14 -
vcl/source/gdi/hatch.cxx | 8
vcl/source/gdi/impgraph.cxx | 14 -
vcl/source/gdi/jobset.cxx | 2
vcl/source/gdi/lineinfo.cxx | 6
vcl/source/gdi/mapmod.cxx | 12 -
vcl/source/gdi/metaact.cxx | 122 +++++++-----
vcl/source/gdi/pdfwriter_impl2.cxx | 4
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/region.cxx | 4
vcl/source/gdi/wall.cxx | 12 -
117 files changed, 536 insertions(+), 483 deletions(-)
New commits:
commit 186b4ebc99a2e80740fee51f9d0276886a003617
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jan 30 13:46:42 2014 +0200
convert specialised SvStream::operator>> methods to ReadXXX methods
as preparation for converting the SvStream::operator>> methods on
primitive types
Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9
Reviewed-on: https://gerrit.libreoffice.org/7798
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 7ee860cc..1fbd176 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 d09ed1c..1d76ed7 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 0160a4d..48e0cd3 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 9b65a41..d5ec542 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 e503928..2fc48d1 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 7f5cc44..cfd9259 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 f996447..a53f69f 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 321907f..d7af9a2 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 213fd8b..8c7c25c 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 47bf1e0..528142c 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 28f5f07..ca05fae 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 482ab75..c787275 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 0786476..0528316 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 a3c81cc..206d663 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 dbc3316..695ecde 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 74c2c85..3d9bae9 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 7c50cf5..7e6c7f3 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 18e380d..da8cf92 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 a0ec7da..19691fe 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 9297681..6237e8d 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 9453a0d..a365217 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 37157e5..c2bf039 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 eee3192..f76123a 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 6149ddfc..220b512 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 8e0a330..88ba220 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 89e8130..7e97838 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 f657a00..0f76524 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 18a15a7..150d29a 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 4cba3bc..0154adf 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 626f625..9fedd25 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 2e1bb20..41820e7 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 e3a33ca..bc3fb35 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 4c07726..1f9e477 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 ce96dc5..5f5171c 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 9667038..7d5c731 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 8a2fb76..d49d647 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 a922709..a322f8e 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 15c9170..1bf3f68 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 e0cb0f4..3a10dc0 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 12221ec..ec04cd7 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 ff170f5..0140b5d 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 da669b3..7ba89eb 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 fb0f8ba..180b4ba 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 e198970..9f72675 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 17beccf..bfdc284 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 44ffa71..e0e11351 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 3a3a64b..af4941d 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 f7a4608..4f4113f 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 6e8aed4..5166d83 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 8c54263..29dcb6f 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 63f4a44..e501458 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 a4d5394..26e5439 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 e2ac8f0..9004f17 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 4340967..bf9ddf2 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 51afde3..69d964a 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 e28dba6..5398d39 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 cc6229f..d7317f4 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 e3e4efa..3b755f1 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() )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list