diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-08 08:48:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-10 13:26:24 +0000 |
| commit | b69864f3f8c9be2e1f28f4b422074d2040b084a0 (patch) | |
| tree | 93d51bc91257472198beffccb92188ceee61667d /filter/source/msfilter/msdffimp.cxx | |
| parent | de84529b55f5b295b089043a7119d6b0d8b92408 (diff) | |
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@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'filter/source/msfilter/msdffimp.cxx')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 42c4b4ef4a69..7ec4f1d71867 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -152,17 +152,17 @@ static sal_uInt32 nMSOleObjCntr = 0; void Impl_OlePres::Write( SvStream & rStm ) { WriteClipboardFormat( rStm, FORMAT_GDIMETAFILE ); - rStm << (sal_Int32)(nJobLen +4); // a TargetDevice that's always empty + rStm.WriteInt32( (sal_Int32)(nJobLen +4) ); // a TargetDevice that's always empty if( nJobLen ) rStm.Write( pJob, nJobLen ); - rStm << (sal_uInt32)nAspect; - rStm << (sal_Int32)-1; //L-Index always -1 - rStm << (sal_Int32)nAdvFlags; - rStm << (sal_Int32)0; //Compression - rStm << (sal_Int32)aSize.Width(); - rStm << (sal_Int32)aSize.Height(); + rStm.WriteUInt32( (sal_uInt32)nAspect ); + rStm.WriteInt32( (sal_Int32)-1 ); //L-Index always -1 + rStm.WriteInt32( (sal_Int32)nAdvFlags ); + rStm.WriteInt32( (sal_Int32)0 ); //Compression + rStm.WriteInt32( (sal_Int32)aSize.Width() ); + rStm.WriteInt32( (sal_Int32)aSize.Height() ); sal_uLong nPos = rStm.Tell(); - rStm << (sal_Int32)0; + rStm.WriteInt32( (sal_Int32)0 ); if( GetFormat() == FORMAT_GDIMETAFILE && pMtf ) { @@ -194,7 +194,7 @@ void Impl_OlePres::Write( SvStream & rStm ) } sal_uLong nEndPos = rStm.Tell(); rStm.Seek( nPos ); - rStm << (sal_uInt32)(nEndPos - nPos - 4); + rStm.WriteUInt32( (sal_uInt32)(nEndPos - nPos - 4) ); rStm.Seek( nEndPos ); } @@ -6648,7 +6648,7 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, rStm.Read( pData, nDataLen ); // write to ole10 stream - *xOle10Stm << nDataLen; + xOle10Stm->WriteUInt32( nDataLen ); xOle10Stm->Write( pData, nDataLen ); xOle10Stm = SotStorageStreamRef(); |