[Libreoffice-commits] core.git: 2 commits - basic/source compilerplugins/clang connectivity/source dbaccess/source editeng/source extensions/source filter/source include/tools sc/source sd/source sfx2/source sot/source starmath/source svl/source svtools/source svx/source sw/source toolkit/source tools/source vcl/source writerfilter/source
Noel Grandin
noel at peralex.com
Fri Jan 10 05:26:43 PST 2014
basic/source/classes/image.cxx | 24
basic/source/classes/sb.cxx | 2
basic/source/classes/sbxmod.cxx | 16
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/methods1.cxx | 26
basic/source/sbx/sbxarray.cxx | 8
basic/source/sbx/sbxbase.cxx | 20
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxobj.cxx | 48 -
basic/source/sbx/sbxvalue.cxx | 30
basic/source/sbx/sbxvar.cxx | 22
compilerplugins/clang/svstreamoutputoperators.cxx | 181 +++++
connectivity/source/drivers/dbase/DTable.cxx | 88 +-
connectivity/source/drivers/dbase/dindexnode.cxx | 8
dbaccess/source/ui/tabledesign/TableRow.cxx | 28
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
editeng/source/editeng/editobj.cxx | 40 -
editeng/source/items/bulitem.cxx | 34 -
editeng/source/items/flditem.cxx | 22
editeng/source/items/frmitems.cxx | 123 ++-
editeng/source/items/numitem.cxx | 60 -
editeng/source/items/optitems.cxx | 4
editeng/source/items/paraitem.cxx | 50 -
editeng/source/items/svdfield.cxx | 2
editeng/source/items/textitem.cxx | 64 +-
extensions/source/scanner/sane.cxx | 78 +-
filter/source/flash/swfwriter.cxx | 6
filter/source/flash/swfwriter2.cxx | 22
filter/source/graphicfilter/egif/egif.cxx | 82 +-
filter/source/graphicfilter/egif/giflzwc.cxx | 6
filter/source/graphicfilter/eos2met/eos2met.cxx | 308 ++++-----
filter/source/graphicfilter/epbm/epbm.cxx | 20
filter/source/graphicfilter/epgm/epgm.cxx | 32 -
filter/source/graphicfilter/epict/epict.cxx | 250 ++++----
filter/source/graphicfilter/eppm/eppm.cxx | 36 -
filter/source/graphicfilter/eps/eps.cxx | 150 ++--
filter/source/graphicfilter/eras/eras.cxx | 28
filter/source/graphicfilter/etiff/etiff.cxx | 42 -
filter/source/graphicfilter/expm/expm.cxx | 36 -
filter/source/graphicfilter/ieps/ieps.cxx | 6
filter/source/graphicfilter/ios2met/ios2met.cxx | 10
filter/source/msfilter/escherex.cxx | 278 ++++----
filter/source/msfilter/msdffimp.cxx | 20
filter/source/msfilter/svdfppt.cxx | 4
include/tools/stream.hxx | 91 ++
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/patattr.cxx | 4
sc/source/core/tool/autoform.cxx | 74 +-
sc/source/core/tool/ddelink.cxx | 4
sc/source/core/tool/rechead.cxx | 10
sc/source/core/tool/zforauto.cxx | 2
sc/source/filter/excel/xecontent.cxx | 6
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xestream.cxx | 22
sc/source/filter/excel/xiescher.cxx | 12
sc/source/filter/excel/xiformula.cxx | 4
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2
sc/source/ui/docshell/impex.cxx | 24
sd/source/core/sdiocmpt.cxx | 4
sd/source/filter/eppt/eppt.cxx | 316 +++++-----
sd/source/filter/eppt/epptso.cxx | 624 ++++++++++----------
sd/source/filter/eppt/escherex.cxx | 68 +-
sd/source/filter/eppt/pptexanimations.cxx | 124 +--
sd/source/filter/eppt/pptexsoundcollection.cxx | 20
sd/source/filter/eppt/pptx-stylesheet.cxx | 90 +-
sd/source/filter/eppt/pptx-text.cxx | 2
sd/source/filter/html/htmlex.cxx | 8
sd/source/filter/html/pubdlg.cxx | 38 -
sd/source/ui/dlg/morphdlg.cxx | 6
sd/source/ui/dlg/vectdlg.cxx | 4
sfx2/source/doc/oleprops.cxx | 49 -
sfx2/source/doc/zoomitem.cxx | 6
sot/source/sdstor/stgelem.cxx | 84 +-
sot/source/sdstor/stgole.cxx | 28
sot/source/sdstor/stgstrms.cxx | 2
sot/source/sdstor/storinfo.cxx | 12
sot/source/sdstor/ucbstorage.cxx | 2
starmath/source/mathtype.cxx | 590 +++++++++---------
svl/source/filerec/filerec.cxx | 36 -
svl/source/items/cenumitm.cxx | 4
svl/source/items/cintitem.cxx | 8
svl/source/items/flagitem.cxx | 2
svl/source/items/intitem.cxx | 2
svl/source/items/itemset.cxx | 4
svl/source/items/lckbitem.cxx | 4
svl/source/items/macitem.cxx | 8
svl/source/items/rngitem.cxx | 4
svl/source/items/slstitm.cxx | 4
svl/source/items/visitem.cxx | 2
svl/source/numbers/numhead.cxx | 10
svl/source/numbers/zformat.cxx | 32 -
svtools/source/graphic/grfattr.cxx | 16
svtools/source/graphic/grfmgr.cxx | 3
svtools/source/misc/imap3.cxx | 2
svtools/source/misc/templatefoldercache.cxx | 20
svtools/source/misc/transfer.cxx | 14
svx/source/gallery2/codec.cxx | 6
svx/source/gallery2/gallery1.cxx | 2
svx/source/gallery2/galobj.cxx | 6
svx/source/items/algitem.cxx | 8
svx/source/items/grfitem.cxx | 2
svx/source/items/hlnkitem.cxx | 16
svx/source/items/pageitem.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 6
svx/source/svdraw/svdattr.cxx | 10
svx/source/xoutdev/xattr.cxx | 66 +-
svx/source/xoutdev/xexch.cxx | 6
sw/source/core/doc/swserv.cxx | 2
sw/source/core/doc/tblafmt.cxx | 82 +-
sw/source/core/edit/edglss.cxx | 2
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/dbg_lay.cxx | 3
sw/source/core/layout/laycache.cxx | 26
sw/source/core/unocore/unoobj.cxx | 2
sw/source/filter/ascii/wrtasc.cxx | 5
sw/source/filter/html/htmldraw.cxx | 8
sw/source/filter/html/htmlfldw.cxx | 18
sw/source/filter/html/htmlfly.cxx | 62 -
sw/source/filter/html/htmlftn.cxx | 24
sw/source/filter/html/htmlnum.cxx | 6
sw/source/filter/html/htmlplug.cxx | 40 -
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/WW8FFData.cxx | 6
sw/source/filter/ww8/rtfstringbuffer.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 64 +-
sw/source/filter/ww8/wrtw8num.cxx | 12
sw/source/filter/ww8/wrtw8sty.cxx | 6
sw/source/filter/ww8/wrtww8.cxx | 20
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/ui/app/docsh2.cxx | 6
sw/source/ui/dochdl/swdtflvr.cxx | 2
toolkit/source/awt/vclxprinter.cxx | 2
tools/source/generic/color.cxx | 10
tools/source/generic/fract.cxx | 4
tools/source/generic/gen.cxx | 10
tools/source/generic/poly.cxx | 10
tools/source/generic/poly2.cxx | 4
tools/source/inet/inetmsg.cxx | 10
tools/source/inet/inetstrm.cxx | 30
tools/source/ref/globname.cxx | 6
tools/source/ref/pstm.cxx | 36 -
tools/source/stream/stream.cxx | 107 ++-
tools/source/stream/vcompat.cxx | 4
vcl/source/filter/wmf/emfwr.cxx | 180 ++---
vcl/source/filter/wmf/enhwmf.cxx | 48 -
vcl/source/filter/wmf/winmtf.cxx | 6
vcl/source/filter/wmf/wmfwr.cxx | 177 ++---
vcl/source/gdi/animate.cxx | 18
vcl/source/gdi/cvtsvm.cxx | 397 ++++++------
vcl/source/gdi/dibtools.cxx | 90 +-
vcl/source/gdi/font.cxx | 42 -
vcl/source/gdi/gdimtf.cxx | 4
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/gdi/gradient.cxx | 19
vcl/source/gdi/graphictools.cxx | 30
vcl/source/gdi/hatch.cxx | 4
vcl/source/gdi/jobset.cxx | 8
vcl/source/gdi/lineinfo.cxx | 12
vcl/source/gdi/mapmod.cxx | 6
vcl/source/gdi/metaact.cxx | 81 +-
vcl/source/gdi/pdfwriter_impl.cxx | 2
vcl/source/gdi/pngwrite.cxx | 10
vcl/source/gdi/print.cxx | 4
vcl/source/gdi/region.cxx | 6
vcl/source/gdi/regionband.cxx | 14
vcl/source/gdi/wall.cxx | 5
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 8
168 files changed, 3543 insertions(+), 3230 deletions(-)
New commits:
commit b69864f3f8c9be2e1f28f4b422074d2040b084a0
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jan 8 08:48:26 2014 +0200
re-write SvStream operator<< to non-overloaded methods
This is the actual re-write.
Use a clang rewriter to rewrite SvStream::operator<< to methods
like WriteuInt32.
Note that the rewriter is not perfect, and I hand-tweaked the output.
In particular, I had to adjust places doing things like
(*this) << 1;
Change-Id: I5923eda3f4ebaa8b452b6ef109e726e116235a2a
Reviewed-on: https://gerrit.libreoffice.org/7342
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 66d7985..2cf81ae 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -84,7 +84,7 @@ bool SbiGood( SvStream& r )
sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem )
{
sal_uIntPtr nPos = r.Tell();
- r << nSignature << (sal_Int32) 0 << nElem;
+ r.WriteUInt16( nSignature ).WriteInt32( (sal_Int32) 0 ).WriteUInt16( nElem );
return nPos;
}
@@ -93,7 +93,7 @@ void SbiCloseRecord( SvStream& r, sal_uIntPtr nOff )
{
sal_uIntPtr nPos = r.Tell();
r.Seek( nOff + 2 );
- r << (sal_Int32) ( nPos - nOff - 8 );
+ r.WriteInt32( (sal_Int32) ( nPos - nOff - 8 ) );
r.Seek( nPos );
}
@@ -258,18 +258,18 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
eCharSet = GetSOStoreTextEncoding( eCharSet );
if ( bLegacy )
{
- r << (sal_Int32) B_LEGACYVERSION;
+ r.WriteInt32( (sal_Int32) B_LEGACYVERSION );
}
else
{
- r << (sal_Int32) B_CURVERSION;
+ r.WriteInt32( (sal_Int32) B_CURVERSION );
}
- r << (sal_Int32) eCharSet
- << (sal_Int32) nDimBase
- << (sal_Int16) nFlags
- << (sal_Int16) 0
- << (sal_Int32) 0
- << (sal_Int32) 0;
+ r .WriteInt32( (sal_Int32) eCharSet )
+ .WriteInt32( (sal_Int32) nDimBase )
+ .WriteInt16( (sal_Int16) nFlags )
+ .WriteInt16( (sal_Int16) 0 )
+ .WriteInt32( (sal_Int32) 0 )
+ .WriteInt32( (sal_Int32) 0 );
// Name?
if( !aName.isEmpty() && SbiGood( r ) )
@@ -321,7 +321,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
for( i = 0; i < nStrings && SbiGood( r ); i++ )
{
- r << (sal_uInt32) pStringOff[ i ];
+ r.WriteUInt32( (sal_uInt32) pStringOff[ i ] );
}
// Then the String-Block
char* pByteStrings = new char[ nStringSize ];
@@ -331,7 +331,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
OString aStr(OUStringToOString(OUString(pStrings + nOff), eCharSet));
memcpy( pByteStrings + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) );
}
- r << (sal_uInt32) nStringSize;
+ r.WriteUInt32( (sal_uInt32) nStringSize );
r.Write( pByteStrings, nStringSize );
delete[] pByteStrings;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 0e60e1b..84dac3f 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1932,7 +1932,7 @@ sal_Bool StarBASIC::StoreData( SvStream& r ) const
{
return sal_False;
}
- r << (sal_uInt16) pModules->Count();
+ r.WriteUInt16( (sal_uInt16) pModules->Count() );
for( sal_uInt16 i = 0; i < pModules->Count(); i++ )
{
SbModule* p = (SbModule*) pModules->Get( i );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index a3be564..9f283d5 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1722,7 +1722,7 @@ sal_Bool SbModule::StoreData( SvStream& rStrm ) const
pImage->aOUSource = aOUSource;
pImage->aComment = aComment;
pImage->aName = GetName();
- rStrm << (sal_uInt8) 1;
+ rStrm.WriteUChar( (sal_uInt8) 1 );
// # PCode is saved only for legacy formats only
// It should be noted that it probably isn't necessary
// It would be better not to store the image ( more flexible with
@@ -1739,7 +1739,7 @@ sal_Bool SbModule::StoreData( SvStream& rStrm ) const
aImg.aOUSource = aOUSource;
aImg.aComment = aComment;
aImg.aName = GetName();
- rStrm << (sal_uInt8) 1;
+ rStrm.WriteUChar( (sal_uInt8) 1 );
return aImg.Save( rStrm );
}
}
@@ -1862,7 +1862,7 @@ sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
pImage->aComment = aComment;
pImage->aName = GetName();
- rStrm << (sal_uInt8) 1;
+ rStrm.WriteUChar( (sal_uInt8) 1 );
if ( nVer )
bRet = pImage->Save( rStrm, B_EXT_IMG_VERSION );
else
@@ -2090,11 +2090,11 @@ sal_Bool SbMethod::StoreData( SvStream& rStrm ) const
{
if( !SbxMethod::StoreData( rStrm ) )
return sal_False;
- rStrm << (sal_Int16) nDebugFlags
- << (sal_Int16) nLine1
- << (sal_Int16) nLine2
- << (sal_Int16) nStart
- << (sal_uInt8) bInvalid;
+ rStrm.WriteInt16( (sal_Int16) nDebugFlags )
+ .WriteInt16( (sal_Int16) nLine1 )
+ .WriteInt16( (sal_Int16) nLine2 )
+ .WriteInt16( (sal_Int16) nStart )
+ .WriteUChar( (sal_uInt8) bInvalid );
return sal_True;
}
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 511eb11..3e4b9bc 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -688,7 +688,7 @@ void SbiStream::ExpandFile()
char c = 0;
while( nDiff-- )
{
- *pStrm << c;
+ pStrm->WriteChar( c );
}
}
else
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index bf5ea96..294584e 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -993,9 +993,9 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxBYTE:
if( bIsVariant )
{
- *pStrm << (sal_uInt16)SbxBYTE; // VarType Id
+ pStrm->WriteUInt16( (sal_uInt16)SbxBYTE ); // VarType Id
}
- *pStrm << rVar.GetByte();
+ pStrm->WriteUChar( rVar.GetByte() );
break;
case SbxEMPTY:
@@ -1007,33 +1007,33 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxUINT:
if( bIsVariant )
{
- *pStrm << (sal_uInt16)SbxINTEGER; // VarType Id
+ pStrm->WriteUInt16( (sal_uInt16)SbxINTEGER ); // VarType Id
}
- *pStrm << rVar.GetInteger();
+ pStrm->WriteInt16( rVar.GetInteger() );
break;
case SbxLONG:
case SbxULONG:
if( bIsVariant )
{
- *pStrm << (sal_uInt16)SbxLONG; // VarType Id
+ pStrm->WriteUInt16( (sal_uInt16)SbxLONG ); // VarType Id
}
- *pStrm << rVar.GetLong();
+ pStrm->WriteInt32( rVar.GetLong() );
break;
case SbxSALINT64:
case SbxSALUINT64:
if( bIsVariant )
{
- *pStrm << (sal_uInt16)SbxSALINT64; // VarType Id
+ pStrm->WriteUInt16( (sal_uInt16)SbxSALINT64 ); // VarType Id
}
- *pStrm << (sal_uInt64)rVar.GetInt64();
+ pStrm->WriteUInt64( (sal_uInt64)rVar.GetInt64() );
break;
case SbxSINGLE:
if( bIsVariant )
{
- *pStrm << (sal_uInt16)eType; // VarType Id
+ pStrm->WriteUInt16( (sal_uInt16)eType ); // VarType Id
}
- *pStrm << rVar.GetSingle();
+ pStrm->WriteFloat( rVar.GetSingle() );
break;
case SbxDOUBLE:
@@ -1041,7 +1041,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
case SbxDATE:
if( bIsVariant )
{
- *pStrm << (sal_uInt16)eType; // VarType Id
+ pStrm->WriteUInt16( (sal_uInt16)eType ); // VarType Id
}
*pStrm << rVar.GetDouble();
break;
@@ -1054,7 +1054,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
{
if( bIsVariant )
{
- *pStrm << (sal_uInt16)SbxSTRING;
+ pStrm->WriteUInt16( (sal_uInt16)SbxSTRING );
}
pStrm->WriteUniOrByteString( rStr, osl_getThreadTextEncoding() );
}
@@ -1063,7 +1063,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
// without any length information! without end-identifier!
// What does that mean for Unicode?! Choosing conversion to ByteString...
OString aByteStr(OUStringToOString(rStr, osl_getThreadTextEncoding()));
- *pStrm << (const char*)aByteStr.getStr();
+ pStrm->WriteCharPtr( (const char*)aByteStr.getStr() );
}
}
break;
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index ded3f2e..a25e46e 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -565,14 +565,14 @@ sal_Bool SbxArray::StoreData( SvStream& rStrm ) const
if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
nElem++;
}
- rStrm << (sal_uInt16) nElem;
+ rStrm.WriteUInt16( (sal_uInt16) nElem );
for( n = 0; n < pData->size(); n++ )
{
SbxVariableRef* pRef = (*pData)[n];
SbxVariable* p = *pRef;
if( p && !( p->GetFlags() & SBX_DONTSTORE ) )
{
- rStrm << (sal_uInt16) n;
+ rStrm.WriteUInt16( (sal_uInt16) n );
if( !p->Store( rStrm ) )
return sal_False;
}
@@ -830,12 +830,12 @@ sal_Bool SbxDimArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
sal_Bool SbxDimArray::StoreData( SvStream& rStrm ) const
{
- rStrm << (sal_Int16) nDim;
+ rStrm.WriteInt16( (sal_Int16) nDim );
for( short i = 0; i < nDim; i++ )
{
short lb, ub;
GetDim( i, lb, ub );
- rStrm << (sal_Int16) lb << (sal_Int16) ub;
+ rStrm.WriteInt16( (sal_Int16) lb ).WriteInt16( (sal_Int16) ub );
}
return SbxArray::StoreData( rStrm );
}
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index cc95d5b..05b84b2 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -273,16 +273,16 @@ sal_Bool SbxBase::Store( SvStream& rStrm )
DBG_CHKTHIS( SbxBase, 0 );
if( !( nFlags & SBX_DONTSTORE ) )
{
- rStrm << (sal_uInt32) GetCreator()
- << (sal_uInt16) GetSbxId()
- << (sal_uInt16) GetFlags()
- << (sal_uInt16) GetVersion();
+ rStrm.WriteUInt32( (sal_uInt32) GetCreator() )
+ .WriteUInt16( (sal_uInt16) GetSbxId() )
+ .WriteUInt16( (sal_uInt16) GetFlags() )
+ .WriteUInt16( (sal_uInt16) GetVersion() );
sal_uIntPtr nOldPos = rStrm.Tell();
- rStrm << (sal_uInt32) 0L;
+ rStrm.WriteUInt32( (sal_uInt32) 0L );
sal_Bool bRes = StoreData( rStrm );
sal_uIntPtr nNewPos = rStrm.Tell();
rStrm.Seek( nOldPos );
- rStrm << (sal_uInt32) ( nNewPos - nOldPos );
+ rStrm.WriteUInt32( (sal_uInt32) ( nNewPos - nOldPos ) );
rStrm.Seek( nNewPos );
if( rStrm.GetError() != SVSTREAM_OK )
bRes = sal_False;
@@ -395,14 +395,14 @@ sal_Bool SbxInfo::StoreData( SvStream& rStrm ) const
RTL_TEXTENCODING_ASCII_US );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aHelpFile,
RTL_TEXTENCODING_ASCII_US);
- rStrm << nHelpId << static_cast<sal_uInt16>(aParams.size());
+ rStrm.WriteUInt32( nHelpId ).WriteUInt16( static_cast<sal_uInt16>(aParams.size()) );
for(SbxParams::const_iterator i = aParams.begin(); i != aParams.end(); ++i)
{
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, i->aName,
RTL_TEXTENCODING_ASCII_US);
- rStrm << (sal_uInt16) i->eType
- << (sal_uInt16) i->nFlags
- << (sal_uInt32) i->nUserData;
+ rStrm.WriteUInt16( (sal_uInt16) i->eType )
+ .WriteUInt16( (sal_uInt16) i->nFlags )
+ .WriteUInt32( (sal_uInt32) i->nUserData );
}
return sal_True;
}
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 581d98d..d92b0f3 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -316,7 +316,7 @@ sal_Bool SbxStdCollection::StoreData( SvStream& rStrm ) const
{
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aElemClass,
RTL_TEXTENCODING_ASCII_US);
- rStrm << bAddRemoveOk;
+ rStrm.WriteUChar( bAddRemoveOk );
}
return bRes;
}
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 46244ab..5a0750f 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -679,14 +679,14 @@ sal_Bool SbxObject::StoreData( SvStream& rStrm ) const
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aClassName, RTL_TEXTENCODING_ASCII_US);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US);
sal_uIntPtr nPos = rStrm.Tell();
- rStrm << (sal_uInt32) 0L;
+ rStrm.WriteUInt32( (sal_uInt32) 0L );
if( !StorePrivateData( rStrm ) )
{
return sal_False;
}
sal_uIntPtr nNew = rStrm.Tell();
rStrm.Seek( nPos );
- rStrm << (sal_uInt32) ( nNew - nPos );
+ rStrm.WriteUInt32( (sal_uInt32) ( nNew - nPos ) );
rStrm.Seek( nNew );
if( !pMethods->Store( rStrm ) )
{
@@ -809,7 +809,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
static sal_uInt16 nLevel = 0;
if ( nLevel > 10 )
{
- rStrm << "<too deep>" << endl;
+ rStrm.WriteCharPtr( "<too deep>" ) << endl;
return;
}
++nLevel;
@@ -826,38 +826,38 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
// Output the data of the object itself
OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US));
- rStrm << "Object( "
- << OString::number(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
- << ( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ) << "', "
- << "of class '" << aClassNameStr.getStr() << "', "
- << "counts "
- << OString::number(GetRefCount()).getStr()
- << " refs, ";
+ rStrm.WriteCharPtr( "Object( " )
+ .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(this)).getStr() ).WriteCharPtr( "=='" )
+ .WriteCharPtr( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ).WriteCharPtr( "', " )
+ .WriteCharPtr( "of class '" ).WriteCharPtr( aClassNameStr.getStr() ).WriteCharPtr( "', " )
+ .WriteCharPtr( "counts " )
+ .WriteCharPtr( OString::number(GetRefCount()).getStr() )
+ .WriteCharPtr( " refs, " );
if ( GetParent() )
{
OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
- rStrm << "in parent "
- << OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr()
- << "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ) << "'";
+ rStrm.WriteCharPtr( "in parent " )
+ .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(GetParent())).getStr() )
+ .WriteCharPtr( "=='" ).WriteCharPtr( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr() ).WriteCharPtr( "'" );
}
else
{
- rStrm << "no parent ";
+ rStrm.WriteCharPtr( "no parent " );
}
- rStrm << " )" << endl;
+ rStrm.WriteCharPtr( " )" ) << endl;
OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US));
- rStrm << aIndentNameStr.getStr() << "{" << endl;
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "{" ) << endl;
// Flags
OUString aAttrs;
if( CollectAttrs( this, aAttrs ) )
{
OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US));
- rStrm << aIndentNameStr.getStr() << "- Flags: " << aAttrStr.getStr() << endl;
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Flags: " ).WriteCharPtr( aAttrStr.getStr() ) << endl;
}
// Methods
- rStrm << aIndentNameStr.getStr() << "- Methods:" << endl;
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Methods:" ) << endl;
for( sal_uInt16 i = 0; i < pMethods->Count(); i++ )
{
SbxVariableRef& r = pMethods->GetRef( i );
@@ -884,7 +884,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
pVar->GetValues_Impl().pObj != this &&
pVar->GetValues_Impl().pObj != GetParent() )
{
- rStrm << " contains ";
+ rStrm.WriteCharPtr( " contains " );
((SbxObject*) pVar->GetValues_Impl().pObj)->Dump( rStrm, bFill );
}
else
@@ -895,7 +895,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
}
// Properties
- rStrm << aIndentNameStr.getStr() << "- Properties:" << endl;
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Properties:" ) << endl;
{
for( sal_uInt16 i = 0; i < pProps->Count(); i++ )
{
@@ -923,7 +923,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
pVar->GetValues_Impl().pObj != this &&
pVar->GetValues_Impl().pObj != GetParent() )
{
- rStrm << " contains ";
+ rStrm.WriteCharPtr( " contains " );
((SbxObject*) pVar->GetValues_Impl().pObj)->Dump( rStrm, bFill );
}
else
@@ -935,7 +935,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
}
// Objects
- rStrm << aIndentNameStr.getStr() << "- Objects:" << endl;
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "- Objects:" ) << endl;
{
for( sal_uInt16 i = 0; i < pObjs->Count(); i++ )
{
@@ -943,7 +943,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
SbxVariable* pVar = r;
if ( pVar )
{
- rStrm << aIndentNameStr.getStr() << " - Sub";
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( " - Sub" );
if ( pVar->ISA(SbxObject) )
{
((SbxObject*) pVar)->Dump( rStrm, bFill );
@@ -956,7 +956,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
}
}
- rStrm << aIndentNameStr.getStr() << "}" << endl << endl;
+ rStrm.WriteCharPtr( aIndentNameStr.getStr() ).WriteCharPtr( "}" ) << endl << endl;
--nLevel;
}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 816cb9b..019834f 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1557,14 +1557,14 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
sal_Bool SbxValue::StoreData( SvStream& r ) const
{
sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(aData.eType);
- r << nType;
+ r.WriteUInt16( nType );
switch( nType & 0x0FFF )
{
case SbxBOOL:
case SbxINTEGER:
- r << aData.nInteger; break;
+ r.WriteInt16( aData.nInteger ); break;
case SbxLONG:
- r << aData.nLong; break;
+ r.WriteInt32( aData.nLong ); break;
case SbxDATE:
// #49935: Save as double, otherwise an error during the read in
((SbxValue*)this)->aData.eType = (SbxDataType)( ( nType & 0xF000 ) | SbxDOUBLE );
@@ -1578,13 +1578,13 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxSALUINT64:
case SbxSALINT64:
// see comment in SbxValue::StoreData
- r << aData.uInt64;
+ r.WriteUInt64( aData.uInt64 );
break;
case SbxCURRENCY:
{
sal_Int32 tmpHi = ( (aData.nInt64 >> 32) & 0xFFFFFFFF );
sal_Int32 tmpLo = ( sal_Int32 )aData.nInt64;
- r << tmpHi << tmpLo;
+ r.WriteInt32( tmpHi ).WriteInt32( tmpLo );
break;
}
case SbxSTRING:
@@ -1599,42 +1599,42 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
break;
case SbxERROR:
case SbxUSHORT:
- r << aData.nUShort; break;
+ r.WriteUInt16( aData.nUShort ); break;
case SbxOBJECT:
// to save itself as Objectptr does not work!
if( aData.pObj )
{
if( PTR_CAST(SbxValue,aData.pObj) != this )
{
- r << (sal_uInt8) 1;
+ r.WriteUChar( (sal_uInt8) 1 );
return aData.pObj->Store( r );
}
else
- r << (sal_uInt8) 2;
+ r.WriteUChar( (sal_uInt8) 2 );
}
else
- r << (sal_uInt8) 0;
+ r.WriteUChar( (sal_uInt8) 0 );
break;
case SbxCHAR:
{
char c = sal::static_int_cast< char >(aData.nChar);
- r << c;
+ r.WriteChar( c );
break;
}
case SbxBYTE:
- r << aData.nByte; break;
+ r.WriteUChar( aData.nByte ); break;
case SbxULONG:
- r << aData.nULong; break;
+ r.WriteUInt32( aData.nULong ); break;
case SbxINT:
{
sal_uInt8 n = SAL_TYPES_SIZEOFINT;
- r << n << (sal_Int32)aData.nInt;
+ r.WriteUChar( n ).WriteInt32( (sal_Int32)aData.nInt );
break;
}
case SbxUINT:
{
sal_uInt8 n = SAL_TYPES_SIZEOFINT;
- r << n << (sal_uInt32)aData.nUInt;
+ r.WriteUChar( n ).WriteUInt32( (sal_uInt32)aData.nUInt );
break;
}
case SbxEMPTY:
@@ -1642,7 +1642,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxVOID:
break;
case SbxDATAOBJECT:
- r << aData.nLong;
+ r.WriteInt32( aData.nLong );
break;
// #78919 For backwards compatibility
case SbxWSTRING:
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 1ea22a8..d20ab4a 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -618,7 +618,7 @@ sal_Bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const
{
- rStrm << (sal_uInt8) 0xFF; // Marker
+ rStrm.WriteUChar( (sal_uInt8) 0xFF ); // Marker
sal_Bool bValStore;
if( this->IsA( TYPE(SbxMethod) ) )
{
@@ -646,15 +646,15 @@ sal_Bool SbxVariable::StoreData( SvStream& rStrm ) const
}
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rStrm, maName,
RTL_TEXTENCODING_ASCII_US);
- rStrm << (sal_uInt32)nUserData;
+ rStrm.WriteUInt32( (sal_uInt32)nUserData );
if( pInfo.Is() )
{
- rStrm << (sal_uInt8) 2; // Version 2: with UserData!
+ rStrm.WriteUChar( (sal_uInt8) 2 ); // Version 2: with UserData!
pInfo->StoreData( rStrm );
}
else
{
- rStrm << (sal_uInt8) 0;
+ rStrm.WriteUChar( (sal_uInt8) 0 );
}
// Save private data only, if it is a SbxVariable
if( GetClass() == SbxCLASS_VARIABLE )
@@ -736,19 +736,19 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
{
OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US));
- rStrm << "Variable( "
- << OString::number(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
- << aBNameStr.getStr();
+ rStrm.WriteCharPtr( "Variable( " )
+ .WriteCharPtr( OString::number(reinterpret_cast<sal_Int64>(this)).getStr() ).WriteCharPtr( "==" )
+ .WriteCharPtr( aBNameStr.getStr() );
OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US));
if ( GetParent() )
{
- rStrm << " in parent '" << aBParentNameStr.getStr() << "'";
+ rStrm.WriteCharPtr( " in parent '" ).WriteCharPtr( aBParentNameStr.getStr() ).WriteCharPtr( "'" );
}
else
{
- rStrm << " no parent";
+ rStrm.WriteCharPtr( " no parent" );
}
- rStrm << " ) ";
+ rStrm.WriteCharPtr( " ) " );
// output also the object at object-vars
if ( GetValues_Impl().eType == SbxOBJECT &&
@@ -756,7 +756,7 @@ void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
GetValues_Impl().pObj != this &&
GetValues_Impl().pObj != GetParent() )
{
- rStrm << " contains ";
+ rStrm.WriteCharPtr( " contains " );
((SbxObject*) GetValues_Impl().pObj)->Dump( rStrm, bFill );
}
else
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 018e027..a90a63e 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1206,16 +1206,16 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
memset(aBuffer,0,sizeof(aBuffer));
m_pFileStream->Seek(0L);
- (*m_pFileStream) << (sal_uInt8) nDbaseType; // dBase format
- (*m_pFileStream) << (sal_uInt8) (aDate.GetYear() % 100); // current date
+ (*m_pFileStream).WriteUChar( (sal_uInt8) nDbaseType ); // dBase format
+ (*m_pFileStream).WriteUChar( (sal_uInt8) (aDate.GetYear() % 100) ); // current date
- (*m_pFileStream) << (sal_uInt8) aDate.GetMonth();
- (*m_pFileStream) << (sal_uInt8) aDate.GetDay();
- (*m_pFileStream) << (sal_uInt32)0; // number of data records
- (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1); // header information,
+ (*m_pFileStream).WriteUChar( (sal_uInt8) aDate.GetMonth() );
+ (*m_pFileStream).WriteUChar( (sal_uInt8) aDate.GetDay() );
+ (*m_pFileStream).WriteUInt32( (sal_uInt32)0 ); // number of data records
+ (*m_pFileStream).WriteUInt16( (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1) ); // header information,
// pColumns contains always an additional column
- (*m_pFileStream) << (sal_uInt16) 0; // record length will be determined later
+ (*m_pFileStream).WriteUInt16( (sal_uInt16) 0 ); // record length will be determined later
m_pFileStream->Write(aBuffer, 20);
sal_uInt16 nRecLength = 1; // Length 1 for deleted flag
@@ -1243,7 +1243,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName );
}
- (*m_pFileStream) << aCol.getStr();
+ (*m_pFileStream).WriteCharPtr( aCol.getStr() );
m_pFileStream->Write(aBuffer, 11 - aCol.getLength());
sal_Int32 nPrecision = 0;
@@ -1297,9 +1297,9 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
}
}
- (*m_pFileStream) << cTyp;
+ (*m_pFileStream).WriteChar( cTyp );
if ( nDbaseType == VisualFoxPro )
- (*m_pFileStream) << sal_uInt32(nRecLength-1);
+ (*m_pFileStream).WriteUInt32( sal_uInt32(nRecLength-1) );
else
m_pFileStream->Write(aBuffer, 4);
@@ -1311,9 +1311,9 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
{
throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
}
- (*m_pFileStream) << (sal_uInt8) std::min((unsigned)nPrecision, 255U); // field length
+ (*m_pFileStream).WriteUChar( (sal_uInt8) std::min((unsigned)nPrecision, 255U) ); // field length
nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
- (*m_pFileStream) << (sal_uInt8)0; // decimals
+ (*m_pFileStream).WriteUChar( (sal_uInt8)0 ); // decimals
break;
case 'F':
case 'N':
@@ -1325,41 +1325,41 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
}
if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency will be treated separately
{
- (*m_pFileStream) << (sal_uInt8)10; // standard length
- (*m_pFileStream) << (sal_uInt8)4;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)10 ); // standard length
+ (*m_pFileStream).WriteUChar( (sal_uInt8)4 );
nRecLength += 10;
}
else
{
sal_Int32 nPrec = SvDbaseConverter::ConvertPrecisionToDbase(nPrecision,nScale);
- (*m_pFileStream) << (sal_uInt8)( nPrec);
- (*m_pFileStream) << (sal_uInt8)nScale;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)( nPrec) );
+ (*m_pFileStream).WriteUChar( (sal_uInt8)nScale );
nRecLength += (sal_uInt16)nPrec;
}
break;
case 'L':
- (*m_pFileStream) << (sal_uInt8)1;
- (*m_pFileStream) << (sal_uInt8)0;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)1 );
+ (*m_pFileStream).WriteUChar( (sal_uInt8)0 );
++nRecLength;
break;
case 'I':
- (*m_pFileStream) << (sal_uInt8)4;
- (*m_pFileStream) << (sal_uInt8)0;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)4 );
+ (*m_pFileStream).WriteUChar( (sal_uInt8)0 );
nRecLength += 4;
break;
case 'Y':
case 'B':
case 'T':
case 'D':
- (*m_pFileStream) << (sal_uInt8)8;
- (*m_pFileStream) << (sal_uInt8)0;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)8 );
+ (*m_pFileStream).WriteUChar( (sal_uInt8)0 );
nRecLength += 8;
break;
case 'M':
bCreateMemo = sal_True;
- (*m_pFileStream) << (sal_uInt8)10;
- (*m_pFileStream) << (sal_uInt8)0;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)10 );
+ (*m_pFileStream).WriteUChar( (sal_uInt8)0 );
nRecLength += 10;
if ( bBinary )
aBuffer[0] = 0x06;
@@ -1371,18 +1371,18 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
aBuffer[0] = 0x00;
}
- (*m_pFileStream) << (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR; // end of header
- (*m_pFileStream) << (char)DBF_EOL;
+ (*m_pFileStream).WriteUChar( (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR ); // end of header
+ (*m_pFileStream).WriteChar( (char)DBF_EOL );
m_pFileStream->Seek(10L);
- (*m_pFileStream) << nRecLength; // set record length afterwards
+ (*m_pFileStream).WriteUInt16( nRecLength ); // set record length afterwards
if (bCreateMemo)
{
m_pFileStream->Seek(0L);
if (nDbaseType == VisualFoxPro)
- (*m_pFileStream) << (sal_uInt8) FoxProMemo;
+ (*m_pFileStream).WriteUChar( (sal_uInt8) FoxProMemo );
else
- (*m_pFileStream) << (sal_uInt8) dBaseIIIMemo;
+ (*m_pFileStream).WriteUChar( (sal_uInt8) dBaseIIIMemo );
} // if (bCreateMemo)
}
catch ( const Exception& e )
@@ -1414,7 +1414,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
m_pMemoStream->SetStreamSize(512);
m_pMemoStream->Seek(0L);
- (*m_pMemoStream) << sal_uInt32(1); // pointer to the first free block
+ (*m_pMemoStream).WriteUInt32( sal_uInt32(1) ); // pointer to the first free block
m_pMemoStream->Flush();
delete m_pMemoStream;
@@ -1526,10 +1526,10 @@ sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Ref
}
else
{
- (*m_pFileStream) << (char)DBF_EOL; // write EOL
+ (*m_pFileStream).WriteChar( (char)DBF_EOL ); // write EOL
// raise number of datasets in the header:
m_pFileStream->Seek( 4L );
- (*m_pFileStream) << (m_aHeader.db_anz + 1);
+ (*m_pFileStream).WriteUInt32( m_aHeader.db_anz + 1 );
// if AppendOnly no flush!
if (bFlush)
@@ -1626,7 +1626,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
}
m_pFileStream->Seek(nFilePos);
- (*m_pFileStream) << (sal_uInt8)'*'; // mark the row in the table as deleted
+ (*m_pFileStream).WriteUChar( (sal_uInt8)'*' ); // mark the row in the table as deleted
m_pFileStream->Flush();
return sal_True;
}
@@ -2081,33 +2081,33 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
const char cEOF = (char) DBF_EOL;
nSize++;
m_pMemoStream->Write( aStr.getStr(), aStr.getLength() );
- (*m_pMemoStream) << cEOF << cEOF;
+ (*m_pMemoStream).WriteChar( cEOF ).WriteChar( cEOF );
} break;
case MemoFoxPro:
case MemodBaseIV: // dBase IV-Memofeld with length
{
if ( MemodBaseIV == m_aMemoHeader.db_typ )
- (*m_pMemoStream) << (sal_uInt8)0xFF
- << (sal_uInt8)0xFF
- << (sal_uInt8)0x08;
+ (*m_pMemoStream).WriteUChar( (sal_uInt8)0xFF )
+ .WriteUChar( (sal_uInt8)0xFF )
+ .WriteUChar( (sal_uInt8)0x08 );
else
- (*m_pMemoStream) << (sal_uInt8)0x00
- << (sal_uInt8)0x00
- << (sal_uInt8)0x00;
+ (*m_pMemoStream).WriteUChar( (sal_uInt8)0x00 )
+ .WriteUChar( (sal_uInt8)0x00 )
+ .WriteUChar( (sal_uInt8)0x00 );
sal_uInt32 nWriteSize = nSize;
if (m_aMemoHeader.db_typ == MemoFoxPro)
{
if ( bBinary )
- (*m_pMemoStream) << (sal_uInt8) 0x00; // Picture
+ (*m_pMemoStream).WriteUChar( (sal_uInt8) 0x00 ); // Picture
else
- (*m_pMemoStream) << (sal_uInt8) 0x01; // Memo
+ (*m_pMemoStream).WriteUChar( (sal_uInt8) 0x01 ); // Memo
for (int i = 4; i > 0; nWriteSize >>= 8)
nHeader[--i] = (sal_uInt8) (nWriteSize % 256);
}
else
{
- (*m_pMemoStream) << (sal_uInt8) 0x00;
+ (*m_pMemoStream).WriteUChar( (sal_uInt8) 0x00 );
nWriteSize += 8;
for (int i = 0; i < 4; nWriteSize >>= 8)
nHeader[i++] = (sal_uInt8) (nWriteSize % 256);
@@ -2131,7 +2131,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
// Write the new block number
m_pMemoStream->Seek(0L);
- (*m_pMemoStream) << m_aMemoHeader.db_next;
+ (*m_pMemoStream).WriteUInt32( m_aMemoHeader.db_next );
m_pMemoStream->Flush();
}
return sal_True;
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index e19f935..3341af9 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -680,9 +680,9 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
{
const ODbaseIndex& rIndex = rPage.GetIndex();
if (!rIndex.isUnique() || rPage.IsLeaf())
- rStream << (sal_uInt32)aKey.nRecord; // key
+ rStream.WriteUInt32( (sal_uInt32)aKey.nRecord ); // key
else
- rStream << (sal_uInt32)0; // key
+ rStream.WriteUInt32( (sal_uInt32)0 ); // key
if (rIndex.getHeader().db_keytype) // double
{
@@ -793,7 +793,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPagePtr& rPag
// -----------------------------------------------------------------------------
SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPagePtr& rPage)
{
- rStream << rPage.nPagePos;
+ rStream.WriteUInt32( rPage.nPagePos );
return rStream;
}
// -----------------------------------------------------------------------------
@@ -862,7 +862,7 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
OSL_UNUSED( nCurrentPos );
nValue = rPage.nCount;
- rStream << nValue << rPage.aChild;
+ rStream.WriteUInt32( nValue ) << rPage.aChild;
sal_uInt16 i = 0;
for (; i < rPage.nCount; i++)
diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx
index de928de..63284a4 100644
--- a/dbaccess/source/ui/tabledesign/TableRow.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRow.cxx
@@ -108,11 +108,11 @@ namespace dbaui
{
SvStream& operator<<( SvStream& _rStr, const OTableRow& _rRow )
{
- _rStr << _rRow.m_nPos;
+ _rStr.WriteInt32( _rRow.m_nPos );
OFieldDescription* pFieldDesc = _rRow.GetActFieldDescr();
if(pFieldDesc)
{
- _rStr << (sal_Int32)1;
+ _rStr.WriteInt32( (sal_Int32)1 );
_rStr.WriteUniOrByteString(pFieldDesc->GetName(), _rStr.GetStreamCharSet());
_rStr.WriteUniOrByteString(pFieldDesc->GetDescription(), _rStr.GetStreamCharSet());
_rStr.WriteUniOrByteString(pFieldDesc->GetHelpText(), _rStr.GetStreamCharSet());
@@ -120,28 +120,28 @@ namespace dbaui
Any aValue = pFieldDesc->GetControlDefault();
if ( aValue >>= nValue )
{
- _rStr << sal_Int32(1);
+ _rStr.WriteInt32( sal_Int32(1) );
_rStr << nValue;
}
else
{
- _rStr << sal_Int32(2);
+ _rStr.WriteInt32( sal_Int32(2) );
_rStr.WriteUniOrByteString(::comphelper::getString(aValue), _rStr.GetStreamCharSet());
}
- _rStr << pFieldDesc->GetType();
+ _rStr.WriteInt32( pFieldDesc->GetType() );
- _rStr << pFieldDesc->GetPrecision();
- _rStr << pFieldDesc->GetScale();
- _rStr << pFieldDesc->GetIsNullable();
- _rStr << pFieldDesc->GetFormatKey();
- _rStr << (sal_Int32)pFieldDesc->GetHorJustify();
- _rStr << sal_Int32(pFieldDesc->IsAutoIncrement() ? 1 : 0);
- _rStr << sal_Int32(pFieldDesc->IsPrimaryKey() ? 1 : 0);
- _rStr << sal_Int32(pFieldDesc->IsCurrency() ? 1 : 0);
+ _rStr.WriteInt32( pFieldDesc->GetPrecision() );
+ _rStr.WriteInt32( pFieldDesc->GetScale() );
+ _rStr.WriteInt32( pFieldDesc->GetIsNullable() );
+ _rStr.WriteInt32( pFieldDesc->GetFormatKey() );
+ _rStr.WriteInt32( (sal_Int32)pFieldDesc->GetHorJustify() );
+ _rStr.WriteInt32( sal_Int32(pFieldDesc->IsAutoIncrement() ? 1 : 0) );
+ _rStr.WriteInt32( sal_Int32(pFieldDesc->IsPrimaryKey() ? 1 : 0) );
+ _rStr.WriteInt32( sal_Int32(pFieldDesc->IsCurrency() ? 1 : 0) );
}
else
- _rStr << (sal_Int32)0;
+ _rStr.WriteInt32( (sal_Int32)0 );
return _rStr;
}
SvStream& operator>>( SvStream& _rStr, OTableRow& _rRow )
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 3a14971..0d52039 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -37,7 +37,7 @@ namespace dbaui
::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = reinterpret_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject);
if(pRows)
{
- (*rxOStm) << (sal_Int32)pRows->size(); // first stream the size
+ (*rxOStm).WriteInt32( (sal_Int32)pRows->size() ); // first stream the size
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin();
::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end();
for(;aIter != aEnd;++aIter)
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index e85448e..6b4713b 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -387,17 +387,17 @@ bool EditTextObject::Store( SvStream& rOStream ) const
sal_Size nStartPos = rOStream.Tell();
sal_uInt16 nWhich = static_cast<sal_uInt16>(EE_FORMAT_BIN);
- rOStream << nWhich;
+ rOStream.WriteUInt16( nWhich );
sal_uInt32 nStructSz = 0;
- rOStream << nStructSz;
+ rOStream.WriteUInt32( nStructSz );
StoreData( rOStream );
sal_Size nEndPos = rOStream.Tell();
nStructSz = nEndPos - nStartPos - sizeof( nWhich ) - sizeof( nStructSz );
rOStream.Seek( nStartPos + sizeof( nWhich ) );
- rOStream << nStructSz;
+ rOStream.WriteUInt32( nStructSz );
rOStream.Seek( nEndPos );
return rOStream.GetError() ? false : true;
@@ -1106,9 +1106,9 @@ public:
void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
{
sal_uInt16 nVer = 602;
- rOStream << nVer;
+ rOStream.WriteUInt16( nVer );
- rOStream << static_cast<sal_Bool>(bOwnerOfPool);
+ rOStream.WriteUChar( static_cast<sal_Bool>(bOwnerOfPool) );
// First store the pool, later only the Surregate
if ( bOwnerOfPool )
@@ -1119,14 +1119,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
// Store Current text encoding ...
rtl_TextEncoding eEncoding = GetSOStoreTextEncoding( osl_getThreadTextEncoding() );
- rOStream << (sal_uInt16) eEncoding;
+ rOStream.WriteUInt16( (sal_uInt16) eEncoding );
// The number of paragraphs ...
size_t nParagraphs = aContents.size();
// FIXME: this truncates, check usage of stream and if it can be changed,
// i.e. is not persistent, adapt this and reader.
sal_uInt16 nParagraphs_Stream = static_cast<sal_uInt16>(nParagraphs);
- rOStream << nParagraphs_Stream;
+ rOStream.WriteUInt16( nParagraphs_Stream );
sal_Unicode nUniChar = CH_FEATURE;
char cFeatureConverted = OString(&nUniChar, 1, eEncoding).toChar();
@@ -1223,14 +1223,14 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
// StyleName and Family...
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rC.GetStyle(), eEncoding);
- rOStream << static_cast<sal_uInt16>(rC.GetFamily());
+ rOStream.WriteUInt16( static_cast<sal_uInt16>(rC.GetFamily()) );
// Paragraph attributes ...
rC.GetParaAttribs().Store( rOStream );
// The number of attributes ...
size_t nAttribs = rC.aAttribs.size();
- rOStream << static_cast<sal_uInt16>(nAttribs);
+ rOStream.WriteUInt16( static_cast<sal_uInt16>(nAttribs) );
// And the individual attributes
// Items as Surregate => always 8 bytes per Attribute
@@ -1239,36 +1239,36 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
{
const XEditAttribute& rX = rC.aAttribs[nAttr];
- rOStream << rX.GetItem()->Which();
+ rOStream.WriteUInt16( rX.GetItem()->Which() );
GetPool()->StoreSurrogate(rOStream, rX.GetItem());
- rOStream << rX.GetStart();
- rOStream << rX.GetEnd();
+ rOStream.WriteUInt16( rX.GetStart() );
+ rOStream.WriteUInt16( rX.GetEnd() );
}
}
- rOStream << nMetric;
+ rOStream.WriteUInt16( nMetric );
- rOStream << nUserType;
- rOStream << nObjSettings;
+ rOStream.WriteUInt16( nUserType );
+ rOStream.WriteUInt32( nObjSettings );
- rOStream << static_cast<sal_Bool>(bVertical);
- rOStream << nScriptType;
+ rOStream.WriteUChar( static_cast<sal_Bool>(bVertical) );
+ rOStream.WriteUInt16( nScriptType );
- rOStream << static_cast<sal_Bool>(bStoreUnicodeStrings);
+ rOStream.WriteUChar( static_cast<sal_Bool>(bStoreUnicodeStrings) );
if ( bStoreUnicodeStrings )
{
for ( size_t nPara = 0; nPara < nParagraphs_Stream; nPara++ )
{
const ContentInfo& rC = aContents[nPara];
sal_uInt16 nL = rC.GetText().getLength();
- rOStream << nL;
+ rOStream.WriteUInt16( nL );
rOStream.Write(rC.GetText().getStr(), nL*sizeof(sal_Unicode));
// StyleSheetName must be Unicode too!
// Copy/Paste from EA3 to BETA or from BETA to EA3 not possible, not needed...
// If needed, change nL back to sal_uLong and increase version...
nL = rC.GetStyle().getLength();
- rOStream << nL;
+ rOStream.WriteUInt16( nL );
rOStream.Write(rC.GetStyle().getStr(), nL*sizeof(sal_Unicode));
}
}
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 1f23708..da40d02 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -39,24 +39,24 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
sal_uInt16 nTemp;
rStream << rFont.GetColor();
- nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetFamily(); rStream.WriteUInt16( nTemp );
nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet());
- rStream << nTemp;
+ rStream.WriteUInt16( nTemp );
- nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp;
- nTemp = (sal_uInt16)rFont.GetAlign(); rStream << nTemp;
- nTemp = (sal_uInt16)rFont.GetWeight(); rStream << nTemp;
- nTemp = (sal_uInt16)rFont.GetUnderline(); rStream << nTemp;
- nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream << nTemp;
- nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetPitch(); rStream.WriteUInt16( nTemp );
+ nTemp = (sal_uInt16)rFont.GetAlign(); rStream.WriteUInt16( nTemp );
+ nTemp = (sal_uInt16)rFont.GetWeight(); rStream.WriteUInt16( nTemp );
+ nTemp = (sal_uInt16)rFont.GetUnderline(); rStream.WriteUInt16( nTemp );
+ nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream.WriteUInt16( nTemp );
+ nTemp = (sal_uInt16)rFont.GetItalic(); rStream.WriteUInt16( nTemp );
// UNICODE: rStream << rFont.GetName();
rStream.WriteUniOrByteString(rFont.GetName(), rStream.GetStreamCharSet());
- rStream << rFont.IsOutline();
- rStream << rFont.IsShadow();
- rStream << rFont.IsTransparent();
+ rStream.WriteUChar( rFont.IsOutline() );
+ rStream.WriteUChar( rFont.IsShadow() );
+ rStream.WriteUChar( rFont.IsTransparent() );
}
// -----------------------------------------------------------------------
@@ -321,7 +321,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
const_cast< SvxBulletItem* >( this )->nStyle = BS_NONE;
}
- rStrm << nStyle;
+ rStrm.WriteUInt16( nStyle );
if( nStyle != BS_BMP )
StoreFont( rStrm, aFont );
@@ -351,11 +351,11 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
if ( (nEnd-_nStart) > 0xFF00 )
rStrm.Seek( _nStart );
}
- rStrm << static_cast<sal_Int32>(nWidth);
- rStrm << nStart;
- rStrm << nJustify;
- rStrm << OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar();
- rStrm << nScale;
+ rStrm.WriteInt32( static_cast<sal_Int32>(nWidth) );
+ rStrm.WriteUInt16( nStart );
+ rStrm.WriteUChar( nJustify );
+ rStrm.WriteChar( OUStringToOString(OUString(cSymbol), aFont.GetCharSet()).toChar() );
+ rStrm.WriteUInt16( nScale );
// UNICODE: rStrm << aPrevText;
rStrm.WriteUniOrByteString(aPrevText, rStrm.GetStreamCharSet());
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index bf8f649..11c079b 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -429,9 +429,9 @@ void SvxDateField::Load( SvPersistStream & rStm )
void SvxDateField::Save( SvPersistStream & rStm )
{
- rStm << nFixDate;
- rStm << (sal_uInt16)eType;
- rStm << (sal_uInt16)eFormat;
+ rStm.WriteUInt32( nFixDate );
+ rStm.WriteUInt16( (sal_uInt16)eType );
+ rStm.WriteUInt16( (sal_uInt16)eFormat );
}
// -----------------------------------------------------------------------
@@ -555,7 +555,7 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const
static void write_unicode( SvPersistStream & rStm, const OUString& rString )
{
sal_uInt16 nL = sal::static_int_cast<sal_uInt16>(rString.getLength());
- rStm << nL;
+ rStm.WriteUInt16( nL );
//endian specific?, yipes!
rStm.Write( rString.getStr(), nL*sizeof(sal_Unicode) );
}
@@ -591,7 +591,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
void SvxURLField::Save( SvPersistStream & rStm )
{
- rStm << (sal_uInt16)eFormat;
+ rStm.WriteUInt16( (sal_uInt16)eFormat );
write_unicode( rStm, aURL );
write_unicode( rStm, aRepresentation );
@@ -810,8 +810,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
void SvxExtTimeField::Save( SvPersistStream & rStm )
{
rStm.WriteInt64(m_nFixTime);
- rStm << (sal_uInt16) eType;
- rStm << (sal_uInt16) eFormat;
+ rStm.WriteUInt16( (sal_uInt16) eType );
+ rStm.WriteUInt16( (sal_uInt16) eFormat );
}
//----------------------------------------------------------------------------
@@ -958,8 +958,8 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
// UNICODE: rStm << aFile;
rStm.WriteUniOrByteString(aFile, rStm.GetStreamCharSet());
- rStm << (sal_uInt16) eType;
- rStm << (sal_uInt16) eFormat;
+ rStm.WriteUInt16( (sal_uInt16) eType );
+ rStm.WriteUInt16( (sal_uInt16) eFormat );
}
//----------------------------------------------------------------------------
@@ -1114,8 +1114,8 @@ void SvxAuthorField::Save( SvPersistStream & rStm )
write_unicode( rStm, aFirstName );
write_unicode( rStm, aShortName );
- rStm << (sal_uInt16) eType;
- rStm << (sal_uInt16) eFormat;
+ rStm.WriteUInt16( (sal_uInt16) eType );
+ rStm.WriteUInt16( (sal_uInt16) eFormat );
}
//----------------------------------------------------------------------------
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 020488c..b48f8d3 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -106,13 +106,13 @@ namespace
/// Store a border line to a stream.
SvStream& StoreBorderLine(SvStream &stream, const SvxBorderLine &l, sal_uInt16 version)
{
- stream << l.GetColor()
- << l.GetOutWidth()
- << l.GetInWidth()
- << l.GetDistance();
+ stream << l.GetColor();
+ stream.WriteUInt16( l.GetOutWidth() )
+ .WriteUInt16( l.GetInWidth() )
+ .WriteUInt16( l.GetDistance() );
if (version >= BORDER_LINE_WITH_STYLE_VERSION)
- stream << static_cast<sal_uInt16>(l.GetBorderLineStyle());
+ stream.WriteUInt16( static_cast<sal_uInt16>(l.GetBorderLineStyle()) );
return stream;
}
@@ -167,7 +167,7 @@ SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const
SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << GetValue();
+ rStrm.WriteUChar( GetValue() );
return rStrm;
}
@@ -370,8 +370,8 @@ SfxItemPresentation SvxSizeItem::GetPresentation
SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
//#fdo39428 SvStream no longer supports operator<<(long)
- rStrm << sal::static_int_cast<sal_Int32>(aSize.Width());
- rStrm << sal::static_int_cast<sal_Int32>(aSize.Height());
+ rStrm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Width()) );
+ rStrm.WriteInt32( sal::static_int_cast<sal_Int32>(aSize.Height()) );
return rStrm;
}
@@ -675,38 +675,38 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
sal_uInt16 nMargin = 0;
if( nLeftMargin > 0 )
nMargin = sal_uInt16( nLeftMargin );
- rStrm << nMargin;
- rStrm << nPropLeftMargin;
+ rStrm.WriteUInt16( nMargin );
+ rStrm.WriteUInt16( nPropLeftMargin );
if( nRightMargin > 0 )
nMargin = sal_uInt16( nRightMargin );
else
nMargin = 0;
- rStrm << nMargin;
- rStrm << nPropRightMargin;
- rStrm << nFirstLineOfst;
- rStrm << nPropFirstLineOfst;
+ rStrm.WriteUInt16( nMargin );
+ rStrm.WriteUInt16( nPropRightMargin );
+ rStrm.WriteInt16( nFirstLineOfst );
+ rStrm.WriteUInt16( nPropFirstLineOfst );
if( nTxtLeft > 0 )
nMargin = sal_uInt16( nTxtLeft );
else
nMargin = 0;
- rStrm << nMargin;
+ rStrm.WriteUInt16( nMargin );
if( nItemVersion >= LRSPACE_AUTOFIRST_VERSION )
{
sal_Int8 nAutoFirst = bAutoFirst ? 1 : 0;
if( nItemVersion >= LRSPACE_NEGATIVE_VERSION &&
( nLeftMargin < 0 || nRightMargin < 0 || nTxtLeft < 0 ) )
nAutoFirst |= 0x80;
- rStrm << nAutoFirst;
+ rStrm.WriteSChar( nAutoFirst );
// From 6.0 onwards, do not write Magic numbers...
DBG_ASSERT( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_50, "Change File format SvxLRSpaceItem!" );
- rStrm << (sal_uInt32) BULLETLR_MARKER;
- rStrm << nSaveFI;
+ rStrm.WriteUInt32( (sal_uInt32) BULLETLR_MARKER );
+ rStrm.WriteInt16( nSaveFI );
if( 0x80 & nAutoFirst )
{
- rStrm << static_cast<sal_Int32>(nLeftMargin);
- rStrm << static_cast<sal_Int32>(nRightMargin);
+ rStrm.WriteInt32( static_cast<sal_Int32>(nLeftMargin) );
+ rStrm.WriteInt32( static_cast<sal_Int32>(nRightMargin) );
}
}
@@ -1002,10 +1002,10 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << GetUpper()
- << GetPropUpper()
- << GetLower()
- << GetPropLower();
+ rStrm.WriteUInt16( GetUpper() )
+ .WriteUInt16( GetPropUpper() )
+ .WriteUInt16( GetLower() )
+ .WriteUInt16( GetPropLower() );
return rStrm;
}
@@ -1067,7 +1067,7 @@ SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const
SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8)GetValue();
+ rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
}
@@ -1122,7 +1122,7 @@ SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8)GetValue();
+ rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
}
@@ -1267,7 +1267,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
if( IsPosProtected() ) cProt |= 0x01;
if( IsSizeProtected() ) cProt |= 0x02;
if( IsCntntProtected() ) cProt |= 0x04;
- rStrm << (sal_Int8) cProt;
+ rStrm.WriteSChar( (sal_Int8) cProt );
return rStrm;
}
@@ -1510,12 +1510,12 @@ SfxItemPresentation SvxShadowItem::GetPresentation
SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8) GetLocation()
- << (sal_uInt16) GetWidth()
- << (sal_Bool)(aShadowColor.GetTransparency() > 0)
+ rStrm.WriteSChar( (sal_Int8) GetLocation() )
+ .WriteUInt16( (sal_uInt16) GetWidth() )
+ .WriteUChar( (sal_Bool)(aShadowColor.GetTransparency() > 0) )
<< GetColor()
- << GetColor()
- << (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID
+ << GetColor();
+ rStrm.WriteSChar( (sal_Int8)(aShadowColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID
return rStrm;
}
@@ -2200,7 +2200,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation
SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
- rStrm << (sal_uInt16) GetDistance();
+ rStrm.WriteUInt16( (sal_uInt16) GetDistance() );
const SvxBorderLine* pLine[ 4 ]; // top, left, right, bottom
pLine[ 0 ] = GetTop();
pLine[ 1 ] = GetLeft();
@@ -2212,7 +2212,7 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
const SvxBorderLine* l = pLine[ i ];
if( l )
{
- rStrm << static_cast<sal_Int8>(i);
+ rStrm.WriteSChar( static_cast<sal_Int8>(i) );
StoreBorderLine(rStrm, *l, BorderLineVersionFromBoxVersion(nItemVersion));
}
}
@@ -2225,14 +2225,14 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
cLine |= 0x10;
}
- rStrm << cLine;
+ rStrm.WriteSChar( cLine );
if( nItemVersion >= BOX_4DISTS_VERSION && (cLine & 0x10) != 0 )
{
- rStrm << (sal_uInt16)nTopDist
- << (sal_uInt16)nLeftDist
- << (sal_uInt16)nRightDist
- << (sal_uInt16)nBottomDist;
+ rStrm.WriteUInt16( (sal_uInt16)nTopDist )
+ .WriteUInt16( (sal_uInt16)nLeftDist )
+ .WriteUInt16( (sal_uInt16)nRightDist )
+ .WriteUInt16( (sal_uInt16)nBottomDist );
}
return rStrm;
@@ -2601,8 +2601,8 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
cFlags |= 0x02;
if ( IsMinDist() )
cFlags |= 0x04;
- rStrm << (sal_Int8) cFlags
- << (sal_uInt16) GetDefDist();
+ rStrm.WriteSChar( (sal_Int8) cFlags )
+ .WriteUInt16( (sal_uInt16) GetDefDist() );
const SvxBorderLine* pLine[ 2 ];
pLine[ 0 ] = GetHori();
pLine[ 1 ] = GetVert();
@@ -2612,14 +2612,14 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
const SvxBorderLine* l = pLine[ i ];
if( l )
{
- rStrm << (char) i
- << l->GetColor()
- << (short) l->GetOutWidth()
- << (short) l->GetInWidth()
- << (short) l->GetDistance();
+ rStrm.WriteChar( (char) i )
+ << l->GetColor();
+ rStrm.WriteInt16( (short) l->GetOutWidth() )
+ .WriteInt16( (short) l->GetInWidth() )
+ .WriteInt16( (short) l->GetDistance() );
}
}
- rStrm << (char) 2;
+ rStrm.WriteChar( (char) 2 );
return rStrm;
}
@@ -3012,9 +3012,9 @@ SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
- rStrm << (sal_Int8)GetValue();
+ rStrm.WriteSChar( (sal_Int8)GetValue() );
if( FMTBREAK_NOAUTO > nItemVersion )
- rStrm << (sal_Int8)0x01;
+ rStrm.WriteSChar( (sal_Int8)0x01 );
return rStrm;
}
@@ -3059,7 +3059,7 @@ SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8)GetValue();
+ rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
}
@@ -3257,13 +3257,16 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
{
if( pLine )
{
- rStrm << pLine->GetColor()
- << (short)pLine->GetOutWidth()
- << (short)pLine->GetInWidth()
- << (short)pLine->GetDistance();
+ rStrm << pLine->GetColor();
+ rStrm.WriteInt16( (short)pLine->GetOutWidth() )
+ .WriteInt16( (short)pLine->GetInWidth() )
+ .WriteInt16( (short)pLine->GetDistance() );
}
else
- rStrm << Color() << (short)0 << (short)0 << (short)0;
+ {
+ rStrm << Color();
+ rStrm.WriteInt16( (short)0 ).WriteInt16( (short)0 ).WriteInt16( (short)0 );
+ }
return rStrm;
}
@@ -3897,10 +3900,10 @@ SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) cons
SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
{
- rStream << (sal_Bool)sal_False;
+ rStream.WriteUChar( (sal_Bool)sal_False );
rStream << aColor;
rStream << aColor;
- rStream << (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1); //BRUSH_NULL : BRUSH_SOLID
+ rStream.WriteSChar( (sal_Int8)(aColor.GetTransparency() > 0 ? 0 : 1) ); //BRUSH_NULL : BRUSH_SOLID
sal_uInt16 nDoLoad = 0;
@@ -3910,7 +3913,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
nDoLoad |= LOAD_LINK;
if ( !maStrFilter.isEmpty() )
nDoLoad |= LOAD_FILTER;
- rStream << nDoLoad;
+ rStream.WriteUInt16( nDoLoad );
if ( pImpl->pGraphicObject && maStrLink.isEmpty() )
rStream << pImpl->pGraphicObject->GetGraphic();
@@ -3927,7 +3930,7 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
// UNICODE: rStream << maStrFilter;
rStream.WriteUniOrByteString(maStrFilter, rStream.GetStreamCharSet());
}
- rStream << (sal_Int8)eGraphicPos;
+ rStream.WriteSChar( (sal_Int8)eGraphicPos );
return rStream;
}
@@ -4185,7 +4188,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*
SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
{
sal_uInt16 nValue = GetValue();
- rStrm << nValue;
+ rStrm.WriteUInt16( nValue );
return rStrm;
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 2dca4a7..08f0a63 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -245,26 +245,26 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
pBulletFont->SetName(sFontName);
}
- rStream << (sal_uInt16)NUMITEM_VERSION_04;
+ rStream.WriteUInt16( (sal_uInt16)NUMITEM_VERSION_04 );
- rStream << (sal_uInt16)GetNumberingType();
- rStream << (sal_uInt16)eNumAdjust;
- rStream << (sal_uInt16)nInclUpperLevels;
- rStream << nStart;
- rStream << (sal_uInt16)cBullet;
+ rStream.WriteUInt16( (sal_uInt16)GetNumberingType() );
+ rStream.WriteUInt16( (sal_uInt16)eNumAdjust );
+ rStream.WriteUInt16( (sal_uInt16)nInclUpperLevels );
+ rStream.WriteUInt16( nStart );
+ rStream.WriteUInt16( (sal_uInt16)cBullet );
- rStream << nFirstLineOffset;
- rStream << nAbsLSpace;
- rStream << nLSpace;
+ rStream.WriteInt16( nFirstLineOffset );
+ rStream.WriteInt16( nAbsLSpace );
+ rStream.WriteInt16( nLSpace );
- rStream << nCharTextDistance;
+ rStream.WriteInt16( nCharTextDistance );
rtl_TextEncoding eEnc = osl_getThreadTextEncoding();
rStream.WriteUniOrByteString(sPrefix, eEnc);
rStream.WriteUniOrByteString(sSuffix, eEnc);
rStream.WriteUniOrByteString(sCharStyleName, eEnc);
if(pGraphicBrush)
{
- rStream << (sal_uInt16)1;
+ rStream.WriteUInt16( (sal_uInt16)1 );
// in SD or SI force bullet itself to be stored,
// for that purpose throw away link when link and graphic
@@ -277,30 +277,30 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
}
else
- rStream << (sal_uInt16)0;
+ rStream.WriteUInt16( (sal_uInt16)0 );
- rStream << (sal_uInt16)eVertOrient;
+ rStream.WriteUInt16( (sal_uInt16)eVertOrient );
if(pBulletFont)
{
- rStream << (sal_uInt16)1;
+ rStream.WriteUInt16( (sal_uInt16)1 );
rStream << *pBulletFont;
}
else
- rStream << (sal_uInt16)0;
+ rStream.WriteUInt16( (sal_uInt16)0 );
rStream << aGraphicSize;
Color nTempColor = nBulletColor;
if(COL_AUTO == nBulletColor.GetColor())
nTempColor = COL_BLACK;
rStream << nTempColor;
- rStream << nBulletRelSize;
- rStream << (sal_uInt16)IsShowSymbol();
+ rStream.WriteUInt16( nBulletRelSize );
+ rStream.WriteUInt16( (sal_uInt16)IsShowSymbol() );
- rStream << ( sal_uInt16 ) mePositionAndSpaceMode;
- rStream << ( sal_uInt16 ) meLabelFollowedBy;
- rStream << ( sal_Int32 ) mnListtabPos;
- rStream << ( sal_Int32 ) mnFirstLineIndent;
- rStream << ( sal_Int32 ) mnIndentAt;
+ rStream.WriteUInt16( ( sal_uInt16 ) mePositionAndSpaceMode );
+ rStream.WriteUInt16( ( sal_uInt16 ) meLabelFollowedBy );
+ rStream.WriteInt32( ( sal_Int32 ) mnListtabPos );
+ rStream.WriteInt32( ( sal_Int32 ) mnFirstLineIndent );
+ rStream.WriteInt32( ( sal_Int32 ) mnIndentAt );
return rStream;
}
@@ -710,12 +710,12 @@ SvxNumRule* SvxNumRule::Create( SvStream & rStream )
SvStream& SvxNumRule::Store( SvStream &rStream )
{
- rStream<<(sal_uInt16)NUMITEM_VERSION_03;
- rStream<<nLevelCount;
+ rStream.WriteUInt16( (sal_uInt16)NUMITEM_VERSION_03 );
+ rStream.WriteUInt16( nLevelCount );
//first save of nFeatureFlags for old versions
- rStream<<(sal_uInt16)nFeatureFlags;
- rStream<<(sal_uInt16)bContinuousNumbering;
- rStream<<(sal_uInt16)eNumberingType;
+ rStream.WriteUInt16( (sal_uInt16)nFeatureFlags );
+ rStream.WriteUInt16( (sal_uInt16)bContinuousNumbering );
+ rStream.WriteUInt16( (sal_uInt16)eNumberingType );
FontToSubsFontConverter pConverter = 0;
sal_Bool bConvertBulletFont = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_50 ) && ( rStream.GetVersion() );
@@ -724,7 +724,7 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
sal_uInt16 nSetFlag(aFmtsSet[i] ? 2 : 0); // fdo#68648 store that too
if(aFmts[i])
{
- rStream << sal_uInt16(1 | nSetFlag);
+ rStream.WriteUInt16( sal_uInt16(1 | nSetFlag) );
if(bConvertBulletFont && aFmts[i]->GetBulletFont())
{
if(!pConverter)
@@ -735,10 +735,10 @@ SvStream& SvxNumRule::Store( SvStream &rStream )
aFmts[i]->Store(rStream, pConverter);
}
else
- rStream << sal_uInt16(0 | nSetFlag);
+ rStream.WriteUInt16( sal_uInt16(0 | nSetFlag) );
}
//second save of nFeatureFlags for new versions
- rStream<<(sal_uInt16)nFeatureFlags;
+ rStream.WriteUInt16( (sal_uInt16)nFeatureFlags );
if(pConverter)
DestroyFontToSubsFontConverter(pConverter);
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index c3f315e..53f9228 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -182,8 +182,8 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const
SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const
{
- rStrm << (sal_uInt8) GetMinLead()
- << (sal_uInt8) GetMinTrail();
+ rStrm.WriteUChar( (sal_uInt8) GetMinLead() )
+ .WriteUChar( (sal_uInt8) GetMinTrail() );
return rStrm;
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 5f11920..7476641 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -278,11 +278,11 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const
SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8) GetPropLineSpace()
- << (short) GetInterLineSpace()
- << (sal_uInt16) GetLineHeight()
- << (sal_Int8) GetLineSpaceRule()
- << (sal_Int8) GetInterLineSpaceRule();
+ rStrm.WriteSChar( (sal_Int8) GetPropLineSpace() )
+ .WriteInt16( (short) GetInterLineSpace() )
+ .WriteUInt16( (sal_uInt16) GetLineHeight() )
+ .WriteSChar( (sal_Int8) GetLineSpaceRule() )
+ .WriteSChar( (sal_Int8) GetInterLineSpaceRule() );
return rStrm;
}
@@ -509,7 +509,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const
SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
{
- rStrm << (char)GetAdjust();
+ rStrm.WriteChar( (char)GetAdjust() );
if ( nItemVersion >= ADJUST_LASTBLOCK_VERSION )
{
sal_Int8 nFlags = 0;
@@ -519,7 +519,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
nFlags |= 0x0002;
if ( bLastBlock )
nFlags |= 0x0004;
- rStrm << (sal_Int8) nFlags;
+ rStrm.WriteSChar( (sal_Int8) nFlags );
}
return rStrm;
}
@@ -551,7 +551,7 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const
SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8)GetValue();
+ rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
}
@@ -621,7 +621,7 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const
SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8) GetValue();
+ rStrm.WriteSChar( (sal_Int8) GetValue() );
return rStrm;
}
@@ -823,11 +823,11 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8) IsHyphen()
- << (sal_Int8) IsPageEnd()
- << (sal_Int8) GetMinLead()
- << (sal_Int8) GetMinTrail()
- << (sal_Int8) GetMaxHyphens();
+ rStrm.WriteSChar( (sal_Int8) IsHyphen() )
+ .WriteSChar( (sal_Int8) IsPageEnd() )
+ .WriteSChar( (sal_Int8) GetMinLead() )
+ .WriteSChar( (sal_Int8) GetMinTrail() )
+ .WriteSChar( (sal_Int8) GetMaxHyphens() );
return rStrm;
}
@@ -1187,24 +1187,24 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
nCount = (sal_uInt16)(nNew < lA3Width ? ( lA3Width - nNew ) / nDefDist + 1 : 0);
}
- rStrm << (sal_Int8) ( nTabs + nCount );
+ rStrm.WriteSChar( (sal_Int8) ( nTabs + nCount ) );
for ( short i = 0; i < nTabs; i++ )
{
const SvxTabStop& rTab = (*this)[ i ];
- rStrm << rTab.GetTabPos()
- << (sal_Int8) rTab.GetAdjustment()
- << (unsigned char) rTab.GetDecimal()
- << (unsigned char) rTab.GetFill();
+ rStrm.WriteInt32( rTab.GetTabPos() )
+ .WriteSChar( (sal_Int8) rTab.GetAdjustment() )
+ .WriteUChar( (unsigned char) rTab.GetDecimal() )
+ .WriteUChar( (unsigned char) rTab.GetFill() );
}
if ( bStoreDefTabs )
for( ; nCount; --nCount )
{
SvxTabStop aSwTabStop(nNew, SVX_TAB_ADJUST_DEFAULT);
- rStrm << aSwTabStop.GetTabPos()
- << (sal_Int8) aSwTabStop.GetAdjustment()
- << (unsigned char) aSwTabStop.GetDecimal()
- << (unsigned char) aSwTabStop.GetFill();
+ rStrm.WriteInt32( aSwTabStop.GetTabPos() )
+ .WriteSChar( (sal_Int8) aSwTabStop.GetAdjustment() )
+ .WriteUChar( (unsigned char) aSwTabStop.GetDecimal() )
+ .WriteUChar( (unsigned char) aSwTabStop.GetFill() );
nNew += nDefDist;
}
@@ -1252,7 +1252,7 @@ SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Int8)GetValue();
+ rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
}
@@ -1548,7 +1548,7 @@ SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const
{
- rStrm << GetValue();
+ rStrm.WriteUInt16( GetValue() );
return rStrm;
}
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 07742bc..4ec1280 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -45,7 +45,7 @@ void SdrMeasureField::Load(SvPersistStream& rIn)
void SdrMeasureField::Save(SvPersistStream& rOut)
{
- rOut<<(sal_uInt16)eMeasureFieldKind;
+ rOut.WriteUInt16( (sal_uInt16)eMeasureFieldKind );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index eb30406..7352f57 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -375,8 +375,8 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
{
sal_Bool bToBats = IsStarSymbol( GetFamilyName() );
- rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch()
- << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet()));
+ rStrm.WriteUChar( (sal_uInt8) GetFamily() ).WriteUChar( (sal_uInt8) GetPitch() )
+ .WriteUChar( (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet())) );
OUString aStoreFamilyName( GetFamilyName() );
if( bToBats )
@@ -388,7 +388,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
if ( bEnableStoreUnicodeNames )
{
sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
- rStrm << nMagic;
+ rStrm.WriteUInt32( nMagic );
rStrm.WriteUniOrByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE );
rStrm.WriteUniOrByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
}
@@ -495,7 +495,7 @@ sal_uInt16 SvxPostureItem::GetValueCount() const
SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8)GetValue();
+ rStrm.WriteUChar( (sal_uInt8)GetValue() );
return rStrm;
}
@@ -660,7 +660,7 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8)GetValue();
+ rStrm.WriteUChar( (sal_uInt8)GetValue() );
return rStrm;
}
@@ -768,10 +768,10 @@ SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
- rStrm << (sal_uInt16)GetHeight();
+ rStrm.WriteUInt16( (sal_uInt16)GetHeight() );
if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
- rStrm << GetProp() << (sal_uInt16)GetPropUnit();
+ rStrm.WriteUInt16( GetProp() ).WriteUInt16( (sal_uInt16)GetPropUnit() );
else
{
// When exporting to the old versions the relative information is lost
@@ -779,7 +779,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion )
sal_uInt16 _nProp = GetProp();
if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
_nProp = 100;
- rStrm << _nProp;
+ rStrm.WriteUInt16( _nProp );
}
return rStrm;
}
@@ -1157,7 +1157,7 @@ SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << GetWidth() << GetProp();
+ rStrm.WriteUInt16( GetWidth() ).WriteUInt16( GetProp() );
return rStrm;
}
@@ -1317,7 +1317,7 @@ sal_uInt16 SvxTextLineItem::GetValueCount() const
SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8)GetValue();
+ rStrm.WriteUChar( (sal_uInt8)GetValue() );
return rStrm;
}
@@ -1545,7 +1545,7 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8)GetValue();
+ rStrm.WriteUChar( (sal_uInt8)GetValue() );
return rStrm;
}
@@ -1642,7 +1642,7 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8) GetValue();
+ rStrm.WriteUChar( (sal_uInt8) GetValue() );
return rStrm;
}
@@ -1703,7 +1703,7 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8) GetValue();
+ rStrm.WriteUChar( (sal_uInt8) GetValue() );
return rStrm;
}
@@ -1765,7 +1765,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Bool) GetValue();
+ rStrm.WriteUChar( (sal_Bool) GetValue() );
return rStrm;
}
@@ -1826,7 +1826,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Bool) GetValue();
+ rStrm.WriteUChar( (sal_Bool) GetValue() );
return rStrm;
}
@@ -1887,7 +1887,7 @@ SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const
SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt16) GetValue();
+ rStrm.WriteUInt16( (sal_uInt16) GetValue() );
return rStrm;
}
@@ -2082,7 +2082,7 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) << GetValue();
+ rStrm.WriteUChar( (sal_uInt8)GetSOStoreTextEncoding(GetCharSet()) ) << GetValue();
return rStrm;
}
@@ -2128,7 +2128,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (short) GetValue();
+ rStrm.WriteInt16( (short) GetValue() );
return rStrm;
}
@@ -2242,7 +2242,7 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8) GetValue();
+ rStrm.WriteUChar( (sal_uInt8) GetValue() );
return rStrm;
}
@@ -2381,8 +2381,8 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*
else if( DFLT_ESC_AUTO_SUB == _nEsc )
_nEsc = DFLT_ESC_SUB;
}
- rStrm << (sal_uInt8) GetProp()
- << (short) _nEsc;
+ rStrm.WriteUChar( (sal_uInt8) GetProp() )
+ .WriteInt16( (short) _nEsc );
return rStrm;
}
@@ -2555,7 +2555,7 @@ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt16) GetValue();
+ rStrm.WriteUInt16( (sal_uInt16) GetValue() );
return rStrm;
}
@@ -2655,7 +2655,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const
SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Bool)GetValue();
+ rStrm.WriteUChar( (sal_Bool)GetValue() );
return rStrm;
}
@@ -2700,7 +2700,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_Bool) GetValue();
+ rStrm.WriteUChar( (sal_Bool) GetValue() );
return rStrm;
}
@@ -2788,7 +2788,7 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt8) GetValue();
+ rStrm.WriteUChar( (sal_uInt8) GetValue() );
return rStrm;
}
@@ -2851,7 +2851,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (sal_uInt16)GetValue();
+ rStrm.WriteUInt16( (sal_uInt16)GetValue() );
return rStrm;
}
@@ -3108,7 +3108,7 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) con
SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
{
- rStrm << GetValue() << GetStartBracket() << GetEndBracket();
+ rStrm.WriteUChar( GetValue() ).WriteUInt16( GetStartBracket() ).WriteUInt16( GetEndBracket() );
return rStrm;
}
@@ -3150,7 +3150,7 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const
SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const
{
sal_Bool bFlag = IsFitToLine();
- rStrm << GetValue() << bFlag;
+ rStrm.WriteUInt16( GetValue() ).WriteUChar( bFlag );
return rStrm;
}
@@ -3288,10 +3288,10 @@ SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, sal_uInt16 nVer ) con
{
// see comment in Create()....
rRet.SeekRel( -1*(long)sizeof(sal_uInt16) );
- rRet << (sal_uInt16)0;
- rRet << GetValue();
+ rRet.WriteUInt16( (sal_uInt16)0 );
+ rRet.WriteUInt16( GetValue() );
// Really ugly, but not a problem for reading the doc in 5.2
- rRet << (sal_uInt16)0x1234;
+ rRet.WriteUInt16( (sal_uInt16)0x1234 );
}
return rRet;
}
@@ -3378,7 +3378,7 @@ SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const
SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
{
sal_uInt16 nVal = GetValue();
- rStrm << nVal;
+ rStrm.WriteUInt16( nVal );
return rStrm;
}
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 95134df..9ad0011 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -603,25 +603,25 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
aConverter.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
// write bitmap stream header
- aConverter << 'B' << 'M';
- aConverter << (sal_uInt32) 0;
- aConverter << (sal_uInt32) 0;
- aConverter << (sal_uInt32) 60;
+ aConverter.WriteChar( 'B' ).WriteChar( 'M' );
+ aConverter.WriteUInt32( (sal_uInt32) 0 );
+ aConverter.WriteUInt32( (sal_uInt32) 0 );
+ aConverter.WriteUInt32( (sal_uInt32) 60 );
// write BITMAPINFOHEADER
- aConverter << (sal_uInt32)40;
- aConverter << (sal_uInt32)0; // fill in width later
- aConverter << (sal_uInt32)0; // fill in height later
- aConverter << (sal_uInt16)1;
+ aConverter.WriteUInt32( (sal_uInt32)40 );
+ aConverter.WriteUInt32( (sal_uInt32)0 ); // fill in width later
+ aConverter.WriteUInt32( (sal_uInt32)0 ); // fill in height later
+ aConverter.WriteUInt16( (sal_uInt16)1 );
// create header for 24 bits
// correct later if necessary
- aConverter << (sal_uInt16)24;
- aConverter << (sal_uInt32)0;
- aConverter << (sal_uInt32)0;
- aConverter << (sal_uInt32)0;
- aConverter << (sal_uInt32)0;
- aConverter << (sal_uInt32)0;
- aConverter << (sal_uInt32)0;
+ aConverter.WriteUInt16( (sal_uInt16)24 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
for( nStream=0; nStream < 3 && bSuccess ; nStream++ )
{
@@ -762,11 +762,11 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
#endif
aConverter.Seek( 18 );
- aConverter << (sal_uInt32)nWidth;
- aConverter << (sal_uInt32)nHeight;
+ aConverter.WriteUInt32( (sal_uInt32)nWidth );
+ aConverter.WriteUInt32( (sal_uInt32)nHeight );
aConverter.Seek( 38 );
- aConverter << (sal_uInt32)(1000*nWidth/nWidthMM);
- aConverter << (sal_uInt32)(1000*nHeight/nHeightMM);
+ aConverter.WriteUInt32( (sal_uInt32)(1000*nWidth/nWidthMM) );
+ aConverter.WriteUInt32( (sal_uInt32)(1000*nHeight/nHeightMM) );
bWidthSet = sal_True;
}
aConverter.Seek(60);
@@ -774,31 +774,31 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
if( eType == FrameStyle_BW )
{
aConverter.Seek( 10 );
- aConverter << (sal_uInt32)64;
+ aConverter.WriteUInt32( (sal_uInt32)64 );
aConverter.Seek( 28 );
- aConverter << (sal_uInt16) 1;
+ aConverter.WriteUInt16( (sal_uInt16) 1 );
aConverter.Seek( 54 );
// write color table
- aConverter << (sal_uInt16)0xffff;
- aConverter << (sal_uInt8)0xff;
- aConverter << (sal_uInt8)0;
- aConverter << (sal_uInt32)0;
+ aConverter.WriteUInt16( (sal_uInt16)0xffff );
+ aConverter.WriteUChar( (sal_uInt8)0xff );
+ aConverter.WriteUChar( (sal_uInt8)0 );
+ aConverter.WriteUInt32( (sal_uInt32)0 );
aConverter.Seek( 64 );
}
else if( eType == FrameStyle_Gray )
{
aConverter.Seek( 10 );
- aConverter << (sal_uInt32)1084;
+ aConverter.WriteUInt32( (sal_uInt32)1084 );
aConverter.Seek( 28 );
- aConverter << (sal_uInt16) 8;
+ aConverter.WriteUInt16( (sal_uInt16) 8 );
aConverter.Seek( 54 );
// write color table
for( nLine = 0; nLine < 256; nLine++ )
{
- aConverter << (sal_uInt8)nLine;
- aConverter << (sal_uInt8)nLine;
- aConverter << (sal_uInt8)nLine;
- aConverter << (sal_uInt8)0;
+ aConverter.WriteUChar( (sal_uInt8)nLine );
+ aConverter.WriteUChar( (sal_uInt8)nLine );
+ aConverter.WriteUChar( (sal_uInt8)nLine );
+ aConverter.WriteUChar( (sal_uInt8)0 );
}
aConverter.Seek( 1084 );
}
@@ -823,7 +823,7 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
sal_uInt8 nGray = _ReadValue( pFrame, aParams.depth );
- aConverter << nGray;
+ aConverter.WriteUChar( nGray );
}
}
else if( eType == FrameStyle_RGB )
@@ -834,9 +834,9 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
nRed = _ReadValue( pFrame, aParams.depth );
nGreen = _ReadValue( pFrame, aParams.depth );
nBlue = _ReadValue( pFrame, aParams.depth );
- aConverter << nBlue;
- aConverter << nGreen;
- aConverter << nRed;
+ aConverter.WriteUChar( nBlue );
+ aConverter.WriteUChar( nGreen );
+ aConverter.WriteUChar( nRed );
}
}
else if( eType == FrameStyle_Separated )
@@ -848,15 +848,15 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
{
case SANE_FRAME_RED:
aConverter.SeekRel( 2 );
- aConverter << nValue;
+ aConverter.WriteUChar( nValue );
break;
case SANE_FRAME_GREEN:
aConverter.SeekRel( 1 );
- aConverter << nValue;
+ aConverter.WriteUChar( nValue );
aConverter.SeekRel( 1 );
break;
case SANE_FRAME_BLUE:
- aConverter << nValue;
+ aConverter.WriteUChar( nValue );
aConverter.SeekRel( 2 );
break;
case SANE_FRAME_GRAY:
@@ -881,7 +881,7 @@ sal_Bool Sane::Start( BitmapTransporter& rBitmap )
int nPos = aConverter.Tell();
aConverter.Seek( 2 );
- aConverter << (sal_uInt32) nPos+1;
+ aConverter.WriteUInt32( (sal_uInt32) nPos+1 );
aConverter.Seek( 0 );
rBitmap.unlock();
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index 073ae56..0a6e5627 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -150,7 +150,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
}
// Endtag
- *mpMovieStream << (sal_uInt16)0;
+ mpMovieStream->WriteUInt16( (sal_uInt16)0 );
Tag aHeader( 0xff );
@@ -161,7 +161,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
sal_uInt32 nSizePos = aHeader.Tell();
- aHeader << (sal_uInt32)0;
+ aHeader.WriteUInt32( (sal_uInt32)0 );
Rectangle aDocRect( 0, 0, static_cast<long>(mnDocWidth*mnDocXScale), static_cast<long>(mnDocHeight*mnDocYScale) );
@@ -176,7 +176,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
const sal_uInt32 nSize = aHeader.Tell() + mpFontsStream->Tell() + mpMovieStream->Tell();
aHeader.Seek( nSizePos );
- aHeader << (sal_uInt32)nSize;
+ aHeader.WriteUInt32( (sal_uInt32)nSize );
ImplCopySvStreamToXOutputStream( aHeader, xOutStream );
ImplCopySvStreamToXOutputStream( *mpFontsStream, xOutStream );
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 766b02a..d8d21f05 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -121,7 +121,7 @@ void BitStream::writeTo( SvStream& out )
const vector< sal_uInt8>::iterator aEnd( maData.end() );
while(aIter != aEnd)
{
- out << (*aIter++);
+ out.WriteUChar( (*aIter++) );
}
}
@@ -153,20 +153,20 @@ void Tag::write( SvStream &out )
sal_uInt16 nCode = ( mnTagId << 6 ) | ( bLarge ? 0x3f : _uInt16(nSz) );
- out << (sal_uInt8)nCode;
- out << (sal_uInt8)(nCode >> 8);
+ out.WriteUChar( (sal_uInt8)nCode );
+ out.WriteUChar( (sal_uInt8)(nCode >> 8) );
if( bLarge )
{
sal_uInt32 nTmp = nSz;
- out << (sal_uInt8)nTmp;
+ out.WriteUChar( (sal_uInt8)nTmp );
nTmp >>= 8;
- out << (sal_uInt8)nTmp;
+ out.WriteUChar( (sal_uInt8)nTmp );
nTmp >>= 8;
- out << (sal_uInt8)nTmp;
+ out.WriteUChar( (sal_uInt8)nTmp );
nTmp >>= 8;
- out << (sal_uInt8)nTmp;
+ out.WriteUChar( (sal_uInt8)nTmp );
}
}
@@ -184,7 +184,7 @@ void Tag::addI32( sal_Int32 nValue )
void Tag::addUI32( sal_uInt32 nValue )
{
- *this << nValue;
+ WriteUInt32( nValue );
}
#if 0
// -----------------------------------------------------------------------------
@@ -198,15 +198,15 @@ void Tag::addI16( sal_Int16 nValue )
void Tag::addUI16( sal_uInt16 nValue )
{
- *this << (sal_uInt8)nValue;
- *this << (sal_uInt8)(nValue >> 8);
+ WriteUChar( (sal_uInt8)nValue );
+ WriteUChar( (sal_uInt8)(nValue >> 8) );
}
// -----------------------------------------------------------------------------
void Tag::addUI8( sal_uInt8 nValue )
{
- *this << (sal_uInt8)nValue;
+ WriteUChar( (sal_uInt8)nValue );
}
// -----------------------------------------------------------------------------
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 74b82a6..946968e 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -307,18 +307,18 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize )
const sal_uInt8 cFlags = 128 | ( 7 << 4 );
// write values
- m_rGIF << nWidth;
- m_rGIF << nHeight;
- m_rGIF << cFlags;
- m_rGIF << (sal_uInt8) 0x00;
- m_rGIF << (sal_uInt8) 0x00;
+ m_rGIF.WriteUInt16( nWidth );
+ m_rGIF.WriteUInt16( nHeight );
+ m_rGIF.WriteUChar( cFlags );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x00 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x00 );
// write dummy palette with two entries (black/white);
// we do this only because of a bug in Photoshop, since those can't
// read pictures without a global color palette
- m_rGIF << (sal_uInt16) 0;
- m_rGIF << (sal_uInt16) 255;
- m_rGIF << (sal_uInt16) 65535;
+ m_rGIF.WriteUInt16( (sal_uInt16) 0 );
+ m_rGIF.WriteUInt16( (sal_uInt16) 255 );
+ m_rGIF.WriteUInt16( (sal_uInt16) 65535 );
if( m_rGIF.GetError() )
bStatus = sal_False;
@@ -346,15 +346,15 @@ void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
const sal_uInt8 cLoByte = (const sal_uInt8) nLoopCount;
const sal_uInt8 cHiByte = (const sal_uInt8) ( nLoopCount >> 8 );
- m_rGIF << (sal_uInt8) 0x21;
- m_rGIF << (sal_uInt8) 0xff;
- m_rGIF << (sal_uInt8) 0x0b;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x21 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0xff );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x0b );
m_rGIF.Write( "NETSCAPE2.0", 11 );
- m_rGIF << (sal_uInt8) 0x03;
- m_rGIF << (sal_uInt8) 0x01;
- m_rGIF << cLoByte;
- m_rGIF << cHiByte;
- m_rGIF << (sal_uInt8) 0x00;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x03 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x01 );
+ m_rGIF.WriteUChar( cLoByte );
+ m_rGIF.WriteUChar( cHiByte );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x00 );
}
}
@@ -365,15 +365,15 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
// writer PrefSize in 100th-mm as ApplicationExtension
if( rSize100.Width() && rSize100.Height() )
{
- m_rGIF << (sal_uInt8) 0x21;
- m_rGIF << (sal_uInt8) 0xff;
- m_rGIF << (sal_uInt8) 0x0b;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x21 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0xff );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x0b );
m_rGIF.Write( "STARDIV 5.0", 11 );
- m_rGIF << (sal_uInt8) 0x09;
- m_rGIF << (sal_uInt8) 0x01;
- m_rGIF << (sal_uInt32) rSize100.Width();
- m_rGIF << (sal_uInt32) rSize100.Height();
- m_rGIF << (sal_uInt8) 0x00;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x09 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x01 );
+ m_rGIF.WriteUInt32( (sal_uInt32) rSize100.Width() );
+ m_rGIF.WriteUInt32( (sal_uInt32) rSize100.Height() );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x00 );
}
}
@@ -396,13 +396,13 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
else if( eDisposal == DISPOSE_PREVIOUS )
cFlags |= ( 3 << 2 );
- m_rGIF << (sal_uInt8) 0x21;
- m_rGIF << (sal_uInt8) 0xf9;
- m_rGIF << (sal_uInt8) 0x04;
- m_rGIF << cFlags;
- m_rGIF << nDelay;
- m_rGIF << (sal_uInt8) m_pAcc->GetBestPaletteIndex( BMP_COL_TRANS );
- m_rGIF << (sal_uInt8) 0x00;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x21 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0xf9 );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x04 );
+ m_rGIF.WriteUChar( cFlags );
+ m_rGIF.WriteUInt16( nDelay );
+ m_rGIF.WriteUChar( (sal_uInt8) m_pAcc->GetBestPaletteIndex( BMP_COL_TRANS ) );
+ m_rGIF.WriteUChar( (sal_uInt8) 0x00 );
if( m_rGIF.GetError() )
bStatus = sal_False;
@@ -429,12 +429,12 @@ void GIFWriter::WriteLocalHeader()
cFlags |= 0x80;
// alles rausschreiben
- m_rGIF << (sal_uInt8) 0x2c;
- m_rGIF << nPosX;
- m_rGIF << nPosY;
- m_rGIF << nWidth;
- m_rGIF << nHeight;
- m_rGIF << cFlags;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x2c );
+ m_rGIF.WriteUInt16( nPosX );
+ m_rGIF.WriteUInt16( nPosY );
+ m_rGIF.WriteUInt16( nWidth );
+ m_rGIF.WriteUInt16( nHeight );
+ m_rGIF.WriteUChar( cFlags );
if( m_rGIF.GetError() )
bStatus = sal_False;
@@ -454,9 +454,9 @@ void GIFWriter::WritePalette()
{
const BitmapColor& rColor = m_pAcc->GetPaletteColor( i );
- m_rGIF << rColor.GetRed();
- m_rGIF << rColor.GetGreen();
- m_rGIF << rColor.GetBlue();
+ m_rGIF.WriteUChar( rColor.GetRed() );
+ m_rGIF.WriteUChar( rColor.GetGreen() );
+ m_rGIF.WriteUChar( rColor.GetBlue() );
}
// fill up the rest with 0
@@ -549,7 +549,7 @@ void GIFWriter::WriteTerminator()
{
if( bStatus )
{
- m_rGIF << (sal_uInt8) 0x3b;
+ m_rGIF.WriteUChar( (sal_uInt8) 0x3b );
if( m_rGIF.GetError() )
bStatus = sal_False;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list