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>

1 files changed, 154 insertions, 154 deletions

diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index e48c370d5e19..ff2f3e74e01b 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -282,8 +282,8 @@ void METWriter::WriteClipRect( const Rectangle& rRect )
         METEndPath();
     }
     WillWriteOrder(8);
-    *pMET << (sal_uInt8)0xb4 << (sal_uInt8)6
-          << (sal_uInt8)0x00 << (sal_uInt8)0 << nPathId;
+    pMET->WriteUChar( (sal_uInt8)0xb4 ).WriteUChar( (sal_uInt8)6 )
+         .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0 ).WriteUInt32( nPathId );
 }
 
 void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
@@ -323,7 +323,7 @@ void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
 
 void METWriter::WriteBigEndianShort(sal_uInt16 nWord)
 {
-    *pMET << ((sal_uInt8)(nWord>>8)) << ((sal_uInt8)(nWord&0x00ff));
+    pMET->WriteUChar( (sal_uInt8)(nWord>>8) ).WriteUChar( (sal_uInt8)(nWord&0x00ff) );
 }
 
 
@@ -338,8 +338,8 @@ void METWriter::WritePoint(Point aPt)
 {
     Point aNewPt = pCompDev->LogicToLogic( aPt, aPictureMapMode, aTargetMapMode );
 
-    *pMET << (sal_Int32) ( aNewPt.X() - aPictureRect.Left() )
-          << (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() );
+    pMET->WriteInt32( (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) )
+         .WriteInt32( (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ) );
 }
 
 
@@ -348,7 +348,7 @@ void METWriter::WriteFieldIntroducer(sal_uInt16 nFieldSize, sal_uInt16 nFieldTyp
 {
     nActualFieldStartPos=pMET->Tell();
     WriteBigEndianShort(nFieldSize);
-    *pMET << (sal_uInt8)0xd3 << nFieldType << nFlags << nSegSeqNum;
+    pMET->WriteUChar( (sal_uInt8)0xd3 ).WriteUInt16( nFieldType ).WriteUChar( nFlags ).WriteUInt16( nSegSeqNum );
 }
 
 
@@ -370,7 +370,7 @@ void METWriter::WriteFieldId(sal_uLong nId)
 
     for (i=1; i<=8; i++) {
         nbyte= '0' + (sal_uInt8)((nId >> (32-i*4)) & 0x0f);
-        *pMET << nbyte;
+        pMET->WriteUChar( nbyte );
     }
 }
 
@@ -445,13 +445,13 @@ void METWriter::WriteChrSets()
 
         WriteBigEndianShort(0x0050);
 
-        *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00;
-        *pMET << (sal_uInt8)0xa4 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x01;
-        *pMET << (sal_uInt8)0x01 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
+        pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 );
+        pMET->WriteUChar( (sal_uInt8)0xa4 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x01 );
+        pMET->WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
 
-        *pMET << (sal_uInt8)0x04 << (sal_uInt8)0x24 << (sal_uInt8)0x05 << (sal_uInt8)pCS->nSet;
+        pMET->WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)pCS->nSet );
 
-        *pMET << (sal_uInt8)0x14 << (sal_uInt8)0x1f;
+        pMET->WriteUChar( (sal_uInt8)0x14 ).WriteUChar( (sal_uInt8)0x1f );
         switch (pCS->eWeight)
         {
             case WEIGHT_THIN:       nbyte=1; break;
@@ -465,24 +465,24 @@ void METWriter::WriteChrSets()
             case WEIGHT_BLACK:      nbyte=9; break;
             default:                nbyte=5;
         }
-        *pMET << nbyte;
-        *pMET << (sal_uInt8)0x05;
-        *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
-        *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
-        *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
-        *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x0c;
+        pMET->WriteUChar( nbyte );
+        pMET->WriteUChar( (sal_uInt8)0x05 );
+        pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
+        pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
+        pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
+        pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x0c );
 
-        *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x20 << (sal_uInt8)0x03 << (sal_uInt8)0xd4;
-        *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x52;
+        pMET->WriteUChar( (sal_uInt8)0x06 ).WriteUChar( (sal_uInt8)0x20 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0xd4 );
+        pMET->WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x52 );
 
-        *pMET << (sal_uInt8)0x24 << (sal_uInt8)0x02 << (sal_uInt8)0x08 << (sal_uInt8)0x00;
+        pMET->WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x00 );
         OString n(OUStringToOString(pCS->aName,
             osl_getThreadTextEncoding()));
         for (i=0; i<32; i++)
         {
             if ( i == 0 || c != 0 )
                 c = n[i];
-            *pMET << c;
+            pMET->WriteChar( c );
         }
     }
 }
@@ -500,7 +500,7 @@ void METWriter::WriteColorAttributeTable(sal_uLong nFieldId, BitmapPalette* pPal
 
     //--- The Field 'Color Attribute Table':
     WriteFieldIntroducer(0,BlkColAtrMagic,0,0);
-    *pMET << nBasePartFlags << (sal_uInt8)0x00 << nBasePartLCTID; // 'Base Part'
+    pMET->WriteUChar( nBasePartFlags ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( nBasePartLCTID ); // 'Base Part'
     if (pPalette!=NULL)
     {
         nIndex=0;
@@ -508,18 +508,18 @@ void METWriter::WriteColorAttributeTable(sal_uLong nFieldId, BitmapPalette* pPal
         {
             nNumI=pPalette->GetEntryCount()-nIndex;
             if (nNumI>81) nNumI=81;
-            *pMET << (sal_uInt8)(11+nNumI*3);                   // length of the parameter
-            *pMET << (sal_uInt8)1 << (sal_uInt8)0 << (sal_uInt8)1;        // typ: element list, Reserved, Format: RGB
-            *pMET << (sal_uInt8)0; WriteBigEndianShort(nIndex); // start-Index (3 Bytes)
-            *pMET << (sal_uInt8)8 << (sal_uInt8)8 << (sal_uInt8)8;        // Bits per component R,G,B
-            *pMET << (sal_uInt8)3;                              // number of bytes per entry
+            pMET->WriteUChar( (sal_uInt8)(11+nNumI*3) );                   // length of the parameter
+            pMET->WriteUChar( (sal_uInt8)1 ).WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)1 );        // typ: element list, Reserved, Format: RGB
+            pMET->WriteUChar( (sal_uInt8)0 ); WriteBigEndianShort(nIndex); // start-Index (3 Bytes)
+            pMET->WriteUChar( (sal_uInt8)8 ).WriteUChar( (sal_uInt8)8 ).WriteUChar( (sal_uInt8)8 );        // Bits per component R,G,B
+            pMET->WriteUChar( (sal_uInt8)3 );                              // number of bytes per entry
             for (i=0; i<nNumI; i++)
             {
                 const BitmapColor& rCol = (*pPalette)[ nIndex ];
 
-                *pMET << (sal_uInt8) rCol.GetRed();
-                *pMET << (sal_uInt8) rCol.GetGreen();
-                *pMET << (sal_uInt8) rCol.GetBlue();
+                pMET->WriteUChar( (sal_uInt8) rCol.GetRed() );
+                pMET->WriteUChar( (sal_uInt8) rCol.GetGreen() );
+                pMET->WriteUChar( (sal_uInt8) rCol.GetBlue() );
                 nIndex++;
             }
         }
@@ -527,8 +527,8 @@ void METWriter::WriteColorAttributeTable(sal_uLong nFieldId, BitmapPalette* pPal
     else
     {
         // 'Trible Generating'
-        *pMET << (sal_uInt8)0x0a << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x01 << (sal_uInt8)0x00;
-        *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x08 << (sal_uInt8)0x08 << (sal_uInt8)0x08;
+        pMET->WriteUChar( (sal_uInt8)0x0a ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x00 );
+        pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x08 );
     }
     UpdateFieldSize();
 
@@ -606,9 +606,9 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
         //--- The Field 'Map Color Attribute Table':
         WriteFieldIntroducer(26,MapColAtrMagic,0,0);
         WriteBigEndianShort(0x0012);
-        *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00;
+        pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 );
         WriteFieldId(nActColMapId);
-        *pMET << (sal_uInt8)0x04 << (sal_uInt8)0x24 << (sal_uInt8)0x07 << (sal_uInt8)0x01;
+        pMET->WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x01 );
 
         //--- The Field 'End Object Environment Group':
         WriteFieldIntroducer(16,EndObjEnvMagic,0,0);
@@ -617,7 +617,7 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
 
     //--- The Field 'Image Data Descriptor':
     WriteFieldIntroducer(17,DscImgObjMagic,0,0);
-    *pMET << (sal_uInt8)0x01; // Unit of measure: tens of centimeters
+    pMET->WriteUChar( (sal_uInt8)0x01 ); // Unit of measure: tens of centimeters
     WriteBigEndianShort((sal_uInt16)nResX);
     WriteBigEndianShort((sal_uInt16)nResY);
     WriteBigEndianShort((sal_uInt16)nWidth);
@@ -627,32 +627,32 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
     WriteFieldIntroducer(0,DatImgObjMagic,0,0);
 
     // Begin Segment:
-    *pMET << (sal_uInt8)0x70 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x70 ).WriteUChar( (sal_uInt8)0x00 );
 
     // Begin Image Content:
-    *pMET << (sal_uInt8)0x91 << (sal_uInt8)0x01 << (sal_uInt8)0xff;
+    pMET->WriteUChar( (sal_uInt8)0x91 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0xff );
 
     // Image Size:
-    *pMET << (sal_uInt8)0x94 << (sal_uInt8)0x09 << (sal_uInt8)0x02;
-    *pMET << (sal_uInt16) 0 << (sal_uInt16) 0;
+    pMET->WriteUChar( (sal_uInt8)0x94 ).WriteUChar( (sal_uInt8)0x09 ).WriteUChar( (sal_uInt8)0x02 );
+    pMET->WriteUInt16( (sal_uInt16) 0 ).WriteUInt16( (sal_uInt16) 0 );
     WriteBigEndianShort((sal_uInt16)nHeight);
     WriteBigEndianShort((sal_uInt16)nWidth);
 
     // Image Encoding:
-    *pMET << (sal_uInt8)0x95 << (sal_uInt8)0x02 << (sal_uInt8)0x03 << (sal_uInt8)0x03;
+    pMET->WriteUChar( (sal_uInt8)0x95 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x03 );
 
     // Image IDE-Size:
-    *pMET << (sal_uInt8)0x96 << (sal_uInt8)0x01 << (sal_uInt8)nBitsPerPixel;
+    pMET->WriteUChar( (sal_uInt8)0x96 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)nBitsPerPixel );
 
     if (nBitsPerPixel<=8) {
         // Image LUT-ID
-        *pMET << (sal_uInt8)0x97 << (sal_uInt8)0x01 << (sal_uInt8)0x01;
+        pMET->WriteUChar( (sal_uInt8)0x97 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x01 );
     }
     else {
         // IDE Structure
-        *pMET << (sal_uInt8)0x9b << (sal_uInt8)0x08 << (sal_uInt8)0x00 << (sal_uInt8)0x01;
-        *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x08;
-        *pMET << (sal_uInt8)0x08 << (sal_uInt8)0x08;
+        pMET->WriteUChar( (sal_uInt8)0x9b ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x01 );
+        pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x08 );
+        pMET->WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0x08 );
     }
 
     pBuf=new sal_uInt8[nBytesPerLine];
@@ -689,10 +689,10 @@ void METWriter::WriteImageObject(const Bitmap & rBitmap)
     delete[] pBuf;
 
     // End Image Content:
-    *pMET << (sal_uInt8)0x93 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x93 ).WriteUChar( (sal_uInt8)0x00 );
 
     // End Segment:
-    *pMET << (sal_uInt8)0x71 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x71 ).WriteUChar( (sal_uInt8)0x00 );
 
     // finalize the last field 'Image Picture Data':
     UpdateFieldSize();
@@ -819,9 +819,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //  8         Coordinate types in data
     //       0x04Intel16
     //       0x05Intel32
-    *pMET << (sal_uInt8)0xf7 << (sal_uInt8)0x07 << (sal_uInt8)0xb0 << (sal_uInt8)0x00
-          << (sal_uInt8)0x00 << (sal_uInt8)0x23 << (sal_uInt8)0x01 << (sal_uInt8)0x01
-          << (sal_uInt8)0x05;
+    pMET->WriteUChar( (sal_uInt8)0xf7 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0xb0 ).WriteUChar( (sal_uInt8)0x00 )
+         .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x23 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x01 )
+         .WriteUChar( (sal_uInt8)0x05 );
 
     //  0         0xF6 Set Picture Descriptor
     //  1         Length of following data
@@ -851,14 +851,14 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //       GPS Y bottom, Y top
     //       GPS Z near, Z far
     Size aUnitsPerDecimeter=OutputDevice::LogicToLogic(Size(10,10),MapMode(MAP_CM),aPictureMapMode);
-    *pMET << (sal_uInt8)0xf6 << (sal_uInt8)0x28 << (sal_uInt8)0x40 << (sal_uInt8)0x00
-          << (sal_uInt8)0x05 << (sal_uInt8)0x01
-          << (sal_uInt32)(aUnitsPerDecimeter.Width())
-          << (sal_uInt32)(aUnitsPerDecimeter.Height())
-          << (sal_uInt32)0
-          << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetWidth()
-          << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetHeight()
-          << (sal_uInt32)0 << (sal_uInt32)0;
+    pMET->WriteUChar( (sal_uInt8)0xf6 ).WriteUChar( (sal_uInt8)0x28 ).WriteUChar( (sal_uInt8)0x40 ).WriteUChar( (sal_uInt8)0x00 )
+         .WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)0x01 )
+         .WriteUInt32( (sal_uInt32)(aUnitsPerDecimeter.Width()) )
+         .WriteUInt32( (sal_uInt32)(aUnitsPerDecimeter.Height()) )
+         .WriteUInt32( (sal_uInt32)0 )
+         .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)aPictureRect.GetWidth() )
+         .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)aPictureRect.GetHeight() )
+         .WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -873,9 +873,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //  8         Geometrics
     //       0x04  Intel16
     //       0x05  Intel32
-    *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x07 << (sal_uInt8)0x08 << (sal_uInt8)0xe0
-          << (sal_uInt8)0x00 << (sal_uInt8)0x8f << (sal_uInt8)0x00 << (sal_uInt8)0x05
-          << (sal_uInt8)0x05;
+    pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x08 ).WriteUChar( (sal_uInt8)0xe0 )
+         .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x8f ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x05 )
+         .WriteUChar( (sal_uInt8)0x05 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -883,10 +883,10 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //  3-4       Mask 0xCC0C
     //  5         Names 0x8F
     //  6-n       M11, M12, M21, M22, M41, M42   Matrix elements
-    *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x1c << (sal_uInt8)0x07 << (sal_uInt8)0xcc
-          << (sal_uInt8)0x0c << (sal_uInt8)0x8f
-          << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000
-          << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000;
+    pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x1c ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0xcc )
+         .WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x8f )
+         .WriteUInt32( (sal_uInt32)0x00010000 ).WriteUInt32( (sal_uInt32)0x00000000 ).WriteUInt32( (sal_uInt32)0x00000000 )
+         .WriteUInt32( (sal_uInt32)0x00010000 ).WriteUInt32( (sal_uInt32)0x00000000 ).WriteUInt32( (sal_uInt32)0x00000000 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -955,11 +955,11 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //       (1 byte)        - Character mix
     //       (1 byte)        - Character background mix (G=2 or 4 depending on the Geometrics
     //            parameter of Set Default Parameter Format)
-    *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x10 << (sal_uInt8)0x02 << (sal_uInt8)0x40
-          << (sal_uInt8)0x00 << (sal_uInt8)0x8f
-          << (sal_uInt8)0xaa << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00
-          << (sal_uInt8)0x44 << (sal_uInt8)0x04 << (sal_uInt8)0x00 << (sal_uInt8)0x00
-          << (sal_uInt8)0xa8 << (sal_uInt8)0xaa << (sal_uInt8)0x40 << (sal_uInt8)0x44;
+    pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x10 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x40 )
+         .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x8f )
+         .WriteUChar( (sal_uInt8)0xaa ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 )
+         .WriteUChar( (sal_uInt8)0x44 ).WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 )
+         .WriteUChar( (sal_uInt8)0xa8 ).WriteUChar( (sal_uInt8)0xaa ).WriteUChar( (sal_uInt8)0x40 ).WriteUChar( (sal_uInt8)0x44 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -989,10 +989,10 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //       (1 byte)       - Marker mix
     //       (1 byte)       - Marker background mix (G=2 or 4 depending on the Geometrics
     //            parameter of Set Default Parameter Format)
-    *pMET << (sal_uInt8)0x21 << (sal_uInt8)0x0c << (sal_uInt8)0x03 << (sal_uInt8)0x40
-          << (sal_uInt8)0x00 << (sal_uInt8)0x8f
-          << (sal_uInt8)0x66 << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00
-          << (sal_uInt8)0x66 << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x40 )
+         .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x8f )
+         .WriteUChar( (sal_uInt8)0x66 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 )
+         .WriteUChar( (sal_uInt8)0x66 ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
 
     //  0         0x21 Set Current Defaults
     //  1         Length of following data
@@ -1101,9 +1101,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
     //       4-7     Bit-map handle
     //       8       Lcid
     if (nNumberOfBitmaps>0) {
-        *pMET << (sal_uInt8)0xe7 << (sal_uInt8)0x07 << (sal_uInt8)0x80 << (sal_uInt8)0x00;
+        pMET->WriteUChar( (sal_uInt8)0xe7 ).WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x80 ).WriteUChar( (sal_uInt8)0x00 );
         WriteBigEndianLong(nActBitmapId);
-        *pMET << (sal_uInt8)0xfe;
+        pMET->WriteUChar( (sal_uInt8)0xfe );
     }
 
     UpdateFieldSize();
@@ -1132,14 +1132,14 @@ void METWriter::WillWriteOrder(sal_uLong nNextOrderMaximumLength)
 void METWriter::METBitBlt(Point aPt, Size aSize, const Size& rBmpSizePixel)
 {
     WillWriteOrder(46);
-    *pMET << (sal_uInt8)0xd6 << (sal_uInt8)44 << (sal_uInt16)0 << (sal_uInt16) 0x00cc;
+    pMET->WriteUChar( (sal_uInt8)0xd6 ).WriteUChar( (sal_uInt8)44 ).WriteUInt16( (sal_uInt16)0 ).WriteUInt16( (sal_uInt16) 0x00cc );
     WriteBigEndianLong(nActBitmapId++);
-    *pMET << (sal_uInt8)0x02 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
     WritePoint(Point(aPt.X(),aPt.Y()+aSize.Height()));
     WritePoint(Point(aPt.X()+aSize.Width(),aPt.Y()));
-    *pMET << (sal_uInt32)0 << (sal_uInt32)0
-          << (sal_uInt32)(rBmpSizePixel.Width())
-          << (sal_uInt32)(rBmpSizePixel.Height());
+    pMET->WriteUInt32( (sal_uInt32)0 ).WriteUInt32( (sal_uInt32)0 )
+         .WriteUInt32( (sal_uInt32)(rBmpSizePixel.Width()) )
+         .WriteUInt32( (sal_uInt32)(rBmpSizePixel.Height()) );
 }
 
 void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo )
@@ -1147,11 +1147,11 @@ void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo )
     sal_Int32 nWidth = pCompDev->LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width();
 
     WillWriteOrder( 8 );            // set stroke linewidth
-    *pMET   << (sal_uInt8)0x15
-            << (sal_uInt8)6
-            << (sal_uInt8)0             // Flags
-            << (sal_uInt8)0
-            << nWidth;
+    pMET  ->WriteUChar( (sal_uInt8)0x15 )
+           .WriteUChar( (sal_uInt8)6 )
+           .WriteUChar( (sal_uInt8)0 )             // Flags
+           .WriteUChar( (sal_uInt8)0 )
+           .WriteInt32( nWidth );
 
     if ( rLineInfo.GetStyle() != LINE_SOLID )
     {
@@ -1181,83 +1181,83 @@ void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo )
                 break;  // not handled -Wall
         }
         WillWriteOrder( 2 );
-        *pMET << (sal_uInt8)0x18 << nStyle;     // set LineType
+        pMET->WriteUChar( (sal_uInt8)0x18 ).WriteUChar( nStyle );     // set LineType
     }
 }
 
 void METWriter::METPopLineInfo( const LineInfo& rLineInfo )
 {
     WillWriteOrder( 8 );            // set stroke linewidth
-    *pMET   << (sal_uInt8)0x15
-            << (sal_uInt8)6
-            << (sal_uInt8)0             // Flags
-            << (sal_uInt8)0
-            << (sal_uInt32)1;
+    pMET  ->WriteUChar( (sal_uInt8)0x15 )
+           .WriteUChar( (sal_uInt8)6 )
+           .WriteUChar( (sal_uInt8)0 )             // Flags
+           .WriteUChar( (sal_uInt8)0 )
+           .WriteUInt32( (sal_uInt32)1 );
 
     if ( rLineInfo.GetStyle() != LINE_SOLID )
     {
         WillWriteOrder( 2 );
-        *pMET << (sal_uInt8)0x18 << (sal_uInt8)0;       // set LineType
+        pMET->WriteUChar( (sal_uInt8)0x18 ).WriteUChar( (sal_uInt8)0 );       // set LineType
     }
 }
 
 void METWriter::METBeginArea(sal_Bool bBoundaryLine)
 {
     WillWriteOrder(2);
-    *pMET << (sal_uInt8)0x68;
-    if (bBoundaryLine) *pMET << (sal_uInt8)0xc0;
-    else               *pMET << (sal_uInt8)0x80;
+    pMET->WriteUChar( (sal_uInt8)0x68 );
+    if (bBoundaryLine) pMET->WriteUChar( (sal_uInt8)0xc0 );
+    else               pMET->WriteUChar( (sal_uInt8)0x80 );
 }
 
 
 void METWriter::METEndArea()
 {
     WillWriteOrder(2);
-    *pMET << (sal_uInt8)0x60 << (sal_uInt8)0;
+    pMET->WriteUChar( (sal_uInt8)0x60 ).WriteUChar( (sal_uInt8)0 );
 }
 
 
 void METWriter::METBeginPath(sal_uInt32 nPathId)
 {
     WillWriteOrder(8);
-    *pMET << (sal_uInt8)0xd0 << (sal_uInt8)6 << (sal_uInt16) 0 << nPathId;
+    pMET->WriteUChar( (sal_uInt8)0xd0 ).WriteUChar( (sal_uInt8)6 ).WriteUInt16( (sal_uInt16) 0 ).WriteUInt32( nPathId );
 }
 
 
 void METWriter::METEndPath()
 {
     WillWriteOrder(2);
-    *pMET << (sal_uInt8)0x7f << (sal_uInt8)0;
+    pMET->WriteUChar( (sal_uInt8)0x7f ).WriteUChar( (sal_uInt8)0 );
 }
 
 
 void METWriter::METFillPath(sal_uInt32 nPathId)
 {
     WillWriteOrder(8);
-    *pMET << (sal_uInt8)0xd7 << (sal_uInt8)6
-          << (sal_uInt8)0x00 << (sal_uInt8)0 << nPathId;
+    pMET->WriteUChar( (sal_uInt8)0xd7 ).WriteUChar( (sal_uInt8)6 )
+         .WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0 ).WriteUInt32( nPathId );
 }
 
 
 void METWriter::METOutlinePath(sal_uInt32 nPathId)
 {
     WillWriteOrder(8);
-    *pMET << (sal_uInt8)0xd4 << (sal_uInt8)6
-          << (sal_uInt8)0 << (sal_uInt8)0 << nPathId;
+    pMET->WriteUChar( (sal_uInt8)0xd4 ).WriteUChar( (sal_uInt8)6 )
+         .WriteUChar( (sal_uInt8)0 ).WriteUChar( (sal_uInt8)0 ).WriteUInt32( nPathId );
 }
 
 
 void METWriter::METCloseFigure()
 {
     WillWriteOrder(2);
-    *pMET << (sal_uInt8)0x7d << (sal_uInt8)0;
+    pMET->WriteUChar( (sal_uInt8)0x7d ).WriteUChar( (sal_uInt8)0 );
 }
 
 
 void METWriter::METMove(Point aPt)
 {
     WillWriteOrder(10);
-    *pMET << (sal_uInt8)0x21 << (sal_uInt8)8;
+    pMET->WriteUChar( (sal_uInt8)0x21 ).WriteUChar( (sal_uInt8)8 );
     WritePoint(aPt);
 }
 
@@ -1265,7 +1265,7 @@ void METWriter::METMove(Point aPt)
 void METWriter::METLine(Point aPt1, Point aPt2)
 {
     WillWriteOrder(18);
-    *pMET << (sal_uInt8)0xc1 << (sal_uInt8)16;
+    pMET->WriteUChar( (sal_uInt8)0xc1 ).WriteUChar( (sal_uInt8)16 );
     WritePoint(aPt1); WritePoint(aPt2);
 }
 
@@ -1282,13 +1282,13 @@ void METWriter::METLine(const Polygon & rPolygon)
         if (nOrderPoints>30) nOrderPoints=30;
         WillWriteOrder(nOrderPoints*8+2);
         if (bFirstOrder==sal_True) {
-            *pMET << (sal_uInt8)0xc1; // Line at given pos
+            pMET->WriteUChar( (sal_uInt8)0xc1 ); // Line at given pos
             bFirstOrder=sal_False;
         }
         else {
-            *pMET << (sal_uInt8)0x81; // Line at current pos
+            pMET->WriteUChar( (sal_uInt8)0x81 ); // Line at current pos
         }
-        *pMET << (sal_uInt8)(nOrderPoints*8);
+        pMET->WriteUChar( (sal_uInt8)(nOrderPoints*8) );
         for (j=0; j<nOrderPoints; j++) WritePoint(rPolygon.GetPoint(i++));
     }
 }
@@ -1308,7 +1308,7 @@ void METWriter::METLine(const PolyPolygon & rPolyPolygon)
 void METWriter::METLineAtCurPos(Point aPt)
 {
     WillWriteOrder(10);
-    *pMET << (sal_uInt8)0x81 << (sal_uInt8)8;
+    pMET->WriteUChar( (sal_uInt8)0x81 ).WriteUChar( (sal_uInt8)8 );
     WritePoint(aPt);
 }
 
@@ -1321,19 +1321,19 @@ void METWriter::METBox(sal_Bool bFill, sal_Bool bBoundary,
     if (bBoundary) nFlags|=0x20;
 
     WillWriteOrder(28);
-    *pMET << (sal_uInt8)0xc0 << (sal_uInt8)26 << nFlags << (sal_uInt8)0;
+    pMET->WriteUChar( (sal_uInt8)0xc0 ).WriteUChar( (sal_uInt8)26 ).WriteUChar( nFlags ).WriteUChar( (sal_uInt8)0 );
     WritePoint(aRect.BottomLeft());
     WritePoint(aRect.TopRight());
-    *pMET << nHAxis << nVAxis;
+    pMET->WriteUInt32( nHAxis ).WriteUInt32( nVAxis );
 }
 
 
 void METWriter::METFullArc(Point aCenter, double fMultiplier)
 {
     WillWriteOrder(14);
-    *pMET << (sal_uInt8)0xc7 << (sal_uInt8)12;
+    pMET->WriteUChar( (sal_uInt8)0xc7 ).WriteUChar( (sal_uInt8)12 );
     WritePoint(aCenter);
-    *pMET << (sal_Int32)(fMultiplier*65536.0+0.5);
+    pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) );
 }
 
 
@@ -1347,11 +1347,11 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier,
     while (fSweepAngle>360.0) fSweepAngle-=360.0;
     while (fSweepAngle<.00) fSweepAngle+=360.0;
     WillWriteOrder(22);
-    *pMET << (sal_uInt8)0xa3 << (sal_uInt8)20;
+    pMET->WriteUChar( (sal_uInt8)0xa3 ).WriteUChar( (sal_uInt8)20 );
     WritePoint(aCenter);
-    *pMET << (sal_Int32)(fMultiplier*65536.0+0.5);
-    *pMET << (sal_Int32)(fStartAngle*65536.0+0.5);
-    *pMET << (sal_Int32)(fSweepAngle*65536.0+0.5);
+    pMET->WriteInt32( (sal_Int32)(fMultiplier*65536.0+0.5) );
+    pMET->WriteInt32( (sal_Int32)(fStartAngle*65536.0+0.5) );
+    pMET->WriteInt32( (sal_Int32)(fSweepAngle*65536.0+0.5) );
 }
 
 
@@ -1361,18 +1361,18 @@ void METWriter::METChrStr( Point aPt, OUString aUniStr )
         osl_getThreadTextEncoding()));
     sal_uInt16 nLen = aStr.getLength();
     WillWriteOrder( 11 + nLen );
-    *pMET << (sal_uInt8)0xc3 << (sal_uInt8)( 9 + nLen );
+    pMET->WriteUChar( (sal_uInt8)0xc3 ).WriteUChar( (sal_uInt8)( 9 + nLen ) );
     WritePoint(aPt);
     for (sal_uInt16 i = 0; i < nLen; ++i)
-        *pMET << aStr[i];
-    *pMET << (sal_uInt8)0;
+        pMET->WriteChar( aStr[i] );
+    pMET->WriteUChar( (sal_uInt8)0 );
 }
 
 
 void METWriter::METSetArcParams(sal_Int32 nP, sal_Int32 nQ, sal_Int32 nR, sal_Int32 nS)
 {
     WillWriteOrder(18);
-    *pMET << (sal_uInt8)0x22 << (sal_uInt8)16 << nP << nQ << nR << nS;
+    pMET->WriteUChar( (sal_uInt8)0x22 ).WriteUChar( (sal_uInt8)16 ).WriteInt32( nP ).WriteInt32( nQ ).WriteInt32( nR ).WriteInt32( nS );
 }
 
 
@@ -1382,10 +1382,10 @@ void METWriter::METSetColor(Color aColor)
     aMETColor=aColor;
 
     WillWriteOrder(6);
-    *pMET << (sal_uInt8)0xa6 << (sal_uInt8)4 << (sal_uInt8)0
-          << (sal_uInt8)(aColor.GetBlue())
-          << (sal_uInt8)(aColor.GetGreen())
-          << (sal_uInt8)(aColor.GetRed());
+    pMET->WriteUChar( (sal_uInt8)0xa6 ).WriteUChar( (sal_uInt8)4 ).WriteUChar( (sal_uInt8)0 )
+         .WriteUChar( (sal_uInt8)(aColor.GetBlue()) )
+         .WriteUChar( (sal_uInt8)(aColor.GetGreen()) )
+         .WriteUChar( (sal_uInt8)(aColor.GetRed()) );
 }
 
 
@@ -1395,10 +1395,10 @@ void METWriter::METSetBackgroundColor(Color aColor)
     aMETBackgroundColor=aColor;
 
     WillWriteOrder(6);
-    *pMET << (sal_uInt8)0xa7 << (sal_uInt8)4 << (sal_uInt8)0
-          << (sal_uInt8)(aColor.GetBlue())
-          << (sal_uInt8)(aColor.GetGreen())
-          << (sal_uInt8)(aColor.GetRed());
+    pMET->WriteUChar( (sal_uInt8)0xa7 ).WriteUChar( (sal_uInt8)4 ).WriteUChar( (sal_uInt8)0 )
+         .WriteUChar( (sal_uInt8)(aColor.GetBlue()) )
+         .WriteUChar( (sal_uInt8)(aColor.GetGreen()) )
+         .WriteUChar( (sal_uInt8)(aColor.GetRed()) );
 }
 
 void METWriter::METSetMix(RasterOp eROP)
@@ -1418,7 +1418,7 @@ void METWriter::METSetMix(RasterOp eROP)
     }
 
     WillWriteOrder(2);
-    *pMET << (sal_uInt8)0x0c << nMix;
+    pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( nMix );
 }
 
 
@@ -1430,7 +1430,7 @@ void METWriter::METSetChrCellSize(Size aSize)
     aMETChrCellSize=aSize;
     WillWriteOrder(10);
     if (aSize.Width()==0) aSize.Width()=aSize.Height();
-    *pMET << (sal_uInt8)0x33 << (sal_uInt8)8 << (sal_Int32)aSize.Width() << (sal_Int32)aSize.Height();
+    pMET->WriteUChar( (sal_uInt8)0x33 ).WriteUChar( (sal_uInt8)8 ).WriteInt32( (sal_Int32)aSize.Width() ).WriteInt32( (sal_Int32)aSize.Height() );
 }
 
 
@@ -1454,7 +1454,7 @@ void METWriter::METSetChrAngle(short nAngle)
     }
 
     WillWriteOrder(10);
-    *pMET << (sal_uInt8)0x34 << (sal_uInt8)8 << nax << nay;
+    pMET->WriteUChar( (sal_uInt8)0x34 ).WriteUChar( (sal_uInt8)8 ).WriteInt32( nax ).WriteInt32( nay );
 }
 
 
@@ -1465,7 +1465,7 @@ void METWriter::METSetChrSet(sal_uInt8 nSet)
 
     nMETChrSet=nSet;
     WillWriteOrder(2);
-    *pMET << (sal_uInt8)0x38 << nSet;
+    pMET->WriteUChar( (sal_uInt8)0x38 ).WriteUChar( nSet );
 }
 
 
@@ -2331,18 +2331,18 @@ void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF)
     //--- The Field 'Map Color Attribute Table':
     WriteFieldIntroducer(22,MapColAtrMagic,0,0);
     WriteBigEndianShort(0x000e);
-    *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 );
     WriteFieldId(4);
 
     //--- The first Field 'Map Coded Font':
     WriteFieldIntroducer(32,MapCodFntMagic,0,0);
     WriteBigEndianShort(0x0018);
-    *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00;
-    *pMET << (sal_uInt8)0xff << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
-    *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00 << (sal_uInt8)0x00;
-    *pMET << (sal_uInt8)0x04 << (sal_uInt8)0x24 << (sal_uInt8)0x05 << (sal_uInt8)0x00;
-    *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x20;
-    *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x97 << (sal_uInt8)0x01 << (sal_uInt8)0xb5;
+    pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 );
+    pMET->WriteUChar( (sal_uInt8)0xff ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
+    pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
+    pMET->WriteUChar( (sal_uInt8)0x04 ).WriteUChar( (sal_uInt8)0x24 ).WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)0x00 );
+    pMET->WriteUChar( (sal_uInt8)0x06 ).WriteUChar( (sal_uInt8)0x20 );
+    pMET->WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x97 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0xb5 );
 
     //--- The additional Fields 'Map Coded Font':
     CreateChrSets(pMTF);
@@ -2354,10 +2354,10 @@ void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF)
     {
         WriteFieldIntroducer(29,MapDatResMagic,0,0);
         WriteBigEndianShort(0x0015);
-        *pMET << (sal_uInt8)0x0c << (sal_uInt8)0x02 << (sal_uInt8)0x84 << (sal_uInt8)0x00;
+        pMET->WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x02 ).WriteUChar( (sal_uInt8)0x84 ).WriteUChar( (sal_uInt8)0x00 );
         WriteFieldId(nId);
-        *pMET << (sal_uInt8)0x07 << (sal_uInt8)0x22 << (sal_uInt8)0x10;
-        *pMET << (sal_uInt32)nId;
+        pMET->WriteUChar( (sal_uInt8)0x07 ).WriteUChar( (sal_uInt8)0x22 ).WriteUChar( (sal_uInt8)0x10 );
+        pMET->WriteUInt32( (sal_uInt32)nId );
         nId++;
     }
 
@@ -2395,11 +2395,11 @@ void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF)
     nNumberOfDataFields++;
 
     // now at first we write the head of the segment:
-    *pMET << (sal_uInt8)0x70 << (sal_uInt8)0x0e << (sal_uInt32)0;
-    *pMET << (sal_uInt8)0x70 << (sal_uInt8)0x10; // Flags
-    *pMET << (sal_uInt16)0; // Lo-Word of the length of the segment data  (Big Endian)
-    *pMET << (sal_uInt32)0;  // Reserved
-    *pMET << (sal_uInt16)0; // Hi-Word of the length of the segment (Big Endian) (Ohh Ohh OS2)
+    pMET->WriteUChar( (sal_uInt8)0x70 ).WriteUChar( (sal_uInt8)0x0e ).WriteUInt32( (sal_uInt32)0 );
+    pMET->WriteUChar( (sal_uInt8)0x70 ).WriteUChar( (sal_uInt8)0x10 ); // Flags
+    pMET->WriteUInt16( (sal_uInt16)0 ); // Lo-Word of the length of the segment data  (Big Endian)
+    pMET->WriteUInt32( (sal_uInt32)0 );  // Reserved
+    pMET->WriteUInt16( (sal_uInt16)0 ); // Hi-Word of the length of the segment (Big Endian) (Ohh Ohh OS2)
     // Annotation: we're writing the correct data length again below
 
     // now all orders are being written out:
@@ -2462,10 +2462,10 @@ void METWriter::WriteDocument(const GDIMetaFile * pMTF)
     //--- The Field 'Begin Document':
     WriteFieldIntroducer(0,BegDocumnMagic,0,0);
     WriteFieldId(1);
-    *pMET << (sal_uInt8)0x00 << (sal_uInt8)0x00;
-    *pMET << (sal_uInt8)0x05 << (sal_uInt8)0x18 << (sal_uInt8)0x03 << (sal_uInt8)0x0c << (sal_uInt8)0x00;
-    *pMET << (sal_uInt8)0x06 << (sal_uInt8)0x01 << (sal_uInt8)0x03 << (sal_uInt8)0xd4 << (sal_uInt8)0x03 << (sal_uInt8)0x52;
-    *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x65 << (sal_uInt8)0x00;
+    pMET->WriteUChar( (sal_uInt8)0x00 ).WriteUChar( (sal_uInt8)0x00 );
+    pMET->WriteUChar( (sal_uInt8)0x05 ).WriteUChar( (sal_uInt8)0x18 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x0c ).WriteUChar( (sal_uInt8)0x00 );
+    pMET->WriteUChar( (sal_uInt8)0x06 ).WriteUChar( (sal_uInt8)0x01 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0xd4 ).WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x52 );
+    pMET->WriteUChar( (sal_uInt8)0x03 ).WriteUChar( (sal_uInt8)0x65 ).WriteUChar( (sal_uInt8)0x00 );
     UpdateFieldSize();
 
     //--- The Content: