summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-08 08:48:26 +0200
committerMichael Stahl <mstahl@redhat.com>2014-01-10 13:26:24 +0000
commitb69864f3f8c9be2e1f28f4b422074d2040b084a0 (patch)
tree93d51bc91257472198beffccb92188ceee61667d /vcl/source
parentde84529b55f5b295b089043a7119d6b0d8b92408 (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 'vcl/source')
-rw-r--r--vcl/source/filter/wmf/emfwr.cxx180
-rw-r--r--vcl/source/filter/wmf/enhwmf.cxx48
-rw-r--r--vcl/source/filter/wmf/winmtf.cxx6
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx177
-rw-r--r--vcl/source/gdi/animate.cxx18
-rw-r--r--vcl/source/gdi/cvtsvm.cxx397
-rw-r--r--vcl/source/gdi/dibtools.cxx90
-rw-r--r--vcl/source/gdi/font.cxx42
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/gfxlink.cxx2
-rw-r--r--vcl/source/gdi/gradient.cxx19
-rw-r--r--vcl/source/gdi/graphictools.cxx30
-rw-r--r--vcl/source/gdi/hatch.cxx4
-rw-r--r--vcl/source/gdi/jobset.cxx8
-rw-r--r--vcl/source/gdi/lineinfo.cxx12
-rw-r--r--vcl/source/gdi/mapmod.cxx6
-rw-r--r--vcl/source/gdi/metaact.cxx81
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/gdi/pngwrite.cxx10
-rw-r--r--vcl/source/gdi/print.cxx4
-rw-r--r--vcl/source/gdi/region.cxx6
-rw-r--r--vcl/source/gdi/regionband.cxx14
-rw-r--r--vcl/source/gdi/wall.cxx5
23 files changed, 582 insertions, 583 deletions
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index d71bdd891f2a..b3684b199f5d 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -157,7 +157,7 @@ void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType )
{
ImplBeginRecord( WIN_EMR_GDICOMMENT );
m_rStm.SeekRel( 4 );
- m_rStm<< (sal_Int32) nCommentType;
+ m_rStm.WriteInt32( (sal_Int32) nCommentType );
}
void EMFWriter::ImplEndCommentRecord()
@@ -166,7 +166,7 @@ void EMFWriter::ImplEndCommentRecord()
{
sal_Int32 nActPos = m_rStm.Tell();
m_rStm.Seek( mnRecordPos + 8 );
- m_rStm << (sal_uInt32)( nActPos - mnRecordPos - 0xc );
+ m_rStm.WriteUInt32( (sal_uInt32)( nActPos - mnRecordPos - 0xc ) );
m_rStm.Seek( nActPos );
}
ImplEndRecord();
@@ -181,7 +181,7 @@ void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags )
mbRecordPlusOpen = sal_True;
mnRecordPlusPos = m_rStm.Tell();
- m_rStm << (sal_uInt16) nType << (sal_uInt16) nFlags;
+ m_rStm.WriteUInt16( (sal_uInt16) nType ).WriteUInt16( (sal_uInt16) nFlags );
m_rStm.SeekRel( 8 );
}
}
@@ -195,8 +195,8 @@ void EMFWriter::ImplEndPlusRecord()
sal_Int32 nActPos = m_rStm.Tell();
sal_Int32 nSize = nActPos - mnRecordPlusPos;
m_rStm.Seek( mnRecordPlusPos + 4 );
- m_rStm << (sal_uInt32)( nSize ) // Size
- << (sal_uInt32) ( nSize - 0xc ); // Data Size
+ m_rStm.WriteUInt32( (sal_uInt32)( nSize ) ) // Size
+ .WriteUInt32( (sal_uInt32) ( nSize - 0xc ) ); // Data Size
m_rStm.Seek( nActPos );
mbRecordPlusOpen = sal_False;
}
@@ -222,14 +222,14 @@ void EMFWriter::WriteEMFPlusHeader( const Size &rMtfSizePix, const Size &rMtfSiz
if (nDivY)
nDPIY /= nDivY; // DPI Y
- m_rStm<< (sal_Int16) EmfPlusHeader;
- m_rStm<< (sal_Int16) 0x01 // Flags - Dual Mode // TODO: Check this
- << (sal_Int32) 0x1C // Size
- << (sal_Int32) 0x10 // Data Size
- << (sal_Int32) 0xdbc01002 // (lower 12bits) 1-> v1 2-> v1.1 // TODO: Check this
- << (sal_Int32) 0x01 // Video display
- << nDPIX
- << nDPIY;
+ m_rStm.WriteInt16( (sal_Int16) EmfPlusHeader );
+ m_rStm.WriteInt16( (sal_Int16) 0x01 ) // Flags - Dual Mode // TODO: Check this
+ .WriteInt32( (sal_Int32) 0x1C ) // Size
+ .WriteInt32( (sal_Int32) 0x10 ) // Data Size
+ .WriteInt32( (sal_Int32) 0xdbc01002 ) // (lower 12bits) 1-> v1 2-> v1.1 // TODO: Check this
+ .WriteInt32( (sal_Int32) 0x01 ) // Video display
+ .WriteInt32( nDPIX )
+ .WriteInt32( nDPIY );
ImplEndCommentRecord();
// Write more properties
@@ -258,14 +258,14 @@ void EMFWriter::ImplWritePlusColor( const Color& rColor, const sal_uInt32& nTran
nCol |= ( (sal_uInt32) rColor.GetGreen() ) << 8;
nCol |= ( (sal_uInt32) rColor.GetRed() ) << 16;
nCol |= ( nAlpha << 24 );
- m_rStm << nCol;
+ m_rStm.WriteUInt32( nCol );
}
void EMFWriter::ImplWritePlusPoint( const Point& rPoint )
{
// Convert to pixels
const Point aPoint(maVDev.LogicToPixel( rPoint, maDestMapMode ));
- m_rStm << (sal_uInt16) aPoint.X() << (sal_uInt16) aPoint.Y();
+ m_rStm.WriteUInt16( (sal_uInt16) aPoint.X() ).WriteUInt16( (sal_uInt16) aPoint.Y() );
}
void EMFWriter::ImplWritePlusFillPolygonRecord( const Polygon& rPoly, const sal_uInt32& nTrans )
@@ -275,7 +275,7 @@ void EMFWriter::ImplWritePlusFillPolygonRecord( const Polygon& rPoly, const sal_
{
ImplBeginPlusRecord( EmfPlusFillPolygon, 0xC000 ); // Sets the color as well
ImplWritePlusColor( maVDev.GetFillColor(), nTrans );
- m_rStm << (sal_uInt32) rPoly.GetSize();
+ m_rStm.WriteUInt32( (sal_uInt32) rPoly.GetSize() );
for( sal_uInt16 i = 0; i < rPoly.GetSize(); i++ )
ImplWritePlusPoint( rPoly[ i ] );
ImplEndPlusRecord();
@@ -314,29 +314,29 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilter
// set 100th mm map mode in EMF
ImplBeginRecord( WIN_EMR_SETMAPMODE );
- m_rStm << (sal_Int32) MM_ANISOTROPIC;
+ m_rStm.WriteInt32( (sal_Int32) MM_ANISOTROPIC );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETVIEWPORTEXTEX );
- m_rStm << (sal_Int32) maVDev.ImplGetDPIX() << (sal_Int32) maVDev.ImplGetDPIY();
+ m_rStm.WriteInt32( (sal_Int32) maVDev.ImplGetDPIX() ).WriteInt32( (sal_Int32) maVDev.ImplGetDPIY() );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX );
- m_rStm << (sal_Int32) 2540 << (sal_Int32) 2540;
+ m_rStm.WriteInt32( (sal_Int32) 2540 ).WriteInt32( (sal_Int32) 2540 );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETVIEWPORTORGEX );
- m_rStm << (sal_Int32) 0 << (sal_Int32) 0;
+ m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETWINDOWORGEX );
- m_rStm << (sal_Int32) 0 << (sal_Int32) 0;
+ m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
ImplEndRecord();
ImplWriteRasterOp( ROP_OVERPAINT );
ImplBeginRecord( WIN_EMR_SETBKMODE );
- m_rStm << (sal_uInt32) 1; // TRANSPARENT
+ m_rStm.WriteUInt32( (sal_uInt32) 1 ); // TRANSPARENT
ImplEndRecord();
// write emf data
@@ -345,24 +345,24 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilter
ImplWritePlusEOF();
ImplBeginRecord( WIN_EMR_EOF );
- m_rStm<< (sal_uInt32)0 // nPalEntries
- << (sal_uInt32)0x10 // offPalEntries
- << (sal_uInt32)0x14; // nSizeLast
+ m_rStm.WriteUInt32( (sal_uInt32)0 ) // nPalEntries
+ .WriteUInt32( (sal_uInt32)0x10 ) // offPalEntries
+ .WriteUInt32( (sal_uInt32)0x14 ); // nSizeLast
ImplEndRecord();
// write header
const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos );
- m_rStm << (sal_uInt32) 0x00000001 << (sal_uInt32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object
- << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) ( aMtfSizePix.Width() - 1 ) << (sal_Int32) ( aMtfSizePix.Height() - 1 )
- << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) ( aMtfSizeLog.Width() - 1 ) << (sal_Int32) ( aMtfSizeLog.Height() - 1 )
- << (sal_uInt32) 0x464d4520 << (sal_uInt32) 0x10000 << (sal_uInt32) ( nEndPos - nHeaderPos )
- << (sal_uInt32) mnRecordCount << (sal_uInt16) ( mnHandleCount + 1 ) << (sal_uInt16) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0
- << (sal_Int32) aMtfSizePix.Width() << (sal_Int32) aMtfSizePix.Height()
- << (sal_Int32) ( aMtfSizeLog.Width() / 100 ) << (sal_Int32) ( aMtfSizeLog.Height() / 100 )
- << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0
- << (sal_Int32) ( aMtfSizeLog.Width() * 10 ) << (sal_Int32) ( aMtfSizeLog.Height() * 10 ); //use [MS-EMF 2.2.11] HeaderExtension2 Object
+ m_rStm.WriteUInt32( (sal_uInt32) 0x00000001 ).WriteUInt32( (sal_uInt32) 108 ) //use [MS-EMF 2.2.11] HeaderExtension2 Object
+ .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizePix.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizePix.Height() - 1 ) )
+ .WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() - 1 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() - 1 ) )
+ .WriteUInt32( (sal_uInt32) 0x464d4520 ).WriteUInt32( (sal_uInt32) 0x10000 ).WriteUInt32( (sal_uInt32) ( nEndPos - nHeaderPos ) )
+ .WriteUInt32( (sal_uInt32) mnRecordCount ).WriteUInt16( (sal_uInt16) ( mnHandleCount + 1 ) ).WriteUInt16( (sal_uInt16) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 )
+ .WriteInt32( (sal_Int32) aMtfSizePix.Width() ).WriteInt32( (sal_Int32) aMtfSizePix.Height() )
+ .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() / 100 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() / 100 ) )
+ .WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 )
+ .WriteInt32( (sal_Int32) ( aMtfSizeLog.Width() * 10 ) ).WriteInt32( (sal_Int32) ( aMtfSizeLog.Height() * 10 ) ); //use [MS-EMF 2.2.11] HeaderExtension2 Object
m_rStm.Seek( nEndPos );
delete[] mpHandlesUsed;
@@ -404,7 +404,7 @@ void EMFWriter::ImplBeginRecord( sal_uInt32 nType )
mbRecordOpen = sal_True;
mnRecordPos = m_rStm.Tell();
- m_rStm << nType;
+ m_rStm.WriteUInt32( nType );
m_rStm.SeekRel( 4 );
}
}
@@ -421,10 +421,10 @@ void EMFWriter::ImplEndRecord()
nFillBytes += 3; // each record has to be dword aligned
nFillBytes ^= 3;
nFillBytes &= 3;
- m_rStm << (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes );
+ m_rStm.WriteUInt32( (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes ) );
m_rStm.Seek( nActPos );
while( nFillBytes-- )
- m_rStm << (sal_uInt8)0;
+ m_rStm.WriteUChar( (sal_uInt8)0 );
mnRecordCount++;
mbRecordOpen = sal_False;
}
@@ -445,12 +445,12 @@ sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSel
// select stock object first
ImplBeginRecord( WIN_EMR_SELECTOBJECT );
- m_rStm << nStockObject;
+ m_rStm.WriteUInt32( nStockObject );
ImplEndRecord();
// destroy handle of created object
ImplBeginRecord( WIN_EMR_DELETEOBJECT );
- m_rStm << rHandle;
+ m_rStm.WriteUInt32( rHandle );
ImplEndRecord();
// mark handle as free
@@ -470,12 +470,12 @@ void EMFWriter::ImplCheckLineAttr()
sal_uInt32 nWidth = 0, nHeight = 0;
ImplBeginRecord( WIN_EMR_CREATEPEN );
- m_rStm << mnLineHandle << nStyle << nWidth << nHeight;
+ m_rStm.WriteUInt32( mnLineHandle ).WriteUInt32( nStyle ).WriteUInt32( nWidth ).WriteUInt32( nHeight );
ImplWriteColor( maVDev.GetLineColor() );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SELECTOBJECT );
- m_rStm << mnLineHandle;
+ m_rStm.WriteUInt32( mnLineHandle );
ImplEndRecord();
}
}
@@ -488,13 +488,13 @@ void EMFWriter::ImplCheckFillAttr()
sal_uInt32 nPatternStyle = 0;
ImplBeginRecord( WIN_EMR_CREATEBRUSHINDIRECT );
- m_rStm << mnFillHandle << nStyle;
+ m_rStm.WriteUInt32( mnFillHandle ).WriteUInt32( nStyle );
ImplWriteColor( maVDev.GetFillColor() );
- m_rStm << nPatternStyle;
+ m_rStm.WriteUInt32( nPatternStyle );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SELECTOBJECT );
- m_rStm << mnFillHandle;
+ m_rStm.WriteUInt32( mnFillHandle );
ImplEndRecord();
}
}
@@ -510,10 +510,10 @@ void EMFWriter::ImplCheckTextAttr()
sal_uInt8 nPitchAndFamily;
ImplBeginRecord( WIN_EMR_EXTCREATEFONTINDIRECTW );
- m_rStm << mnTextHandle;
+ m_rStm.WriteUInt32( mnTextHandle );
ImplWriteExtent( -rFont.GetSize().Height() );
ImplWriteExtent( rFont.GetSize().Width() );
- m_rStm << (sal_Int32) rFont.GetOrientation() << (sal_Int32) rFont.GetOrientation();
+ m_rStm.WriteInt32( (sal_Int32) rFont.GetOrientation() ).WriteInt32( (sal_Int32) rFont.GetOrientation() );
switch( rFont.GetWeight() )
{
@@ -530,12 +530,12 @@ void EMFWriter::ImplCheckTextAttr()
default: nWeight = 0; break;
}
- m_rStm << nWeight;
- m_rStm << (sal_uInt8) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 );
- m_rStm << (sal_uInt8) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 );
- m_rStm << (sal_uInt8) ( ( STRIKEOUT_NONE == rFont.GetStrikeout() ) ? 0 : 1 );
- m_rStm << (sal_uInt8) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 );
- m_rStm << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0;
+ m_rStm.WriteInt32( nWeight );
+ m_rStm.WriteUChar( (sal_uInt8) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 ) );
+ m_rStm.WriteUChar( (sal_uInt8) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 ) );
+ m_rStm.WriteUChar( (sal_uInt8) ( ( STRIKEOUT_NONE == rFont.GetStrikeout() ) ? 0 : 1 ) );
+ m_rStm.WriteUChar( (sal_uInt8) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 ) );
+ m_rStm.WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 );
switch( rFont.GetPitch() )
{
@@ -554,33 +554,33 @@ void EMFWriter::ImplCheckTextAttr()
default: break;
}
- m_rStm << nPitchAndFamily;
+ m_rStm.WriteUChar( nPitchAndFamily );
for( i = 0; i < 32; i++ )
- m_rStm << (sal_Unicode) ( ( i < aFontName.getLength() ) ? aFontName[ i ] : 0 );
+ m_rStm.WriteUInt16( (sal_Unicode) ( ( i < aFontName.getLength() ) ? aFontName[ i ] : 0 ) );
// dummy elfFullName
for( i = 0; i < 64; i++ )
- m_rStm << (sal_Unicode) 0;
+ m_rStm.WriteUInt16( (sal_Unicode) 0 );
// dummy elfStyle
for( i = 0; i < 32; i++ )
- m_rStm << (sal_Unicode) 0;
+ m_rStm.WriteUInt16( (sal_Unicode) 0 );
// dummy elfVersion, elfStyleSize, elfMatch, elfReserved
- m_rStm << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 << (sal_uInt32) 0 ;
+ m_rStm.WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ).WriteUInt32( (sal_uInt32) 0 ) ;
// dummy elfVendorId
- m_rStm << (sal_uInt32) 0;
+ m_rStm.WriteUInt32( (sal_uInt32) 0 );
// dummy elfCulture
- m_rStm << (sal_uInt32) 0;
+ m_rStm.WriteUInt32( (sal_uInt32) 0 );
// dummy elfPanose
- m_rStm << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0 << (sal_uInt8) 0;
+ m_rStm.WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 ).WriteUChar( (sal_uInt8) 0 );
// fill record to get a record size divideable by 4
- m_rStm << (sal_uInt16) 0;
+ m_rStm.WriteUInt16( (sal_uInt16) 0 );
ImplEndRecord();
@@ -596,7 +596,7 @@ void EMFWriter::ImplCheckTextAttr()
nTextAlign |= mnHorTextAlign;
ImplBeginRecord( WIN_EMR_SETTEXTALIGN );
- m_rStm << nTextAlign;
+ m_rStm.WriteUInt32( nTextAlign );
ImplEndRecord();
// Text color
@@ -605,7 +605,7 @@ void EMFWriter::ImplCheckTextAttr()
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SELECTOBJECT );
- m_rStm << mnTextHandle;
+ m_rStm.WriteUInt32( mnTextHandle );
ImplEndRecord();
}
}
@@ -617,7 +617,7 @@ void EMFWriter::ImplWriteColor( const Color& rColor )
nCol |= ( (sal_uInt32) rColor.GetGreen() ) << 8;
nCol |= ( (sal_uInt32) rColor.GetBlue() ) << 16;
- m_rStm << nCol;
+ m_rStm.WriteUInt32( nCol );
}
void EMFWriter::ImplWriteRasterOp( RasterOp eRop )
@@ -632,36 +632,36 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop )
}
ImplBeginRecord( WIN_EMR_SETROP2 );
- m_rStm << nROP2;
+ m_rStm.WriteUInt32( nROP2 );
ImplEndRecord();
}
void EMFWriter::ImplWriteExtent( long nExtent )
{
nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width();
- m_rStm << (sal_Int32) nExtent;
+ m_rStm.WriteInt32( (sal_Int32) nExtent );
}
void EMFWriter::ImplWritePoint( const Point& rPoint )
{
const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode ));
- m_rStm << (sal_Int32) aPoint.X() << (sal_Int32) aPoint.Y();
+ m_rStm.WriteInt32( (sal_Int32) aPoint.X() ).WriteInt32( (sal_Int32) aPoint.Y() );
}
void EMFWriter::ImplWriteSize( const Size& rSize)
{
const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode ));
- m_rStm << (sal_Int32) aSize.Width() << (sal_Int32) aSize.Height();
+ m_rStm.WriteInt32( (sal_Int32) aSize.Width() ).WriteInt32( (sal_Int32) aSize.Height() );
}
void EMFWriter::ImplWriteRect( const Rectangle& rRect )
{
const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode ));
m_rStm
- << static_cast<sal_Int32>(aRect.Left())
- << static_cast<sal_Int32>(aRect.Top())
- << static_cast<sal_Int32>(aRect.Right())
- << static_cast<sal_Int32>(aRect.Bottom());
+ .WriteInt32( static_cast<sal_Int32>(aRect.Left()) )
+ .WriteInt32( static_cast<sal_Int32>(aRect.Top()) )
+ .WriteInt32( static_cast<sal_Int32>(aRect.Right()) )
+ .WriteInt32( static_cast<sal_Int32>(aRect.Bottom()) );
}
void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose )
@@ -679,7 +679,7 @@ void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose )
ImplBeginRecord( bClose ? WIN_EMR_POLYGON : WIN_EMR_POLYLINE );
ImplWriteRect( rPoly.GetBoundRect() );
- m_rStm << (sal_uInt32) rPoly.GetSize();
+ m_rStm.WriteUInt32( (sal_uInt32) rPoly.GetSize() );
for( sal_uInt16 i = 0; i < rPoly.GetSize(); i++ )
ImplWritePoint( rPoly[ i ] );
@@ -719,10 +719,10 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly )
ImplBeginRecord( WIN_EMR_POLYPOLYGON );
ImplWriteRect( rPolyPoly.GetBoundRect() );
- m_rStm << (sal_uInt32)nPolyCount << nTotalPoints;
+ m_rStm.WriteUInt32( (sal_uInt32)nPolyCount ).WriteUInt32( nTotalPoints );
for( i = 0; i < nPolyCount; i++ )
- m_rStm << (sal_uInt32)rPolyPoly[ i ].GetSize();
+ m_rStm.WriteUInt32( (sal_uInt32)rPolyPoly[ i ].GetSize() );
for( i = 0; i < nPolyCount; i++ )
{
@@ -776,7 +776,7 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
for ( o = 0; o < nBezPoints; o++ )
aNewPoly[ o + 1 ] = rPoly[ n + o ];
ImplWriteRect( aNewPoly.GetBoundRect() );
- m_rStm << (sal_uInt32)nBezPoints;
+ m_rStm.WriteUInt32( (sal_uInt32)nBezPoints );
for( o = 1; o < aNewPoly.GetSize(); o++ )
ImplWritePoint( aNewPoly[ o ] );
ImplEndRecord();
@@ -796,7 +796,7 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
for ( o = 1; o <= nPoints; o++ )
aNewPoly[ o ] = rPoly[ n - 1 + o ];
ImplWriteRect( aNewPoly.GetBoundRect() );
- m_rStm << (sal_uInt32)( nPoints );
+ m_rStm.WriteUInt32( (sal_uInt32)( nPoints ) );
for( o = 1; o < aNewPoly.GetSize(); o++ )
ImplWritePoint( aNewPoly[ o ] );
ImplEndRecord();
@@ -834,13 +834,13 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
ImplBeginRecord( WIN_EMR_STRETCHDIBITS );
ImplWriteRect( Rectangle( rPt, rSz ) );
ImplWritePoint( rPt );
- m_rStm << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) aBmpSizePixel.Width() << (sal_Int32) aBmpSizePixel.Height();
+ m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) aBmpSizePixel.Width() ).WriteInt32( (sal_Int32) aBmpSizePixel.Height() );
// write offset positions and sizes later
const sal_uLong nOffPos = m_rStm.Tell();
m_rStm.SeekRel( 16 );
- m_rStm << (sal_uInt32) 0 << sal_Int32( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP );
+ m_rStm.WriteUInt32( (sal_uInt32) 0 ).WriteInt32( sal_Int32( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP ) );
ImplWriteSize( rSz );
WriteDIB(rBmp, aMemStm, true, false);
@@ -863,8 +863,8 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
const sal_uLong nEndPos = m_rStm.Tell();
m_rStm.Seek( nOffPos );
- m_rStm << (sal_uInt32) 80 << (sal_uInt32)( nHeaderSize + ( nPalCount << 2 ) );
- m_rStm << (sal_uInt32)( 80 + ( nHeaderSize + ( nPalCount << 2 ) ) ) << nImageSize;
+ m_rStm.WriteUInt32( (sal_uInt32) 80 ).WriteUInt32( (sal_uInt32)( nHeaderSize + ( nPalCount << 2 ) ) );
+ m_rStm.WriteUInt32( (sal_uInt32)( 80 + ( nHeaderSize + ( nPalCount << 2 ) ) ) ).WriteUInt32( nImageSize );
m_rStm.Seek( nEndPos );
ImplEndRecord();
@@ -912,20 +912,20 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const OUString rText, co
ImplBeginRecord( WIN_EMR_EXTTEXTOUTW );
ImplWriteRect( Rectangle( rPos, Size( nNormWidth, maVDev.GetTextHeight() ) ) );
- m_rStm << (sal_uInt32)1;
- m_rStm << (sal_Int32) 0 << (sal_Int32) 0;
+ m_rStm.WriteUInt32( (sal_uInt32)1 );
+ m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
ImplWritePoint( rPos );
- m_rStm << (sal_uInt32) nLen << (sal_uInt32) 76 << (sal_uInt32) 2;
- m_rStm << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) 0;
- m_rStm << (sal_uInt32) ( 76 + ( nLen << 1 ) + ( (nLen & 1 ) ? 2 : 0 ) );
+ m_rStm.WriteUInt32( (sal_uInt32) nLen ).WriteUInt32( (sal_uInt32) 76 ).WriteUInt32( (sal_uInt32) 2 );
+ m_rStm.WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 ).WriteInt32( (sal_Int32) 0 );
+ m_rStm.WriteUInt32( (sal_uInt32) ( 76 + ( nLen << 1 ) + ( (nLen & 1 ) ? 2 : 0 ) ) );
// write text
for( i = 0; i < nLen; i++ )
- m_rStm << (sal_Unicode)rText[ i ];
+ m_rStm.WriteUInt16( (sal_Unicode)rText[ i ] );
// padding word
if( nLen & 1 )
- m_rStm << (sal_uInt16) 0;
+ m_rStm.WriteUInt16( (sal_uInt16) 0 );
// write DX array
ImplWriteExtent( pDX[ 0 ] );
@@ -1263,7 +1263,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
maVDev.Pop();
ImplBeginRecord( WIN_EMR_RESTOREDC );
- m_rStm << (sal_Int32) -1;
+ m_rStm.WriteInt32( (sal_Int32) -1 );
ImplEndRecord();
break;
}
@@ -1453,7 +1453,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
( (MetaAction*) pAction )->Execute( &maVDev );
ImplBeginRecord( WIN_EMR_RESTOREDC );
- m_rStm << (sal_Int32) -1;
+ m_rStm.WriteInt32( (sal_Int32) -1 );
ImplEndRecord();
ImplWriteRasterOp( maVDev.GetRasterOp() );
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 255d2d01443b..2d15308526e4 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1014,12 +1014,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
aTmp.ObjectOwnsMemory( sal_True );
- aTmp << (sal_uInt8)'B'
- << (sal_uInt8)'M'
- << (sal_uInt32)cbBitsSrc
- << (sal_uInt16)0
- << (sal_uInt16)0
- << (sal_uInt32)cbBmiSrc + 14;
+ aTmp.WriteUChar( (sal_uInt8)'B' )
+ .WriteUChar( (sal_uInt8)'M' )
+ .WriteUInt32( (sal_uInt32)cbBitsSrc )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 );
pWMF->Seek( nStart + offBmiSrc );
pWMF->Read( pBuf + 14, cbBmiSrc );
pWMF->Seek( nStart + offBitsSrc );
@@ -1077,12 +1077,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
aTmp.ObjectOwnsMemory( sal_True );
- aTmp << (sal_uInt8)'B'
- << (sal_uInt8)'M'
- << (sal_uInt32)cbBitsSrc
- << (sal_uInt16)0
- << (sal_uInt16)0
- << (sal_uInt32)cbBmiSrc + 14;
+ aTmp.WriteUChar( (sal_uInt8)'B' )
+ .WriteUChar( (sal_uInt8)'M' )
+ .WriteUInt32( (sal_uInt32)cbBitsSrc )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 );
pWMF->Seek( nStart + offBmiSrc );
pWMF->Read( pBuf + 14, cbBmiSrc );
pWMF->Seek( nStart + offBitsSrc );
@@ -1147,12 +1147,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
char* pBuf = new char[ nSize ];
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
aTmp.ObjectOwnsMemory( sal_True );
- aTmp << (sal_uInt8)'B'
- << (sal_uInt8)'M'
- << (sal_uInt32)cbBitsSrc
- << (sal_uInt16)0
- << (sal_uInt16)0
- << (sal_uInt32)cbBmiSrc + 14;
+ aTmp.WriteUChar( (sal_uInt8)'B' )
+ .WriteUChar( (sal_uInt8)'M' )
+ .WriteUInt32( (sal_uInt32)cbBitsSrc )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt32( (sal_uInt32)cbBmiSrc + 14 );
pWMF->Seek( nStart + offBmiSrc );
pWMF->Read( pBuf + 14, cbBmiSrc );
pWMF->Seek( nStart + offBitsSrc );
@@ -1384,12 +1384,12 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
aTmp.ObjectOwnsMemory( sal_True );
- aTmp << (sal_uInt8)'B'
- << (sal_uInt8)'M'
- << (sal_uInt32)cbBits
- << (sal_uInt16)0
- << (sal_uInt16)0
- << (sal_uInt32)cbBmi + 14;
+ aTmp.WriteUChar( (sal_uInt8)'B' )
+ .WriteUChar( (sal_uInt8)'M' )
+ .WriteUInt32( (sal_uInt32)cbBits )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt16( (sal_uInt16)0 )
+ .WriteUInt32( (sal_uInt32)cbBmi + 14 );
pWMF->Seek( nStart + offBmi );
pWMF->Read( pBuf + 14, cbBmi );
pWMF->Seek( nStart + offBits );
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 31b99da1b2f8..30acfc454b5b 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -2180,8 +2180,8 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
nBottom = mrclFrame.Bottom();
// emf header info
- mem << nLeft << nTop << nRight << nBottom;
- mem << mnPixX << mnPixY << mnMillX << mnMillY;
+ mem.WriteInt32( nLeft ).WriteInt32( nTop ).WriteInt32( nRight ).WriteInt32( nBottom );
+ mem.WriteInt32( mnPixX ).WriteInt32( mnPixY ).WriteInt32( mnMillX ).WriteInt32( mnMillY );
float one, zero;
@@ -2190,7 +2190,7 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
// add transformation matrix to be used in vcl's metaact.cxx for
// rotate and scale operations
- mem << one << zero << zero << one << zero << zero;
+ mem.WriteFloat( one ).WriteFloat( zero ).WriteFloat( zero ).WriteFloat( one ).WriteFloat( zero ).WriteFloat( zero );
// need to flush the stream, otherwise GetEndOfData will return 0
// on windows where the function parameters are probably resolved in reverse order
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 3dc415bd2223..9f702bd4cb5c 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -184,14 +184,14 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF )
void WMFWriter::WritePointXY(const Point & rPoint)
{
Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) );
- *pWMF << ((short)aPt.X()) << ((short)aPt.Y());
+ pWMF->WriteInt16( (short)aPt.X() ).WriteInt16( (short)aPt.Y() );
}
void WMFWriter::WritePointYX(const Point & rPoint)
{
Point aPt( pVirDev->LogicToLogic(rPoint,aSrcMapMode,aTargetMapMode) );
- *pWMF << ((short)aPt.Y()) << ((short)aPt.X());
+ pWMF->WriteInt16( (short)aPt.Y() ).WriteInt16( (short)aPt.X() );
}
@@ -205,14 +205,14 @@ sal_Int32 WMFWriter::ScaleWidth( sal_Int32 nDX )
void WMFWriter::WriteSize(const Size & rSize)
{
Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) );
- *pWMF << ((short)aSz.Width()) << ((short)aSz.Height());
+ pWMF->WriteInt16( (short)aSz.Width() ).WriteInt16( (short)aSz.Height() );
}
void WMFWriter::WriteHeightWidth(const Size & rSize)
{
Size aSz( pVirDev->LogicToLogic(rSize,aSrcMapMode,aTargetMapMode) );
- *pWMF << ((short)aSz.Height()) << ((short)aSz.Width());
+ pWMF->WriteInt16( (short)aSz.Height() ).WriteInt16( (short)aSz.Width() );
}
@@ -225,7 +225,7 @@ void WMFWriter::WriteRectangle(const Rectangle & rRect)
void WMFWriter::WriteColor(const Color & rColor)
{
- *pWMF << (sal_uInt8) rColor.GetRed() << (sal_uInt8) rColor.GetGreen() << (sal_uInt8) rColor.GetBlue() << (sal_uInt8) 0;
+ pWMF->WriteUChar( (sal_uInt8) rColor.GetRed() ).WriteUChar( (sal_uInt8) rColor.GetGreen() ).WriteUChar( (sal_uInt8) rColor.GetBlue() ).WriteUChar( (sal_uInt8) 0 );
}
@@ -233,7 +233,7 @@ void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType)
{
nActRecordPos=pWMF->Tell();
if (nSizeWords>nMaxRecordSize) nMaxRecordSize=nSizeWords;
- *pWMF << nSizeWords << nType;
+ pWMF->WriteUInt32( nSizeWords ).WriteUInt16( nType );
}
@@ -244,13 +244,13 @@ void WMFWriter::UpdateRecordHeader()
nPos=pWMF->Tell(); nSize=nPos-nActRecordPos;
if ((nSize & 1)!=0) {
- *pWMF << (sal_uInt8)0;
+ pWMF->WriteUChar( (sal_uInt8)0 );
nPos++; nSize++;
}
nSize/=2;
if (nSize>nMaxRecordSize) nMaxRecordSize=nSize;
pWMF->Seek(nActRecordPos);
- *pWMF << nSize;
+ pWMF->WriteUInt32( nSize );
pWMF->Seek(nPos);
}
@@ -277,12 +277,12 @@ void WMFWriter::WMFRecord_CreateBrushIndirect(const Color& rColor)
WriteRecordHeader(0x00000007,W_META_CREATEBRUSHINDIRECT);
if( rColor==Color(COL_TRANSPARENT) )
- *pWMF << (sal_uInt16) W_BS_HOLLOW;
+ pWMF->WriteUInt16( (sal_uInt16) W_BS_HOLLOW );
else
- *pWMF << (sal_uInt16) W_BS_SOLID;
+ pWMF->WriteUInt16( (sal_uInt16) W_BS_SOLID );
WriteColor( rColor );
- *pWMF << (sal_uInt16) 0;
+ pWMF->WriteUInt16( (sal_uInt16) 0 );
}
@@ -293,7 +293,7 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT);
WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
- *pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation();
+ pWMF->WriteInt16( (short)rFont.GetOrientation() ).WriteInt16( (short)rFont.GetOrientation() );
switch (rFont.GetWeight()) {
case WEIGHT_THIN: nWeight=W_FW_THIN; break;
@@ -308,11 +308,11 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
case WEIGHT_BLACK: nWeight=W_FW_BLACK; break;
default: nWeight=W_FW_DONTCARE;
}
- *pWMF << nWeight;
+ pWMF->WriteUInt16( nWeight );
- if (rFont.GetItalic()==ITALIC_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1;
- if (rFont.GetUnderline()==UNDERLINE_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1;
- if (rFont.GetStrikeout()==STRIKEOUT_NONE) *pWMF << (sal_uInt8)0; else *pWMF << (sal_uInt8)1;
+ if (rFont.GetItalic()==ITALIC_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else pWMF->WriteUChar( (sal_uInt8)1 );
+ if (rFont.GetUnderline()==UNDERLINE_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else pWMF->WriteUChar( (sal_uInt8)1 );
+ if (rFont.GetStrikeout()==STRIKEOUT_NONE) pWMF->WriteUChar( (sal_uInt8)0 ); else pWMF->WriteUChar( (sal_uInt8)1 );
rtl_TextEncoding eFontNameEncoding = rFont.GetCharSet();
sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding );
@@ -320,9 +320,9 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
eFontNameEncoding = RTL_TEXTENCODING_MS_1252;
if ( nCharSet == 1 )
nCharSet = W_ANSI_CHARSET;
- *pWMF << nCharSet;
+ pWMF->WriteUChar( nCharSet );
- *pWMF << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0;
+ pWMF->WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 );
switch (rFont.GetPitch()) {
case PITCH_FIXED: nPitchFamily=W_FIXED_PITCH; break;
@@ -337,13 +337,13 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont)
case FAMILY_SWISS: nPitchFamily|=W_FF_SWISS; break;
default: nPitchFamily|=W_FF_DONTCARE;
}
- *pWMF << nPitchFamily;
+ pWMF->WriteUChar( nPitchFamily );
OString aFontName(OUStringToOString(rFont.GetName(), eFontNameEncoding));
for ( i = 0; i < W_LF_FACESIZE; i++ )
{
sal_Char nChar = ( i < aFontName.getLength() ) ? aFontName[i] : 0;
- *pWMF << nChar;
+ pWMF->WriteChar( nChar );
}
UpdateRecordHeader();
}
@@ -378,7 +378,7 @@ void WMFWriter::WMFRecord_CreatePenIndirect(const Color& rColor, const LineInfo&
default:
break;
}
- *pWMF << nStyle;
+ pWMF->WriteUInt16( nStyle );
WriteSize( Size( rLineInfo.GetWidth(), 0 ) );
WriteColor( rColor );
@@ -387,7 +387,7 @@ void WMFWriter::WMFRecord_CreatePenIndirect(const Color& rColor, const LineInfo&
void WMFWriter::WMFRecord_DeleteObject(sal_uInt16 nObjectHandle)
{
WriteRecordHeader(0x00000004,W_META_DELETEOBJECT);
- *pWMF << nObjectHandle;
+ pWMF->WriteUInt16( nObjectHandle );
}
@@ -409,15 +409,15 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In
nCheckSum = rtl_crc32( nCheckSum, pData, nLen );
WriteRecordHeader( 3 + 9 + ( ( nLen + 1 ) >> 1 ), W_META_ESCAPE );
- *pWMF << (sal_uInt16)W_MFCOMMENT
- << (sal_uInt16)( nLen + 14 ) // we will always have a fourteen byte escape header:
- << (sal_uInt16)0x4f4f // OO
- << (sal_uInt32)0xa2c2a // evil magic number
- << (sal_uInt32)nCheckSum // crc32 checksum about nEsc & pData
- << (sal_uInt32)nEsc; // escape number
+ pWMF->WriteUInt16( (sal_uInt16)W_MFCOMMENT )
+ .WriteUInt16( (sal_uInt16)( nLen + 14 ) ) // we will always have a fourteen byte escape header:
+ .WriteUInt16( (sal_uInt16)0x4f4f ) // OO
+ .WriteUInt32( (sal_uInt32)0xa2c2a ) // evil magic number
+ .WriteUInt32( (sal_uInt32)nCheckSum ) // crc32 checksum about nEsc & pData
+ .WriteUInt32( (sal_uInt32)nEsc ); // escape number
pWMF->Write( pData, nLen );
if ( nLen & 1 )
- *pWMF << (sal_uInt8)0; // pad byte
+ pWMF->WriteUChar( (sal_uInt8)0 ); // pad byte
}
/* if return value is true, then a complete unicode string and also a polygon replacement has been written,
@@ -493,15 +493,15 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r
SvMemoryStream aMemoryStream( nStrmLen );
Point aPt( pVirDev->LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode ) );
- aMemoryStream << static_cast<sal_Int32>(aPt.X())
- << static_cast<sal_Int32>(aPt.Y())
- << nStringLen;
+ aMemoryStream.WriteInt32( static_cast<sal_Int32>(aPt.X()) )
+ .WriteInt32( static_cast<sal_Int32>(aPt.Y()) )
+ .WriteUInt32( nStringLen );
for ( i = 0; i < nStringLen; i++ )
- aMemoryStream << rUniStr[ i ];
- aMemoryStream << nDXCount;
+ aMemoryStream.WriteUInt16( rUniStr[ i ] );
+ aMemoryStream.WriteUInt32( nDXCount );
for ( i = 0; i < nDXCount; i++ )
- aMemoryStream << pDXAry[ i ];
- aMemoryStream << nSkipActions;
+ aMemoryStream.WriteInt32( pDXAry[ i ] );
+ aMemoryStream.WriteUInt32( nSkipActions );
WMFRecord_Escape( PRIVATE_ESCAPE_UNICODE, nStrmLen, (const sal_Int8*)aMemoryStream.GetData() );
std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() );
@@ -542,10 +542,10 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const OUString & rString,
WriteRecordHeader( 0, W_META_EXTTEXTOUT );
WritePointYX( rPoint );
sal_uInt16 nNewTextLen = static_cast<sal_uInt16>(rByteString.getLength());
- *pWMF << nNewTextLen << (sal_uInt16)0;
+ pWMF->WriteUInt16( nNewTextLen ).WriteUInt16( (sal_uInt16)0 );
write_uInt8s_FromOString(*pWMF, rByteString, nNewTextLen);
if ( nNewTextLen & 1 )
- *pWMF << (sal_uInt8)0;
+ pWMF->WriteUChar( (sal_uInt8)0 );
sal_Int32 nOriginalTextLen = rString.getLength();
sal_Int16* pConvertedDXAry = new sal_Int16[ nOriginalTextLen ];
@@ -558,14 +558,14 @@ void WMFWriter::TrueExtTextOut( const Point & rPoint, const OUString & rString,
for (sal_uInt16 i = 0; i < nOriginalTextLen; ++i)
{
sal_Int16 nDx = pConvertedDXAry[ i ];
- *pWMF << nDx;
+ pWMF->WriteInt16( nDx );
if ( nOriginalTextLen < nNewTextLen )
{
sal_Unicode nUniChar = rString[i];
OString aTemp(&nUniChar, 1, aSrcFont.GetCharSet());
j = aTemp.getLength();
while ( --j > 0 )
- *pWMF << (sal_uInt16)0;
+ pWMF->WriteUInt16( (sal_uInt16)0 );
}
}
delete[] pConvertedDXAry;
@@ -606,7 +606,7 @@ void WMFWriter::WMFRecord_Polygon(const Polygon & rPoly)
aSimplePoly = rPoly;
nSize = aSimplePoly.GetSize();
WriteRecordHeader(((sal_uLong)nSize)*2+4,W_META_POLYGON);
- *pWMF << nSize;
+ pWMF->WriteUInt16( nSize );
for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i));
}
@@ -621,7 +621,7 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly)
aSimplePoly = rPoly;
nSize=aSimplePoly.GetSize();
WriteRecordHeader(((sal_uLong)nSize)*2+4,W_META_POLYLINE);
- *pWMF << nSize;
+ pWMF->WriteUInt16( nSize );
for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i));
}
@@ -643,8 +643,8 @@ void WMFWriter::WMFRecord_PolyPolygon(const PolyPolygon & rPolyPoly)
}
}
WriteRecordHeader(0,W_META_POLYPOLYGON);
- *pWMF << nCount;
- for (i=0; i<nCount; i++) *pWMF << ((sal_uInt16)(aSimplePolyPoly.GetObject(i).GetSize()));
+ pWMF->WriteUInt16( nCount );
+ for (i=0; i<nCount; i++) pWMF->WriteUInt16( (sal_uInt16)(aSimplePolyPoly.GetObject(i).GetSize()) );
for (i=0; i<nCount; i++) {
pPoly=&(aSimplePolyPoly.GetObject(i));
nSize=pPoly->GetSize();
@@ -664,7 +664,7 @@ void WMFWriter::WMFRecord_Rectangle(const Rectangle & rRect)
void WMFWriter::WMFRecord_RestoreDC()
{
WriteRecordHeader(0x00000004,W_META_RESTOREDC);
- *pWMF << (short)-1;
+ pWMF->WriteInt16( (short)-1 );
}
@@ -685,21 +685,21 @@ void WMFWriter::WMFRecord_SaveDC()
void WMFWriter::WMFRecord_SelectObject(sal_uInt16 nObjectHandle)
{
WriteRecordHeader(0x00000004,W_META_SELECTOBJECT);
- *pWMF << nObjectHandle;
+ pWMF->WriteUInt16( nObjectHandle );
}
void WMFWriter::WMFRecord_SetBkMode(bool bTransparent)
{
WriteRecordHeader(0x00000004,W_META_SETBKMODE);
- if (bTransparent) *pWMF << (sal_uInt16)W_TRANSPARENT;
- else *pWMF << (sal_uInt16)W_OPAQUE;
+ if (bTransparent) pWMF->WriteUInt16( (sal_uInt16)W_TRANSPARENT );
+ else pWMF->WriteUInt16( (sal_uInt16)W_OPAQUE );
}
void WMFWriter::WMFRecord_SetStretchBltMode()
{
WriteRecordHeader( 0x00000004, W_META_SETSTRETCHBLTMODE );
- *pWMF << (sal_uInt16) 3; // STRETCH_DELETESCANS
+ pWMF->WriteUInt16( (sal_uInt16) 3 ); // STRETCH_DELETESCANS
}
void WMFWriter::WMFRecord_SetPixel(const Point & rPoint, const Color & rColor)
@@ -720,7 +720,7 @@ void WMFWriter::WMFRecord_SetROP2(RasterOp eROP)
default: nROP2=W_R2_COPYPEN;
}
WriteRecordHeader(0x00000004,W_META_SETROP2);
- *pWMF << nROP2;
+ pWMF->WriteUInt16( nROP2 );
}
@@ -737,7 +737,7 @@ void WMFWriter::WMFRecord_SetTextAlign(FontAlign eFontAlign, sal_uInt32 eHorText
nAlign|=W_TA_NOUPDATECP;
WriteRecordHeader(0x00000004,W_META_SETTEXTALIGN);
- *pWMF << nAlign;
+ pWMF->WriteUInt16( nAlign );
}
@@ -778,7 +778,7 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize,
// erzeugt, schreiben wir zuerst die Bitmap an die richtige Position
// Und ueberschreiben hinterher den FILEHEADER mit den Parametern.
nPosAnf=pWMF->Tell(); // Position merken, wo Parameter hin sollen
- *pWMF << (sal_Int32)0 << (sal_Int32)0; // 8 bytes auffuellen (diese 8 bytes +
+ pWMF->WriteInt32( (sal_Int32)0 ).WriteInt32( (sal_Int32)0 ); // 8 bytes auffuellen (diese 8 bytes +
// 14 bytes ueberfluessigen FILEHEADER
// = 22 bytes Parameter)
@@ -801,12 +801,7 @@ void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize,
}
}
- *pWMF << nROP <<
- (short) 0 <<
- (short) rBitmap.GetSizePixel().Height() <<
- (short) rBitmap.GetSizePixel().Width() <<
- (short) 0 <<
- (short) 0;
+ pWMF->WriteUInt32( nROP ). WriteInt16( (short) 0 ). WriteInt16( (short) rBitmap.GetSizePixel().Height() ). WriteInt16( (short) rBitmap.GetSizePixel().Width() ). WriteInt16( (short) 0 ). WriteInt16( (short) 0 );
WriteHeightWidth(rSize);
WritePointYX(rPoint);
@@ -832,7 +827,7 @@ void WMFWriter::TrueTextOut(const Point & rPoint, const OString& rString)
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(*pWMF, rString);
sal_Int32 nLen = rString.getLength();
- if ((nLen&1)!=0) *pWMF << (sal_uInt8)0;
+ if ((nLen&1)!=0) pWMF->WriteUChar( (sal_uInt8)0 );
WritePointYX(rPoint);
UpdateRecordHeader();
}
@@ -1667,27 +1662,27 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable )
sal_uInt16 nUnitsPerInch = (sal_uInt16) ( ( aSize.Width() + aSize.Height() ) >> 1 );
nCheckSum=0;
- nValue=0xcdd7; nCheckSum^=nValue; *pWMF << nValue;
- nValue=0x9ac6; nCheckSum^=nValue; *pWMF << nValue;
- nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue;
- nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue;
- nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue;
- nValue=(sal_uInt16) aTargetSize.Width(); nCheckSum^=nValue; *pWMF << nValue;
- nValue=(sal_uInt16) aTargetSize.Height(); nCheckSum^=nValue; *pWMF << nValue;
- nValue=nUnitsPerInch; nCheckSum^=nValue; *pWMF << nValue;
- nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue;
- nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue;
- *pWMF << nCheckSum;
+ nValue=0xcdd7; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=0x9ac6; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=(sal_uInt16) aTargetSize.Width(); nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=(sal_uInt16) aTargetSize.Height(); nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=nUnitsPerInch; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ nValue=0x0000; nCheckSum^=nValue; pWMF->WriteUInt16( nValue );
+ pWMF->WriteUInt16( nCheckSum );
}
nMetafileHeaderPos=pWMF->Tell();
- *pWMF << (sal_uInt16)0x0001 // Typ: Datei
- << (sal_uInt16)0x0009 // Headerlaenge in Worten
- << (sal_uInt16)0x0300 // Version als BCD-Zahl
- << (sal_uInt32) 0x00000000 // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt
- << (sal_uInt16)MAXOBJECTHANDLES // Maximalezahl der gleichzeitigen Objekte
- << (sal_uInt32) 0x00000000 // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt
- << (sal_uInt16)0x0000; // Reserved
+ pWMF->WriteUInt16( (sal_uInt16)0x0001 ) // Typ: Datei
+ .WriteUInt16( (sal_uInt16)0x0009 ) // Headerlaenge in Worten
+ .WriteUInt16( (sal_uInt16)0x0300 ) // Version als BCD-Zahl
+ .WriteUInt32( (sal_uInt32) 0x00000000 ) // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt
+ .WriteUInt16( (sal_uInt16)MAXOBJECTHANDLES ) // Maximalezahl der gleichzeitigen Objekte
+ .WriteUInt32( (sal_uInt32) 0x00000000 ) // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt
+ .WriteUInt16( (sal_uInt16)0x0000 ); // Reserved
}
// ------------------------------------------------------------------------
@@ -1700,15 +1695,15 @@ void WMFWriter::UpdateHeader()
nPos=pWMF->Tell(); // Endposition = Gesammtgroesse der Datei
nFileSize=nPos-nMetafileHeaderPos; // Groesse des 1. Headers abziehen
if ((nFileSize&1)!=0) { // ggf. auf ganze Worte aufrunden
- *pWMF << (sal_uInt8)0;
+ pWMF->WriteUChar( (sal_uInt8)0 );
nPos++;
nFileSize++;
}
nFileSize>>=1; // In Anzahl Worte umrechnen
pWMF->Seek(nMetafileHeaderPos+6); // Zum Dateigroessen-Eintrag im zweiten Header
- *pWMF << nFileSize; // Dateigroesse berichtigen
+ pWMF->WriteUInt32( nFileSize ); // Dateigroesse berichtigen
pWMF->SeekRel(2); // Zum Max-Record-Laenge-Eintrag im zweiten Header
- *pWMF << nMaxRecordSize; // und berichtigen
+ pWMF->WriteUInt32( nMaxRecordSize ); // und berichtigen
pWMF->Seek(nPos);
}
@@ -1924,17 +1919,17 @@ void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sa
{
// according to http://msdn.microsoft.com/en-us/library/dd366152%28PROT.13%29.aspx
WriteRecordHeader( 0, W_META_ESCAPE );
- *pWMF << (sal_uInt16)W_MFCOMMENT // same as META_ESCAPE_ENHANCED_METAFILE
- << (sal_uInt16)( nCurSize + 34 ) // we will always have a 34 byte escape header:
- << (sal_uInt32) 0x43464D57 // WMFC
- << (sal_uInt32) 0x00000001 // Comment type
- << (sal_uInt32) 0x00010000 // version
- << nCheckSum // check sum
- << (sal_uInt32) 0 // flags = 0
- << nRecCounts // total number of records
- << nCurSize // size of this record's data
- << nRemainingSize // remaining size of data in following records, missing in MSDN documentation
- << nTotalSize; // total size of EMF stream
+ pWMF->WriteUInt16( (sal_uInt16)W_MFCOMMENT ) // same as META_ESCAPE_ENHANCED_METAFILE
+ .WriteUInt16( (sal_uInt16)( nCurSize + 34 ) ) // we will always have a 34 byte escape header:
+ .WriteUInt32( (sal_uInt32) 0x43464D57 ) // WMFC
+ .WriteUInt32( (sal_uInt32) 0x00000001 ) // Comment type
+ .WriteUInt32( (sal_uInt32) 0x00010000 ) // version
+ .WriteUInt16( nCheckSum ) // check sum
+ .WriteUInt32( (sal_uInt32) 0 ) // flags = 0
+ .WriteUInt32( nRecCounts ) // total number of records
+ .WriteUInt32( nCurSize ) // size of this record's data
+ .WriteUInt32( nRemainingSize ) // remaining size of data in following records, missing in MSDN documentation
+ .WriteUInt32( nTotalSize ); // total size of EMF stream
pWMF->Write( static_cast< const sal_Char* >( rStream.GetData() ) + rStream.Tell(), nCurSize );
rStream.SeekRel( nCurSize );
diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index a43bd15837f9..92f19b7c4daa 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.cxx
@@ -711,7 +711,7 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
WriteDIBBitmapEx(rAnimation.GetBitmapEx(), rOStm);
// Write identifier ( SDANIMA1 )
- rOStm << (sal_uInt32) 0x5344414e << (sal_uInt32) 0x494d4931;
+ rOStm.WriteUInt32( (sal_uInt32) 0x5344414e ).WriteUInt32( (sal_uInt32) 0x494d4931 );
for( sal_uInt16 i = 0; i < nCount; i++ )
{
@@ -723,15 +723,15 @@ SvStream& operator<<( SvStream& rOStm, const Animation& rAnimation )
rOStm << rAnimBmp.aPosPix;
rOStm << rAnimBmp.aSizePix;
rOStm << rAnimation.maGlobalSize;
- rOStm << (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait );
- rOStm << (sal_uInt16) rAnimBmp.eDisposal;
- rOStm << (sal_uInt8) rAnimBmp.bUserInput;
- rOStm << (sal_uInt32) rAnimation.mnLoopCount;
- rOStm << nDummy32; // Unused
- rOStm << nDummy32; // Unused
- rOStm << nDummy32; // Unused
+ rOStm.WriteUInt16( (sal_uInt16) ( ( ANIMATION_TIMEOUT_ON_CLICK == rAnimBmp.nWait ) ? 65535 : rAnimBmp.nWait ) );
+ rOStm.WriteUInt16( (sal_uInt16) rAnimBmp.eDisposal );
+ rOStm.WriteUChar( (sal_uInt8) rAnimBmp.bUserInput );
+ rOStm.WriteUInt32( (sal_uInt32) rAnimation.mnLoopCount );
+ rOStm.WriteUInt32( nDummy32 ); // Unused
+ rOStm.WriteUInt32( nDummy32 ); // Unused
+ rOStm.WriteUInt32( nDummy32 ); // Unused
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, OString()); // dummy
- rOStm << nRest; // Count of remaining structures
+ rOStm.WriteUInt16( nRest ); // Count of remaining structures
}
}
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 46ee97c3a9c1..54dafd3b79bc 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -83,9 +83,9 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly )
for( n = 0; n < nPoly; n++ )
nPoints = sal::static_int_cast<sal_uInt16>(nPoints + rPolyPoly[ n ].GetSize());
- rOStm << (sal_Int16) GDI_POLYPOLYGON_ACTION;
- rOStm << (sal_Int32) ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) );
- rOStm << (sal_Int32) nPoly;
+ rOStm.WriteInt16( (sal_Int16) GDI_POLYPOLYGON_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoly << 2 ) + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( (sal_Int32) nPoly );
for( n = 0; n < nPoly; n++ )
{
@@ -96,7 +96,7 @@ void ImplWritePolyPolyAction( SvStream& rOStm, const PolyPolygon& rPolyPoly )
rPolyPoly[n].AdaptiveSubdivide(aSimplePoly);
const sal_uInt16 nSize(aSimplePoly.GetSize());
- rOStm << (sal_Int32) nSize;
+ rOStm.WriteInt32( (sal_Int32) nSize );
for( sal_uInt16 j = 0; j < nSize; j++ )
rOStm << aSimplePoly[ j ];
@@ -117,13 +117,13 @@ void ImplWriteColor( SvStream& rOStm, const Color& rColor )
sal_Int16 nVal;
nVal = ( (sal_Int16) rColor.GetRed() << 8 ) | rColor.GetRed();
- rOStm << nVal;
+ rOStm.WriteInt16( nVal );
nVal = ( (sal_Int16) rColor.GetGreen() << 8 ) | rColor.GetGreen();
- rOStm << nVal;
+ rOStm.WriteInt16( nVal );
nVal = ( (sal_Int16) rColor.GetBlue() << 8 ) | rColor.GetBlue();
- rOStm << nVal;
+ rOStm.WriteInt16( nVal );
}
void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
@@ -141,24 +141,24 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode )
void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode )
{
- rOStm << (sal_Int16) rMapMode.GetMapUnit();
+ rOStm.WriteInt16( (sal_Int16) rMapMode.GetMapUnit() );
rOStm << rMapMode.GetOrigin();
- rOStm << (sal_Int32) rMapMode.GetScaleX().GetNumerator();
- rOStm << (sal_Int32) rMapMode.GetScaleX().GetDenominator();
- rOStm << (sal_Int32) rMapMode.GetScaleY().GetNumerator();
- rOStm << (sal_Int32) rMapMode.GetScaleY().GetDenominator();
+ rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetNumerator() );
+ rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleX().GetDenominator() );
+ rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetNumerator() );
+ rOStm.WriteInt32( (sal_Int32) rMapMode.GetScaleY().GetDenominator() );
}
void ImplWritePushAction( SvStream& rOStm )
{
- rOStm << (sal_Int16) GDI_PUSH_ACTION;
- rOStm << (sal_Int32) 4;
+ rOStm.WriteInt16( (sal_Int16) GDI_PUSH_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 4 );
}
void ImplWritePopAction( SvStream& rOStm )
{
- rOStm << (sal_Int16) GDI_POP_ACTION;
- rOStm << (sal_Int32) 4;
+ rOStm.WriteInt16( (sal_Int16) GDI_POP_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 4 );
}
void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle, sal_Int32 nWidth = 0L )
@@ -166,17 +166,17 @@ void ImplWriteLineColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle,
if( rColor.GetTransparency() > 127 )
nStyle = 0;
- rOStm << (sal_Int16) GDI_PEN_ACTION;
- rOStm << (sal_Int32) 16;
+ rOStm.WriteInt16( (sal_Int16) GDI_PEN_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 16 );
ImplWriteColor( rOStm, rColor );
- rOStm << nWidth;
- rOStm << nStyle;
+ rOStm.WriteInt32( nWidth );
+ rOStm.WriteInt16( nStyle );
}
void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle )
{
- rOStm << (sal_Int16) GDI_FILLBRUSH_ACTION;
- rOStm << (sal_Int32) 20;
+ rOStm.WriteInt16( (sal_Int16) GDI_FILLBRUSH_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 20 );
ImplWriteColor( rOStm, rColor );
if( rColor.GetTransparency() > 127 )
@@ -185,14 +185,14 @@ void ImplWriteFillColor( SvStream& rOStm, const Color& rColor, sal_Int16 nStyle
if( nStyle > 1 )
{
ImplWriteColor( rOStm, COL_WHITE );
- rOStm << nStyle;
- rOStm << (sal_Int16) 1;
+ rOStm.WriteInt16( nStyle );
+ rOStm.WriteInt16( (sal_Int16) 1 );
}
else
{
ImplWriteColor( rOStm, COL_BLACK );
- rOStm << nStyle;
- rOStm << (sal_Int16) 0;
+ rOStm.WriteInt16( nStyle );
+ rOStm.WriteInt16( (sal_Int16) 0 );
}
}
@@ -230,34 +230,34 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont,
break;
}
- rOStm << (sal_Int16) GDI_FONT_ACTION;
- rOStm << (sal_Int32) 78;
+ rOStm.WriteInt16( (sal_Int16) GDI_FONT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 78 );
rActualCharSet = GetStoreCharSet( rFont.GetCharSet() );
ImplWriteColor( rOStm, rFont.GetColor() );
ImplWriteColor( rOStm, rFont.GetFillColor() );
rOStm.Write( aName, 32 );
rOStm << rFont.GetSize();
- rOStm << (sal_Int16) 0; // no character orientation anymore
- rOStm << (sal_Int16) rFont.GetOrientation();
- rOStm << (sal_Int16) rActualCharSet;
- rOStm << (sal_Int16) rFont.GetFamily();
- rOStm << (sal_Int16) rFont.GetPitch();
- rOStm << (sal_Int16) rFont.GetAlign();
- rOStm << (sal_Int16) nWeight;
- rOStm << (sal_Int16) rFont.GetUnderline();
- rOStm << (sal_Int16) rFont.GetStrikeout();
- rOStm << (sal_Bool) ( rFont.GetItalic() != ITALIC_NONE );
- rOStm << rFont.IsOutline();
- rOStm << rFont.IsShadow();
- rOStm << rFont.IsTransparent();
+ rOStm.WriteInt16( (sal_Int16) 0 ); // no character orientation anymore
+ rOStm.WriteInt16( (sal_Int16) rFont.GetOrientation() );
+ rOStm.WriteInt16( (sal_Int16) rActualCharSet );
+ rOStm.WriteInt16( (sal_Int16) rFont.GetFamily() );
+ rOStm.WriteInt16( (sal_Int16) rFont.GetPitch() );
+ rOStm.WriteInt16( (sal_Int16) rFont.GetAlign() );
+ rOStm.WriteInt16( (sal_Int16) nWeight );
+ rOStm.WriteInt16( (sal_Int16) rFont.GetUnderline() );
+ rOStm.WriteInt16( (sal_Int16) rFont.GetStrikeout() );
+ rOStm.WriteUChar( (sal_Bool) ( rFont.GetItalic() != ITALIC_NONE ) );
+ rOStm.WriteUChar( rFont.IsOutline() );
+ rOStm.WriteUChar( rFont.IsShadow() );
+ rOStm.WriteUChar( rFont.IsTransparent() );
if ( rActualCharSet == RTL_TEXTENCODING_DONTKNOW )
rActualCharSet = osl_getThreadTextEncoding();
}
void ImplWriteRasterOpAction( SvStream& rOStm, sal_Int16 nRasterOp )
{
- rOStm << (sal_Int16) GDI_RASTEROP_ACTION << (sal_Int32) 6 << nRasterOp;
+ rOStm.WriteInt16( (sal_Int16) GDI_RASTEROP_ACTION ).WriteInt32( (sal_Int32) 6 ).WriteInt16( nRasterOp );
}
sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString )
@@ -268,7 +268,7 @@ sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString )
sal_uInt32 nSize = ( nStringLen << 1 ) + 4;
sal_uInt16 nType = GDI_UNICODE_COMMENT;
- rOStm << nType << nSize;
+ rOStm.WriteUInt16( nType ).WriteUInt32( nSize );
write_uInt16s_FromOUString(rOStm, rString);
}
return nStringLen != 0;
@@ -337,7 +337,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
if((bOnlyWhenCurve && nAllFlagCount) || (!bOnlyWhenCurve && nAllPointCount))
{
- rOStm << (sal_Int16) GDI_EXTENDEDPOLYGON_ACTION;
+ rOStm.WriteInt16( (sal_Int16) GDI_EXTENDEDPOLYGON_ACTION );
const sal_Int32 nActionSize(
4 + // Action size
@@ -347,8 +347,8 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
nAllPolygonCount + // Bool if (when poly has points) it has flags, too
nAllFlagCount); // Flags themselves
- rOStm << nActionSize;
- rOStm << (sal_uInt16)nAllPolygonCount;
+ rOStm.WriteInt32( nActionSize );
+ rOStm.WriteUInt16( (sal_uInt16)nAllPolygonCount );
for(a = 0; a < nPolygonCount; a++)
{
@@ -357,7 +357,7 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
if(nPointCount)
{
- rOStm << nPointCount;
+ rOStm.WriteUInt16( nPointCount );
for(sal_uInt16 b(0); b < nPointCount; b++)
{
@@ -366,16 +366,16 @@ bool ImplWriteExtendedPolyPolygonAction(SvStream& rOStm, const PolyPolygon& rPol
if(rCandidate.HasFlags())
{
- rOStm << (sal_uInt8)true;
+ rOStm.WriteUChar( (sal_uInt8)true );
for(sal_uInt16 c(0); c < nPointCount; c++)
{
- rOStm << (sal_uInt8)rCandidate.GetFlags(c);
+ rOStm.WriteUChar( (sal_uInt8)rCandidate.GetFlags(c) );
}
}
else
{
- rOStm << (sal_uInt8)false;
+ rOStm.WriteUChar( (sal_uInt8)false );
}
}
}
@@ -1342,11 +1342,11 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
// Write MagicCode
- rOStm << "SVGDI"; // Identifier
- rOStm << (sal_Int16) 42; // HeaderSize
- rOStm << (sal_Int16) 200; // VERSION
- rOStm << (sal_Int32) aPrefSize.Width();
- rOStm << (sal_Int32) aPrefSize.Height();
+ rOStm.WriteCharPtr( "SVGDI" ); // Identifier
+ rOStm.WriteInt16( (sal_Int16) 42 ); // HeaderSize
+ rOStm.WriteInt16( (sal_Int16) 200 ); // VERSION
+ rOStm.WriteInt32( (sal_Int32) aPrefSize.Width() );
+ rOStm.WriteInt32( (sal_Int32) aPrefSize.Height() );
ImplWriteMapMode( rOStm, rMtf.GetPrefMapMode() );
// ActionCount will be written later
@@ -1357,7 +1357,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf )
const sal_uLong nActPos = rOStm.Tell();
rOStm.Seek( nCountPos );
- rOStm << nActCount;
+ rOStm.WriteInt32( nActCount );
rOStm.Seek( nActPos );
rOStm.SetNumberFormatInt( nOldFormat );
@@ -1385,8 +1385,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaPixelAction* pAct = (MetaPixelAction*) pAction;
- rOStm << (sal_Int16) GDI_PIXEL_ACTION;
- rOStm << (sal_Int32) 18;
+ rOStm.WriteInt16( (sal_Int16) GDI_PIXEL_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 18 );
rOStm << pAct->GetPoint();
ImplWriteColor( rOStm, pAct->GetColor() );
nCount++;
@@ -1397,8 +1397,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaPointAction* pAct = (MetaPointAction*) pAction;
- rOStm << (sal_Int16) GDI_POINT_ACTION;
- rOStm << (sal_Int32) 12;
+ rOStm.WriteInt16( (sal_Int16) GDI_POINT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 12 );
rOStm << pAct->GetPoint();
nCount++;
}
@@ -1420,32 +1420,32 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if(bLineJoin)
{
- rOStm << (sal_Int16) GDI_LINEJOIN_ACTION;
- rOStm << (sal_Int32) 6;
- rOStm << (sal_Int16) rInfo.GetLineJoin();
+ rOStm.WriteInt16( (sal_Int16) GDI_LINEJOIN_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt16( (sal_Int16) rInfo.GetLineJoin() );
}
if(bLineCap)
{
- rOStm << (sal_Int16) GDI_LINECAP_ACTION;
- rOStm << (sal_Int32) 6;
- rOStm << (sal_Int16) rInfo.GetLineCap();
+ rOStm.WriteInt16( (sal_Int16) GDI_LINECAP_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt16( (sal_Int16) rInfo.GetLineCap() );
}
}
if(bLineDashDot)
{
- rOStm << (sal_Int16) GDI_LINEDASHDOT_ACTION;
- rOStm << (sal_Int32) 4 + 16;
- rOStm << (sal_Int16)rInfo.GetDashCount();
- rOStm << (sal_Int32)rInfo.GetDashLen();
- rOStm << (sal_Int16)rInfo.GetDotCount();
- rOStm << (sal_Int32)rInfo.GetDotLen();
- rOStm << (sal_Int32)rInfo.GetDistance();
+ rOStm.WriteInt16( (sal_Int16) GDI_LINEDASHDOT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 4 + 16 );
+ rOStm.WriteInt16( (sal_Int16)rInfo.GetDashCount() );
+ rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() );
+ rOStm.WriteInt16( (sal_Int16)rInfo.GetDotCount() );
+ rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() );
+ rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() );
}
- rOStm << (sal_Int16) GDI_LINE_ACTION;
- rOStm << (sal_Int32) 20;
+ rOStm.WriteInt16( (sal_Int16) GDI_LINE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 20 );
rOStm << pAct->GetStartPoint();
rOStm << pAct->GetEndPoint();
nCount++;
@@ -1477,11 +1477,11 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaRectAction* pAct = (MetaRectAction*) pAction;
- rOStm << (sal_Int16) GDI_RECT_ACTION;
- rOStm << (sal_Int32) 28;
+ rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 28 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm << (sal_Int32) 0;
- rOStm << (sal_Int32) 0;
+ rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( (sal_Int32) 0 );
nCount++;
}
break;
@@ -1490,11 +1490,11 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaRoundRectAction* pAct = (MetaRoundRectAction*) pAction;
- rOStm << (sal_Int16) GDI_RECT_ACTION;
- rOStm << (sal_Int32) 28;
+ rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 28 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm << (sal_Int32) pAct->GetHorzRound();
- rOStm << (sal_Int32) pAct->GetVertRound();
+ rOStm.WriteInt32( (sal_Int32) pAct->GetHorzRound() );
+ rOStm.WriteInt32( (sal_Int32) pAct->GetVertRound() );
nCount++;
}
break;
@@ -1503,8 +1503,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaEllipseAction* pAct = (MetaEllipseAction*) pAction;
- rOStm << (sal_Int16) GDI_ELLIPSE_ACTION;
- rOStm << (sal_Int32) 20;
+ rOStm.WriteInt16( (sal_Int16) GDI_ELLIPSE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 20 );
ImplWriteRect( rOStm, pAct->GetRect() );
nCount++;
}
@@ -1514,8 +1514,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaArcAction* pAct = (MetaArcAction*) pAction;
- rOStm << (sal_Int16) GDI_ARC_ACTION;
- rOStm << (sal_Int32) 36;
+ rOStm.WriteInt16( (sal_Int16) GDI_ARC_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 36 );
ImplWriteRect( rOStm, pAct->GetRect() );
rOStm << pAct->GetStartPoint();
rOStm << pAct->GetEndPoint();
@@ -1527,8 +1527,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaPieAction* pAct = (MetaPieAction*) pAction;
- rOStm << (sal_Int16) GDI_PIE_ACTION;
- rOStm << (sal_Int32) 36;
+ rOStm.WriteInt16( (sal_Int16) GDI_PIE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 36 );
ImplWriteRect( rOStm, pAct->GetRect() );
rOStm << pAct->GetStartPoint();
rOStm << pAct->GetEndPoint();
@@ -1543,9 +1543,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
pAct->GetEndPoint(), POLY_CHORD );
const sal_uInt16 nPoints = aChordPoly.GetSize();
- rOStm << (sal_Int16) GDI_POLYGON_ACTION;
- rOStm << (sal_Int32) ( 8 + ( nPoints << 3 ) );
- rOStm << (sal_Int32) nPoints;
+ rOStm.WriteInt16( (sal_Int16) GDI_POLYGON_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( (sal_Int32) nPoints );
for( sal_uInt16 n = 0; n < nPoints; n++ )
rOStm << aChordPoly[ n ];
@@ -1576,33 +1576,33 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if(bLineJoin)
{
- rOStm << (sal_Int16) GDI_LINEJOIN_ACTION;
- rOStm << (sal_Int32) 6;
- rOStm << (sal_Int16) rInfo.GetLineJoin();
+ rOStm.WriteInt16( (sal_Int16) GDI_LINEJOIN_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt16( (sal_Int16) rInfo.GetLineJoin() );
}
if(bLineCap)
{
- rOStm << (sal_Int16) GDI_LINECAP_ACTION;
- rOStm << (sal_Int32) 6;
- rOStm << (sal_Int16) rInfo.GetLineCap();
+ rOStm.WriteInt16( (sal_Int16) GDI_LINECAP_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 6 );
+ rOStm.WriteInt16( (sal_Int16) rInfo.GetLineCap() );
}
}
if(bLineDashDot)
{
- rOStm << (sal_Int16) GDI_LINEDASHDOT_ACTION;
- rOStm << (sal_Int32) 4 + 16;
- rOStm << (sal_Int16)rInfo.GetDashCount();
- rOStm << (sal_Int32)rInfo.GetDashLen();
- rOStm << (sal_Int16)rInfo.GetDotCount();
- rOStm << (sal_Int32)rInfo.GetDotLen();
- rOStm << (sal_Int32)rInfo.GetDistance();
+ rOStm.WriteInt16( (sal_Int16) GDI_LINEDASHDOT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 4 + 16 );
+ rOStm.WriteInt16( (sal_Int16)rInfo.GetDashCount() );
+ rOStm.WriteInt32( (sal_Int32)rInfo.GetDashLen() );
+ rOStm.WriteInt16( (sal_Int16)rInfo.GetDotCount() );
+ rOStm.WriteInt32( (sal_Int32)rInfo.GetDotLen() );
+ rOStm.WriteInt32( (sal_Int32)rInfo.GetDistance() );
}
- rOStm << (sal_Int16) GDI_POLYLINE_ACTION;
- rOStm << (sal_Int32) ( 8 + ( nPoints << 3 ) );
- rOStm << (sal_Int32) nPoints;
+ rOStm.WriteInt16( (sal_Int16) GDI_POLYLINE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( (sal_Int32) nPoints );
for( sal_uInt16 n = 0; n < nPoints; n++ )
{
@@ -1650,9 +1650,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
pAct->GetPolygon().AdaptiveSubdivide(aSimplePoly);
const sal_uInt16 nPoints(aSimplePoly.GetSize());
- rOStm << (sal_Int16) GDI_POLYGON_ACTION;
- rOStm << (sal_Int32) ( 8 + ( nPoints << 3 ) );
- rOStm << (sal_Int32) nPoints;
+ rOStm.WriteInt16( (sal_Int16) GDI_POLYGON_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 8 + ( nPoints << 3 ) ) );
+ rOStm.WriteInt32( (sal_Int32) nPoints );
for( sal_uInt16 n = 0; n < nPoints; n++ )
rOStm << aSimplePoly[ n ];
@@ -1691,12 +1691,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
nCount++;
- rOStm << (sal_Int16) GDI_TEXT_ACTION;
- rOStm << (sal_Int32) ( 24 + ( nStrLen + 1 ) );
+ rOStm.WriteInt16( (sal_Int16) GDI_TEXT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 24 + ( nStrLen + 1 ) ) );
rOStm << pAct->GetPoint();
- rOStm << (sal_Int32) pAct->GetIndex();
- rOStm << (sal_Int32) pAct->GetLen();
- rOStm << (sal_Int32) nStrLen;
+ rOStm.WriteInt32( (sal_Int32) pAct->GetIndex() );
+ rOStm.WriteInt32( (sal_Int32) pAct->GetLen() );
+ rOStm.WriteInt32( (sal_Int32) nStrLen );
rOStm.Write( aText.getStr(), nStrLen + 1 );
nCount++;
}
@@ -1729,17 +1729,17 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
else
nAryLen = nLen; // #105987# Write out all of DX array
- rOStm << (sal_Int16) GDI_TEXTARRAY_ACTION;
- rOStm << (sal_Int32) ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) );
+ rOStm.WriteInt16( (sal_Int16) GDI_TEXTARRAY_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 28 + ( nLen + 1 ) + ( nAryLen * 4 ) ) );
rOStm << pAct->GetPoint();
- rOStm << (sal_Int32) 0;
- rOStm << (sal_Int32) nLen;
- rOStm << (sal_Int32) nLen;
- rOStm << (sal_Int32) nAryLen;
+ rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( (sal_Int32) nLen );
+ rOStm.WriteInt32( (sal_Int32) nLen );
+ rOStm.WriteInt32( (sal_Int32) nAryLen );
rOStm.Write( aText.getStr()+pAct->GetIndex(), nLen + 1 );
for( sal_uLong n = 0UL ; n < nAryLen; n++ )
- rOStm << (sal_Int32) pDXArray[ n ];
+ rOStm.WriteInt32( (sal_Int32) pDXArray[ n ] );
nCount++;
}
@@ -1756,13 +1756,13 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
nCount++;
- rOStm << (sal_Int16) GDI_STRETCHTEXT_ACTION;
- rOStm << (sal_Int32) ( 28 + ( nStrLen + 1 ) );
+ rOStm.WriteInt16( (sal_Int16) GDI_STRETCHTEXT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) ( 28 + ( nStrLen + 1 ) ) );
rOStm << pAct->GetPoint();
- rOStm << (sal_Int32) pAct->GetIndex();
- rOStm << (sal_Int32) pAct->GetLen();
- rOStm << (sal_Int32) nStrLen;
- rOStm << (sal_Int32) pAct->GetWidth();
+ rOStm.WriteInt32( (sal_Int32) pAct->GetIndex() );
+ rOStm.WriteInt32( (sal_Int32) pAct->GetLen() );
+ rOStm.WriteInt32( (sal_Int32) nStrLen );
+ rOStm.WriteInt32( (sal_Int32) pAct->GetWidth() );
rOStm.Write( aText.getStr(), nStrLen + 1 );
nCount++;
}
@@ -1772,8 +1772,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaBmpAction* pAct = (MetaBmpAction*) pAction;
- rOStm << (sal_Int16) GDI_BITMAP_ACTION;
- rOStm << (sal_Int32) 12;
+ rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 12 );
rOStm << pAct->GetPoint();
WriteDIB(pAct->GetBitmap(), rOStm, false, true);
nCount++;
@@ -1784,8 +1784,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
- rOStm << (sal_Int16) GDI_BITMAPSCALE_ACTION;
- rOStm << (sal_Int32) 20;
+ rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 20 );
rOStm << pAct->GetPoint();
rOStm << pAct->GetSize();
WriteDIB(pAct->GetBitmap(), rOStm, false, true);
@@ -1797,8 +1797,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
- rOStm << (sal_Int16) GDI_BITMAPSCALEPART_ACTION;
- rOStm << (sal_Int32) 36;
+ rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 36 );
rOStm << pAct->GetDestPoint();
rOStm << pAct->GetDestSize();
rOStm << pAct->GetSrcPoint();
@@ -1813,8 +1813,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaBmpExAction* pAct = (MetaBmpExAction*) pAction;
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
- rOStm << (sal_Int16) GDI_BITMAP_ACTION;
- rOStm << (sal_Int32) 12;
+ rOStm.WriteInt16( (sal_Int16) GDI_BITMAP_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 12 );
rOStm << pAct->GetPoint();
WriteDIB(aBmp, rOStm, false, true);
nCount++;
@@ -1826,8 +1826,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaBmpExScaleAction* pAct = (MetaBmpExScaleAction*) pAction;
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
- rOStm << (sal_Int16) GDI_BITMAPSCALE_ACTION;
- rOStm << (sal_Int32) 20;
+ rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 20 );
rOStm << pAct->GetPoint();
rOStm << pAct->GetSize();
WriteDIB(aBmp, rOStm, false, true);
@@ -1840,8 +1840,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaBmpExScalePartAction* pAct = (MetaBmpExScalePartAction*) pAction;
const Bitmap aBmp( Graphic( pAct->GetBitmapEx() ).GetBitmap() );
- rOStm << (sal_Int16) GDI_BITMAPSCALEPART_ACTION;
- rOStm << (sal_Int32) 36;
+ rOStm.WriteInt16( (sal_Int16) GDI_BITMAPSCALEPART_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 36 );
rOStm << pAct->GetDestPoint();
rOStm << pAct->GetDestSize();
rOStm << pAct->GetSrcPoint();
@@ -1856,18 +1856,18 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
MetaGradientAction* pAct = (MetaGradientAction*) pAction;
const Gradient& rGrad = pAct->GetGradient();
- rOStm << (sal_Int16) GDI_GRADIENT_ACTION;
- rOStm << (sal_Int32) 46;
+ rOStm.WriteInt16( (sal_Int16) GDI_GRADIENT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 46 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm << (sal_Int16) rGrad.GetStyle();
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetStyle() );
ImplWriteColor( rOStm, rGrad.GetStartColor() );
ImplWriteColor( rOStm, rGrad.GetEndColor() );
- rOStm << (sal_Int16) rGrad.GetAngle();
- rOStm << (sal_Int16) rGrad.GetBorder();
- rOStm << (sal_Int16) rGrad.GetOfsX();
- rOStm << (sal_Int16) rGrad.GetOfsY();
- rOStm << (sal_Int16) rGrad.GetStartIntensity();
- rOStm << (sal_Int16) rGrad.GetEndIntensity();
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetAngle() );
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetBorder() );
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetOfsX() );
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetOfsY() );
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetStartIntensity() );
+ rOStm.WriteInt16( (sal_Int16) rGrad.GetEndIntensity() );
nCount++;
}
break;
@@ -1878,7 +1878,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write RefPoint comment
- rOStm << (sal_Int16) GDI_GRADIENTEX_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_GRADIENTEX_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
@@ -1886,12 +1886,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write data
rOStm << pA->GetPolyPolygon() << pA->GetGradient();
- rOStm << (sal_Int32) 0; // number of actions that follow this comment
+ rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -1907,11 +1907,11 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
ImplWriteLineColor( rOStm, rColor, 1 );
ImplWriteFillColor( rOStm, rColor, 1 );
- rOStm << (sal_Int16) GDI_RECT_ACTION;
- rOStm << (sal_Int32) 28;
+ rOStm.WriteInt16( (sal_Int16) GDI_RECT_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 28 );
ImplWriteRect( rOStm, pAct->GetRect() );
- rOStm << (sal_Int32) 0;
- rOStm << (sal_Int32) 0;
+ rOStm.WriteInt32( (sal_Int32) 0 );
+ rOStm.WriteInt32( (sal_Int32) 0 );
ImplWritePopAction( rOStm );
nCount += 5;
@@ -1924,18 +1924,18 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
const Region& rRegion = pAct->GetRegion();
Rectangle aClipRect;
- rOStm << (sal_Int16) GDI_CLIPREGION_ACTION;
- rOStm << (sal_Int32) 24;
+ rOStm.WriteInt16( (sal_Int16) GDI_CLIPREGION_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 24 );
if( pAct->IsClipping() )
{
aClipRect = rRegion.GetBoundRect();
- rOStm << (sal_Int16) 1;
+ rOStm.WriteInt16( (sal_Int16) 1 );
}
else
- rOStm << (sal_Int16) 0;
+ rOStm.WriteInt16( (sal_Int16) 0 );
- rOStm << (sal_Int16) 0;
+ rOStm.WriteInt16( (sal_Int16) 0 );
ImplWriteRect( rOStm, aClipRect );
if( pAct->IsClipping() )
@@ -1949,8 +1949,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction;
- rOStm << (sal_Int16) GDI_ISECTCLIPREGION_ACTION;
- rOStm << (sal_Int32) 20;
+ rOStm.WriteInt16( (sal_Int16) GDI_ISECTCLIPREGION_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 20 );
rOStm << pAct->GetRect();
nCount++;
}
@@ -1960,10 +1960,10 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction;
- rOStm << (sal_Int16) GDI_MOVECLIPREGION_ACTION;
- rOStm << (sal_Int32) 12;
- rOStm << (sal_Int32) pAct->GetHorzMove();
- rOStm << (sal_Int32) pAct->GetVertMove();
+ rOStm.WriteInt16( (sal_Int16) GDI_MOVECLIPREGION_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 12 );
+ rOStm.WriteInt32( (sal_Int32) pAct->GetHorzMove() );
+ rOStm.WriteInt32( (sal_Int32) pAct->GetVertMove() );
nCount++;
}
break;
@@ -2034,8 +2034,8 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaMapModeAction* pAct = (MetaMapModeAction*) pAction;
- rOStm << (sal_Int16) GDI_MAPMODE_ACTION;
- rOStm << (sal_Int32) 30;
+ rOStm.WriteInt16( (sal_Int16) GDI_MAPMODE_ACTION );
+ rOStm.WriteInt32( (sal_Int32) 30 );
ImplWriteMapMode( rOStm, pAct->GetMapMode() );
nCount++;
}
@@ -2133,7 +2133,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write transparence comment
- rOStm << (sal_Int16) GDI_TRANSPARENT_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_TRANSPARENT_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
@@ -2141,13 +2141,13 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write comment data
rOStm << rPolyPoly;
- rOStm << nTrans;
- rOStm << (sal_Int32) 15; // number of actions that follow this comment
+ rOStm.WriteInt16( nTrans );
+ rOStm.WriteInt32( (sal_Int32) 15 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
{
@@ -2194,7 +2194,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write RefPoint comment
- rOStm << (sal_Int16) GDI_FLOATTRANSPARENT_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_FLOATTRANSPARENT_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
@@ -2206,7 +2206,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos + 4 );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos + 4 ) );
rOStm.Seek( ( nOldPos = nNewPos ) + 4 );
{
@@ -2233,7 +2233,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
nAddCount = ImplWriteActions( rOStm, aMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet );
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) nAddCount;
+ rOStm.WriteInt32( (sal_Int32) nAddCount );
rOStm.Seek( nNewPos );
nCount += nAddCount;
@@ -2251,7 +2251,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos, nAddCount;
// write hatch comment
- rOStm << (sal_Int16) GDI_HATCH_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_HATCH_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
@@ -2264,7 +2264,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos + 4 );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos + 4 ) );
rOStm.Seek( ( nOldPos = nNewPos ) + 4 );
{
@@ -2276,7 +2276,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
nAddCount = ImplWriteActions( rOStm, aTmpMtf, rSaveVDev, rRop_0_1, rLineCol, rLineColStack, rActualCharSet );
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) nAddCount;
+ rOStm.WriteInt32( (sal_Int32) nAddCount );
rOStm.Seek( nNewPos );
nCount += nAddCount;
@@ -2294,20 +2294,21 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write RefPoint comment
- rOStm << (sal_Int16) GDI_REFPOINT_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_REFPOINT_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
rOStm.SeekRel( 4 );
// write data
- rOStm << rRefPoint << bSet;
- rOStm << (sal_Int32) 0; // number of actions that follow this comment
+ rOStm << rRefPoint;
+ rOStm.WriteUChar( bSet );
+ rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -2322,20 +2323,21 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write RefPoint comment
- rOStm << (sal_Int16) GDI_TEXTLINECOLOR_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_TEXTLINECOLOR_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
rOStm.SeekRel( 4 );
// write data
- rOStm << rColor << bSet;
- rOStm << (sal_Int32) 0; // number of actions that follow this comment
+ rOStm << rColor;
+ rOStm.WriteUChar( bSet );
+ rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -2352,22 +2354,21 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write RefPoint comment
- rOStm << (sal_Int16) GDI_TEXTLINE_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_TEXTLINE_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
rOStm.SeekRel( 4 );
// write data
- rOStm << rStartPt << nWidth <<
- static_cast<sal_uInt32>(eStrikeout) <<
- static_cast<sal_uInt32>(eUnderline);
- rOStm << (sal_Int32) 0; // number of actions that follow this comment
+ rOStm << rStartPt;
+ rOStm.WriteInt32( nWidth ).WriteUInt32( static_cast<sal_uInt32>(eStrikeout) ).WriteUInt32( static_cast<sal_uInt32>(eUnderline) );
+ rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
@@ -2384,7 +2385,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
sal_uLong nOldPos, nNewPos;
// write RefPoint comment
- rOStm << (sal_Int16) GDI_COMMENT_COMMENT;
+ rOStm.WriteInt16( (sal_Int16) GDI_COMMENT_COMMENT );
// we'll write the ActionSize later
nOldPos = rOStm.Tell();
@@ -2392,17 +2393,17 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
// write data
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, pA->GetComment());
- rOStm << pA->GetValue() << nDataSize;
+ rOStm.WriteInt32( pA->GetValue() ).WriteUInt32( nDataSize );
if( nDataSize )
rOStm.Write( pA->GetData(), nDataSize );
- rOStm << (sal_Int32) 0; // number of actions that follow this comment
+ rOStm.WriteInt32( (sal_Int32) 0 ); // number of actions that follow this comment
// calculate and write ActionSize of comment
nNewPos = rOStm.Tell();
rOStm.Seek( nOldPos );
- rOStm << (sal_Int32) ( nNewPos - nOldPos );
+ rOStm.WriteInt32( (sal_Int32) ( nNewPos - nOldPos ) );
rOStm.Seek( nNewPos );
nCount++;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 85d0d9b7acbe..e7cfd64fbd8d 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -933,8 +933,8 @@ bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, bool bRLE4 )
rOStm.Write( pBuf, nBufCount );
}
- rOStm << (sal_uInt8) 0;
- rOStm << (sal_uInt8) 1;
+ rOStm.WriteUChar( (sal_uInt8) 0 );
+ rOStm.WriteUChar( (sal_uInt8) 1 );
delete[] pBuf;
@@ -1208,49 +1208,49 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess&
aHeader.nColsUsed = ((!pAccAlpha && aHeader.nBitCount <= 8) ? rAcc.GetPaletteEntryCount() : 0);
aHeader.nColsImportant = 0;
- rOStm << aHeader.nSize;
- rOStm << aHeader.nWidth;
- rOStm << aHeader.nHeight;
- rOStm << aHeader.nPlanes;
- rOStm << aHeader.nBitCount;
- rOStm << aHeader.nCompression;
+ rOStm.WriteUInt32( aHeader.nSize );
+ rOStm.WriteInt32( aHeader.nWidth );
+ rOStm.WriteInt32( aHeader.nHeight );
+ rOStm.WriteUInt16( aHeader.nPlanes );
+ rOStm.WriteUInt16( aHeader.nBitCount );
+ rOStm.WriteUInt32( aHeader.nCompression );
nImageSizePos = rOStm.Tell();
rOStm.SeekRel( sizeof( aHeader.nSizeImage ) );
- rOStm << aHeader.nXPelsPerMeter;
- rOStm << aHeader.nYPelsPerMeter;
- rOStm << aHeader.nColsUsed;
- rOStm << aHeader.nColsImportant;
+ rOStm.WriteInt32( aHeader.nXPelsPerMeter );
+ rOStm.WriteInt32( aHeader.nYPelsPerMeter );
+ rOStm.WriteUInt32( aHeader.nColsUsed );
+ rOStm.WriteUInt32( aHeader.nColsImportant );
if(pAccAlpha) // only write DIBV5 when asked to do so
{
aHeader.nV5CSType = 0x57696E20; // LCS_WINDOWS_COLOR_SPACE
aHeader.nV5Intent = 0x00000004; // LCS_GM_IMAGES
- rOStm << aHeader.nV5RedMask;
- rOStm << aHeader.nV5GreenMask;
- rOStm << aHeader.nV5BlueMask;
- rOStm << aHeader.nV5AlphaMask;
- rOStm << aHeader.nV5CSType;
-
- rOStm << aHeader.aV5Endpoints.aXyzRed.aXyzX;
- rOStm << aHeader.aV5Endpoints.aXyzRed.aXyzY;
- rOStm << aHeader.aV5Endpoints.aXyzRed.aXyzZ;
- rOStm << aHeader.aV5Endpoints.aXyzGreen.aXyzX;
- rOStm << aHeader.aV5Endpoints.aXyzGreen.aXyzY;
- rOStm << aHeader.aV5Endpoints.aXyzGreen.aXyzZ;
- rOStm << aHeader.aV5Endpoints.aXyzBlue.aXyzX;
- rOStm << aHeader.aV5Endpoints.aXyzBlue.aXyzY;
- rOStm << aHeader.aV5Endpoints.aXyzBlue.aXyzZ;
-
- rOStm << aHeader.nV5GammaRed;
- rOStm << aHeader.nV5GammaGreen;
- rOStm << aHeader.nV5GammaBlue;
- rOStm << aHeader.nV5Intent;
- rOStm << aHeader.nV5ProfileData;
- rOStm << aHeader.nV5ProfileSize;
- rOStm << aHeader.nV5Reserved;
+ rOStm.WriteUInt32( aHeader.nV5RedMask );
+ rOStm.WriteUInt32( aHeader.nV5GreenMask );
+ rOStm.WriteUInt32( aHeader.nV5BlueMask );
+ rOStm.WriteUInt32( aHeader.nV5AlphaMask );
+ rOStm.WriteUInt32( aHeader.nV5CSType );
+
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzRed.aXyzX );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzRed.aXyzY );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzRed.aXyzZ );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzGreen.aXyzX );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzGreen.aXyzY );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzGreen.aXyzZ );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzBlue.aXyzX );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzBlue.aXyzY );
+ rOStm.WriteInt32( aHeader.aV5Endpoints.aXyzBlue.aXyzZ );
+
+ rOStm.WriteUInt32( aHeader.nV5GammaRed );
+ rOStm.WriteUInt32( aHeader.nV5GammaGreen );
+ rOStm.WriteUInt32( aHeader.nV5GammaBlue );
+ rOStm.WriteUInt32( aHeader.nV5Intent );
+ rOStm.WriteUInt32( aHeader.nV5ProfileData );
+ rOStm.WriteUInt32( aHeader.nV5ProfileSize );
+ rOStm.WriteUInt32( aHeader.nV5Reserved );
}
if(ZCOMPRESS == aHeader.nCompression)
@@ -1286,7 +1286,7 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess&
nLastPos = rOStm.Tell();
nCodedSize = nLastPos - nCodedPos - 12;
rOStm.Seek(nCodedPos);
- rOStm << nCodedSize << nUncodedSize << nCompression;
+ rOStm.WriteUInt32( nCodedSize ).WriteUInt32( nUncodedSize ).WriteUInt32( nCompression );
rOStm.Seek(nLastPos);
if(bRet)
@@ -1306,7 +1306,7 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess&
nEndPos = rOStm.Tell();
rOStm.Seek(nImageSizePos);
- rOStm << aHeader.nSizeImage;
+ rOStm.WriteUInt32( aHeader.nSizeImage );
rOStm.Seek(nEndPos);
return bRet;
@@ -1317,11 +1317,11 @@ bool ImplWriteDIBFileHeader(SvStream& rOStm, BitmapReadAccess& rAcc, bool bUseDI
const sal_uInt32 nPalCount((rAcc.HasPalette() ? rAcc.GetPaletteEntryCount() : isBitfieldCompression(rAcc.GetScanlineFormat()) ? 3UL : 0UL));
const sal_uInt32 nOffset(14 + (bUseDIBV5 ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE) + nPalCount * 4UL);
- rOStm << (sal_uInt16)0x4D42; // 'MB' from BITMAPFILEHEADER
- rOStm << (sal_uInt32)(nOffset + (rAcc.Height() * rAcc.GetScanlineSize()));
- rOStm << (sal_uInt16)0;
- rOStm << (sal_uInt16)0;
- rOStm << nOffset;
+ rOStm.WriteUInt16( (sal_uInt16)0x4D42 ); // 'MB' from BITMAPFILEHEADER
+ rOStm.WriteUInt32( (sal_uInt32)(nOffset + (rAcc.Height() * rAcc.GetScanlineSize())) );
+ rOStm.WriteUInt16( (sal_uInt16)0 );
+ rOStm.WriteUInt16( (sal_uInt16)0 );
+ rOStm.WriteUInt32( nOffset );
return( rOStm.GetError() == 0UL );
}
@@ -1550,9 +1550,9 @@ bool WriteDIBBitmapEx(
{
if(ImplWriteDIB(rSource.GetBitmap(), 0, rOStm, true, true))
{
- rOStm << (sal_uInt32)0x25091962;
- rOStm << (sal_uInt32)0xACB20201;
- rOStm << (sal_uInt8)rSource.eTransparent;
+ rOStm.WriteUInt32( (sal_uInt32)0x25091962 );
+ rOStm.WriteUInt32( (sal_uInt32)0xACB20201 );
+ rOStm.WriteUChar( (sal_uInt8)rSource.eTransparent );
if(TRANSPARENT_BITMAP == rSource.eTransparent)
{
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 9d0cee1650aa..492141d02b62 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -713,31 +713,31 @@ SvStream& operator<<( SvStream& rOStm, const Impl_Font& rImpl_Font )
rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() );
rOStm << rImpl_Font.maSize;
- rOStm << (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet );
- rOStm << (sal_uInt16) rImpl_Font.meFamily;
- rOStm << (sal_uInt16) rImpl_Font.mePitch;
- rOStm << (sal_uInt16) rImpl_Font.meWeight;
- rOStm << (sal_uInt16) rImpl_Font.meUnderline;
- rOStm << (sal_uInt16) rImpl_Font.meStrikeout;
- rOStm << (sal_uInt16) rImpl_Font.meItalic;
- rOStm << (sal_uInt16) rImpl_Font.maLanguageTag.getLanguageType( false);
- rOStm << (sal_uInt16) rImpl_Font.meWidthType;
-
- rOStm << rImpl_Font.mnOrientation;
-
- rOStm << (sal_Bool) rImpl_Font.mbWordLine;
- rOStm << (sal_Bool) rImpl_Font.mbOutline;
- rOStm << (sal_Bool) rImpl_Font.mbShadow;
- rOStm << (sal_uInt8) rImpl_Font.mnKerning;
+ rOStm.WriteUInt16( (sal_uInt16) GetStoreCharSet( rImpl_Font.meCharSet ) );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meFamily );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.mePitch );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meWeight );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meUnderline );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meStrikeout );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meItalic );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maLanguageTag.getLanguageType( false) );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meWidthType );
+
+ rOStm.WriteInt16( rImpl_Font.mnOrientation );
+
+ rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbWordLine );
+ rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbOutline );
+ rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbShadow );
+ rOStm.WriteUChar( (sal_uInt8) rImpl_Font.mnKerning );
// new in version 2
- rOStm << (sal_uInt8) rImpl_Font.meRelief;
- rOStm << (sal_uInt16) rImpl_Font.maCJKLanguageTag.getLanguageType( false);
- rOStm << (sal_Bool) rImpl_Font.mbVertical;
- rOStm << (sal_uInt16) rImpl_Font.meEmphasisMark;
+ rOStm.WriteUChar( (sal_uInt8) rImpl_Font.meRelief );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maCJKLanguageTag.getLanguageType( false) );
+ rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbVertical );
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meEmphasisMark );
// new in version 3
- rOStm << (sal_uInt16) rImpl_Font.meOverline;
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meOverline );
return rOStm;
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 2e7417260c2f..6abda832bc90 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2847,10 +2847,10 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm )
pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
- rOStm << nStmCompressMode;
+ rOStm.WriteUInt32( nStmCompressMode );
rOStm << aPrefMapMode;
rOStm << aPrefSize;
- rOStm << (sal_uInt32) GetActionSize();
+ rOStm.WriteUInt32( (sal_uInt32) GetActionSize() );
delete pCompat;
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 4dc576faa2b2..2bef53d0b3ba 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -274,7 +274,7 @@ SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink )
VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 );
// Version 1
- rOStream << (sal_uInt16) rGfxLink.GetType() << rGfxLink.GetDataSize() << rGfxLink.GetUserId();
+ rOStream.WriteUInt16( (sal_uInt16) rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() );
// Version 2
rOStream << rGfxLink.GetPrefSize() << rGfxLink.GetPrefMapMode();
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 3d123bd4e1a1..9ad19b034010 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -310,16 +310,15 @@ SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImpl_Gradient )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
- rOStm << (sal_uInt16) rImpl_Gradient.meStyle <<
- rImpl_Gradient.maStartColor <<
- rImpl_Gradient.maEndColor <<
- rImpl_Gradient.mnAngle <<
- rImpl_Gradient.mnBorder <<
- rImpl_Gradient.mnOfsX <<
- rImpl_Gradient.mnOfsY <<
- rImpl_Gradient.mnIntensityStart <<
- rImpl_Gradient.mnIntensityEnd <<
- rImpl_Gradient.mnStepCount;
+ rOStm.WriteUInt16( (sal_uInt16) rImpl_Gradient.meStyle );
+ rOStm << rImpl_Gradient.maStartColor << rImpl_Gradient.maEndColor;
+ rOStm.WriteUInt16( rImpl_Gradient.mnAngle )
+ .WriteUInt16( rImpl_Gradient.mnBorder )
+ .WriteUInt16( rImpl_Gradient.mnOfsX )
+ .WriteUInt16( rImpl_Gradient.mnOfsY )
+ .WriteUInt16( rImpl_Gradient.mnIntensityStart )
+ .WriteUInt16( rImpl_Gradient.mnIntensityEnd )
+ .WriteUInt16( rImpl_Gradient.mnStepCount );
return rOStm;
}
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 1a0190a4e91b..37c323c17591 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -142,18 +142,18 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass )
rClass.maPath.Write( rOStm );
rClass.maStartArrow.Write( rOStm );
rClass.maEndArrow.Write( rOStm );
- rOStm << rClass.mfTransparency;
- rOStm << rClass.mfStrokeWidth;
+ rOStm.WriteDouble( rClass.mfTransparency );
+ rOStm.WriteDouble( rClass.mfStrokeWidth );
sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maCapType );
- rOStm << nTmp;
+ rOStm.WriteUInt16( nTmp );
nTmp = sal::static_int_cast<sal_uInt16>( rClass.maJoinType );
- rOStm << nTmp;
- rOStm << rClass.mfMiterLimit;
+ rOStm.WriteUInt16( nTmp );
+ rOStm.WriteDouble( rClass.mfMiterLimit );
- rOStm << static_cast<sal_uInt32>(rClass.maDashArray.size());
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(rClass.maDashArray.size()) );
size_t i;
for(i=0; i<rClass.maDashArray.size(); ++i)
- rOStm << rClass.maDashArray[i];
+ rOStm.WriteDouble( rClass.maDashArray[i] );
return rOStm;
}
@@ -293,24 +293,24 @@ SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass )
rClass.maPath.Write( rOStm );
rOStm << rClass.maFillColor;
- rOStm << rClass.mfTransparency;
+ rOStm.WriteDouble( rClass.mfTransparency );
sal_uInt16 nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillRule );
- rOStm << nTmp;
+ rOStm.WriteUInt16( nTmp );
nTmp = sal::static_int_cast<sal_uInt16>( rClass.maFillType );
- rOStm << nTmp;
+ rOStm.WriteUInt16( nTmp );
int i;
for(i=0; i<SvtGraphicFill::Transform::MatrixSize; ++i)
- rOStm << rClass.maFillTransform.matrix[i];
+ rOStm.WriteDouble( rClass.maFillTransform.matrix[i] );
nTmp = rClass.mbTiling;
- rOStm << nTmp;
+ rOStm.WriteUInt16( nTmp );
nTmp = sal::static_int_cast<sal_uInt16>( rClass.maHatchType );
- rOStm << nTmp;
+ rOStm.WriteUInt16( nTmp );
rOStm << rClass.maHatchColor;
nTmp = sal::static_int_cast<sal_uInt16>( rClass.maGradientType );
- rOStm << nTmp;
+ rOStm.WriteUInt16( nTmp );
rOStm << rClass.maGradient1stColor;
rOStm << rClass.maGradient2ndColor;
- rOStm << rClass.maGradientStepCount;
+ rOStm.WriteInt32( rClass.maGradientStepCount );
rOStm << rClass.maFillGraphic;
return rOStm;
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index cf01b037d77d..d1867ce18600 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -137,9 +137,9 @@ SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
- rOStm << (sal_uInt16) rImplHatch.meStyle << rImplHatch.maColor;
+ rOStm.WriteUInt16( (sal_uInt16) rImplHatch.meStyle ) << rImplHatch.maColor;
//#fdo39428 SvStream no longer supports operator<<(long)
- rOStm << sal::static_int_cast<sal_Int32>(rImplHatch.mnDistance) << rImplHatch.mnAngle;
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rImplHatch.mnDistance) ).WriteUInt16( rImplHatch.mnAngle );
return rOStm;
}
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 5a3e3c0811af..96c12e2e7c6d 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -321,7 +321,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
{
sal_uInt16 nLen = 0;
if ( !rJobSetup.mpData )
- rOStream << nLen;
+ rOStream.WriteUInt16( nLen );
else
{
sal_uInt16 nSystem = JOBSET_FILE605_SYSTEM;
@@ -346,8 +346,8 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
strncpy( aOldData.cDriverName, aDriverByteName.getStr(), 31 );
// nLen = sizeof( aOldData ) + 4 + nOldJobDataSize + pJobData->mnDriverDataLen;
int nPos = rOStream.Tell();
- rOStream << nLen;
- rOStream << nSystem;
+ rOStream.WriteUInt16( nLen );
+ rOStream.WriteUInt16( nSystem );
rOStream.Write( (char*)&aOldData, sizeof( aOldData ) );
rOStream.Write( (char*)&aOldJobData, nOldJobDataSize );
rOStream.Write( (char*)pJobData->mpDriverData, pJobData->mnDriverDataLen );
@@ -375,7 +375,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
}
nLen = sal::static_int_cast<sal_uInt16>(rOStream.Tell() - nPos);
rOStream.Seek( nPos );
- rOStream << nLen;
+ rOStream.WriteUInt16( nLen );
rOStream.Seek( nPos + nLen );
}
}
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index b0003268dae0..b7dc0f746feb 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -274,18 +274,18 @@ SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo )
//#fdo39428 SvStream no longer supports operator<<(long)
// version 1
- rOStm << (sal_uInt16) rImplLineInfo.meStyle << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnWidth);
+ rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meStyle ).WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnWidth) );
// since version2
- rOStm << rImplLineInfo.mnDashCount << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDashLen);
- rOStm << rImplLineInfo.mnDotCount << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDotLen);
- rOStm << sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDistance);
+ rOStm.WriteUInt16( rImplLineInfo.mnDashCount ).WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDashLen) );
+ rOStm.WriteUInt16( rImplLineInfo.mnDotCount ).WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDotLen) );
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(rImplLineInfo.mnDistance) );
// since version3
- rOStm << (sal_uInt16) rImplLineInfo.meLineJoin;
+ rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meLineJoin );
// since version4
- rOStm << (sal_uInt16) rImplLineInfo.meLineCap;
+ rOStm.WriteUInt16( (sal_uInt16) rImplLineInfo.meLineCap );
return rOStm;
}
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index 86302b527a65..8c1a53c914dc 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -59,11 +59,11 @@ SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rImplMapMode )
{
VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
- rOStm << (sal_uInt16) rImplMapMode.meUnit <<
+ rOStm.WriteUInt16( (sal_uInt16) rImplMapMode.meUnit ) <<
rImplMapMode.maOrigin <<
rImplMapMode.maScaleX <<
- rImplMapMode.maScaleY <<
- rImplMapMode.mbSimple;
+ rImplMapMode.maScaleY;
+ rOStm.WriteUChar( rImplMapMode.mbSimple );
return rOStm;
}
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 5c23c6aa70d3..6b5fe5316b14 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -140,7 +140,7 @@ sal_Bool MetaAction::Compare( const MetaAction& ) const
void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* )
{
- rOStm << mnType;
+ rOStm.WriteUInt16( mnType );
}
// ------------------------------------------------------------------------
@@ -588,7 +588,8 @@ sal_Bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const
void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << maRect << mnHorzRound << mnVertRound;
+ rOStm << maRect;
+ rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound );
}
// ------------------------------------------------------------------------
@@ -967,7 +968,7 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm << maLineInfo; // Version 2
sal_uInt8 bHasPolyFlags = maPoly.HasFlags(); // Version 3
- rOStm << bHasPolyFlags;
+ rOStm.WriteUChar( bHasPolyFlags );
if ( bHasPolyFlags )
maPoly.Write( rOStm );
}
@@ -1053,7 +1054,7 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm << aSimplePoly;
sal_uInt8 bHasPolyFlags = maPoly.HasFlags(); // Version 2
- rOStm << bHasPolyFlags;
+ rOStm.WriteUChar( bHasPolyFlags );
if ( bHasPolyFlags )
maPoly.Write( rOStm );
}
@@ -1135,7 +1136,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
sal_uInt16 i, nPolyCount = maPolyPoly.Count();
Polygon aSimplePoly; // Version 1
- rOStm << nPolyCount;
+ rOStm.WriteUInt16( nPolyCount );
for ( i = 0; i < nPolyCount; i++ )
{
const Polygon& rPoly = maPolyPoly.GetObject( i );
@@ -1145,13 +1146,13 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
rOStm << aSimplePoly;
}
- rOStm << nNumberOfComplexPolygons; // Version 2
+ rOStm.WriteUInt16( nNumberOfComplexPolygons ); // Version 2
for ( i = 0; nNumberOfComplexPolygons && ( i < nPolyCount ); i++ )
{
const Polygon& rPoly = maPolyPoly.GetObject( i );
if ( rPoly.HasFlags() )
{
- rOStm << i;
+ rOStm.WriteUInt16( i );
rPoly.Write( rOStm );
nNumberOfComplexPolygons--;
@@ -1243,8 +1244,8 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
WRITE_BASE_COMPAT( rOStm, 2, pData );
rOStm << maPt;
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
- rOStm << mnIndex;
- rOStm << mnLen;
+ rOStm .WriteUInt16( mnIndex );
+ rOStm .WriteUInt16( mnLen );
write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
@@ -1380,12 +1381,12 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
WRITE_BASE_COMPAT( rOStm, 2, pData );
rOStm << maStartPt;
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
- rOStm << mnIndex;
- rOStm << mnLen;
- rOStm << nAryLen;
+ rOStm .WriteUInt16( mnIndex );
+ rOStm .WriteUInt16( mnLen );
+ rOStm .WriteUInt32( nAryLen );
for( sal_uLong i = 0UL; i < nAryLen; i++ )
- rOStm << mpDXAry[ i ];
+ rOStm.WriteInt32( mpDXAry[ i ] );
write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
@@ -1517,9 +1518,9 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
WRITE_BASE_COMPAT( rOStm, 2, pData );
rOStm << maPt;
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
- rOStm << mnWidth;
- rOStm << mnIndex;
- rOStm << mnLen;
+ rOStm .WriteUInt32( mnWidth );
+ rOStm .WriteUInt16( mnIndex );
+ rOStm .WriteUInt16( mnLen );
write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
@@ -1600,7 +1601,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
WRITE_BASE_COMPAT( rOStm, 2, pData );
rOStm << maRect;
rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
- rOStm << mnStyle;
+ rOStm .WriteUInt16( mnStyle );
write_lenPrefixed_uInt16s_FromOUString<sal_uInt16>(rOStm, maStr); // version 2
}
@@ -1687,11 +1688,11 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
//#fdo39428 SvStream no longer supports operator<<(long)
rOStm << maPos;
- rOStm << sal::static_int_cast<sal_Int32>(mnWidth);
- rOStm << static_cast<sal_uInt32>(meStrikeout);
- rOStm << static_cast<sal_uInt32>(meUnderline);
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnWidth) );
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(meStrikeout) );
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(meUnderline) );
// new in version 2
- rOStm << static_cast<sal_uInt32>(meOverline);
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) );
}
// ------------------------------------------------------------------------
@@ -2782,7 +2783,8 @@ sal_Bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const
void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << maRegion << mbClip;
+ rOStm << maRegion;
+ rOStm.WriteUChar( mbClip );
}
// ------------------------------------------------------------------------
@@ -2974,7 +2976,7 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
//#fdo39428 SvStream no longer supports operator<<(long)
- rOStm << sal::static_int_cast<sal_Int32>(mnHorzMove) << sal::static_int_cast<sal_Int32>(mnVertMove);
+ rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnHorzMove) ).WriteInt32( sal::static_int_cast<sal_Int32>(mnVertMove) );
}
// ------------------------------------------------------------------------
@@ -3035,7 +3037,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
maColor.Write( rOStm, sal_True );
- rOStm << mbSet;
+ rOStm.WriteUChar( mbSet );
}
// ------------------------------------------------------------------------
@@ -3093,7 +3095,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
maColor.Write( rOStm, sal_True );
- rOStm << mbSet;
+ rOStm.WriteUChar( mbSet );
}
// ------------------------------------------------------------------------
@@ -3202,7 +3204,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
maColor.Write( rOStm, sal_True );
- rOStm << mbSet;
+ rOStm.WriteUChar( mbSet );
}
// ------------------------------------------------------------------------
@@ -3260,7 +3262,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
maColor.Write( rOStm, sal_True );
- rOStm << mbSet;
+ rOStm.WriteUChar( mbSet );
}
// ------------------------------------------------------------------------
@@ -3318,7 +3320,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
maColor.Write( rOStm, sal_True );
- rOStm << mbSet;
+ rOStm.WriteUChar( mbSet );
}
// ------------------------------------------------------------------------
@@ -3370,7 +3372,7 @@ sal_Bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const
void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << (sal_uInt16) maAlign;
+ rOStm.WriteUInt16( (sal_uInt16) maAlign );
}
// ------------------------------------------------------------------------
@@ -3560,7 +3562,7 @@ sal_Bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const
void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << mnFlags;
+ rOStm.WriteUInt16( mnFlags );
}
// ------------------------------------------------------------------------
@@ -3645,7 +3647,7 @@ sal_Bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const
void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << (sal_uInt16) meRasterOp;
+ rOStm.WriteUInt16( (sal_uInt16) meRasterOp );
}
// ------------------------------------------------------------------------
@@ -3729,7 +3731,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
maPolyPoly.AdaptiveSubdivide(aNoCurvePolyPolygon);
rOStm << aNoCurvePolyPolygon;
- rOStm << mnTransPercent;
+ rOStm.WriteUInt16( mnTransPercent );
}
// ------------------------------------------------------------------------
@@ -3944,7 +3946,8 @@ sal_Bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const
void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << maRefPoint << mbSet;
+ rOStm << maRefPoint;
+ rOStm.WriteUChar( mbSet );
}
// ------------------------------------------------------------------------
@@ -4135,9 +4138,9 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
m21 *= fYScale;
// prepare new data
- aDest << nLeft << nTop << nRight << nBottom;
- aDest << nPixX << nPixY << nMillX << nMillY;
- aDest << m11 << m12 << m21 << m22 << mdx << mdy;
+ aDest.WriteInt32( nLeft ).WriteInt32( nTop ).WriteInt32( nRight ).WriteInt32( nBottom );
+ aDest.WriteInt32( nPixX ).WriteInt32( nPixY ).WriteInt32( nMillX ).WriteInt32( nMillY );
+ aDest.WriteFloat( m11 ).WriteFloat( m12 ).WriteFloat( m21 ).WriteFloat( m22 ).WriteFloat( mdx ).WriteFloat( mdy );
// save them
ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
@@ -4162,7 +4165,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
write_lenPrefixed_uInt8s_FromOString<sal_uInt16>(rOStm, maComment);
- rOStm << mnValue << mnDataSize;
+ rOStm.WriteInt32( mnValue ).WriteUInt32( mnDataSize );
if ( mnDataSize )
rOStm.Write( mpData, mnDataSize );
@@ -4229,7 +4232,7 @@ sal_Bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const
void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << mnLayoutMode;
+ rOStm.WriteUInt32( mnLayoutMode );
}
// ------------------------------------------------------------------------
@@ -4280,7 +4283,7 @@ sal_Bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const
void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
{
WRITE_BASE_COMPAT( rOStm, 1, pData );
- rOStm << meTextLanguage;
+ rOStm.WriteUInt16( meTextLanguage );
}
// ------------------------------------------------------------------------
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 0b1b00cf6c99..14e92f5a09a1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10065,7 +10065,7 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const
}
SvMemoryStream* pStream = new SvMemoryStream;
- *pStream << rDCTData;
+ pStream->WriteStream( rDCTData );
pStream->Seek( STREAM_SEEK_TO_END );
BitmapID aID;
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index f7c60860c67f..0e8160e02d91 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.cxx
@@ -238,8 +238,8 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm )
/* png signature is always an array of 8 bytes */
sal_uInt16 nOldMode = rOStm.GetNumberFormatInt();
rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
- rOStm << static_cast<sal_uInt32>(0x89504e47);
- rOStm << static_cast<sal_uInt32>(0x0d0a1a0a);
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(0x89504e47) );
+ rOStm.WriteUInt32( static_cast<sal_uInt32>(0x0d0a1a0a) );
std::vector< vcl::PNGWriter::ChunkData >::iterator aBeg( maChunkSeq.begin() );
std::vector< vcl::PNGWriter::ChunkData >::iterator aEnd( maChunkSeq.end() );
@@ -253,11 +253,11 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm )
sal_uInt32 nDataSize = aBeg->aData.size();
if ( nDataSize )
nCRC = rtl_crc32( nCRC, &aBeg->aData[ 0 ], nDataSize );
- rOStm << nDataSize
- << aBeg->nType;
+ rOStm.WriteUInt32( nDataSize )
+ .WriteUInt32( aBeg->nType );
if ( nDataSize )
rOStm.Write( &aBeg->aData[ 0 ], nDataSize );
- rOStm << nCRC;
+ rOStm.WriteUInt32( nCRC );
++aBeg;
}
rOStm.SetNumberFormatInt( nOldMode );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index e2c4aebd1ad9..5ab65becab24 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -257,8 +257,8 @@ SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo )
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8);
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8);
- rOStream << rInfo.mnStatus;
- rOStream << rInfo.mnJobs;
+ rOStream.WriteUInt32( rInfo.mnStatus );
+ rOStream.WriteUInt32( rInfo.mnJobs );
return rOStream;
}
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 3c1fee87e925..e013c1b6bc22 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1623,7 +1623,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
VersionCompat aCompat(rOStrm, STREAM_WRITE, nVersion);
// put version
- rOStrm << nVersion;
+ rOStrm.WriteUInt16( nVersion );
// put type
enum RegionType { REGION_NULL, REGION_EMPTY, REGION_RECTANGLE, REGION_COMPLEX };
@@ -1655,7 +1655,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
aRegionType = REGION_RECTANGLE;
}
- rOStrm << (sal_uInt16)aRegionType;
+ rOStrm.WriteUInt16( (sal_uInt16)aRegionType );
// get RegionBand
const RegionBand* pRegionBand = rRegion.getRegionBand();
@@ -1675,7 +1675,7 @@ SvStream& operator<<( SvStream& rOStrm, const Region& rRegion )
// write polypolygon if available
const sal_Bool bHasPolyPolygon(rRegion.HasPolyPolygonOrB2DPolyPolygon());
- rOStrm << bHasPolyPolygon;
+ rOStrm.WriteUChar( bHasPolyPolygon );
if(bHasPolyPolygon)
{
diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 9e07a12e6fc3..a1366adbadd5 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -269,9 +269,9 @@ void RegionBand::save(SvStream& rOStrm) const
while(pBand)
{
// put boundaries
- rOStrm << (sal_uInt16)STREAMENTRY_BANDHEADER;
- rOStrm << static_cast<sal_Int32>(pBand->mnYTop);
- rOStrm << static_cast<sal_Int32>(pBand->mnYBottom);
+ rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_BANDHEADER );
+ rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYTop) );
+ rOStrm.WriteInt32( static_cast<sal_Int32>(pBand->mnYBottom) );
// put separations of current band
ImplRegionBandSep* pSep = pBand->mpFirstSep;
@@ -279,9 +279,9 @@ void RegionBand::save(SvStream& rOStrm) const
while(pSep)
{
// put separation
- rOStrm << (sal_uInt16)STREAMENTRY_SEPARATION;
- rOStrm << static_cast<sal_Int32>(pSep->mnXLeft);
- rOStrm << static_cast<sal_Int32>(pSep->mnXRight);
+ rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_SEPARATION );
+ rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXLeft) );
+ rOStrm.WriteInt32( static_cast<sal_Int32>(pSep->mnXRight) );
// next separation from current band
pSep = pSep->mpNextSep;
@@ -291,7 +291,7 @@ void RegionBand::save(SvStream& rOStrm) const
}
// put endmarker
- rOStrm << (sal_uInt16)STREAMENTRY_END;
+ rOStrm.WriteUInt16( (sal_uInt16)STREAMENTRY_END );
}
bool RegionBand::isSingleRectangle() const
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 1b006559b9b7..0dad0148f842 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -161,10 +161,11 @@ SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
sal_Bool bDummy = sal_False;
// version 1
- rOStm << rImplWallpaper.maColor << (sal_uInt16) rImplWallpaper.meStyle;
+ rOStm << rImplWallpaper.maColor;
+ rOStm.WriteUInt16( (sal_uInt16) rImplWallpaper.meStyle );
// version 2
- rOStm << bRect << bGrad << bBmp << bDummy << bDummy << bDummy;
+ rOStm.WriteUChar( bRect ).WriteUChar( bGrad ).WriteUChar( bBmp ).WriteUChar( bDummy ).WriteUChar( bDummy ).WriteUChar( bDummy );
if( bRect )
rOStm << *rImplWallpaper.mpRect;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 20:41:41 +0000