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, 295 insertions, 295 deletions

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index b1158c9ff345..94e0de1ad8c2 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1937,16 +1937,16 @@ int MathType::ConvertFromStarMath( SfxMedium& rMedium )
         pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
         pS->SeekRel(EQNOLEFILEHDR_SIZE); //Skip 28byte Header and fill it in later
-        *pS << sal_uInt8(0x03);
-        *pS << sal_uInt8(0x01);
-        *pS << sal_uInt8(0x01);
-        *pS << sal_uInt8(0x03);
-        *pS << sal_uInt8(0x00);
+        pS->WriteUChar( sal_uInt8(0x03) );
+        pS->WriteUChar( sal_uInt8(0x01) );
+        pS->WriteUChar( sal_uInt8(0x01) );
+        pS->WriteUChar( sal_uInt8(0x03) );
+        pS->WriteUChar( sal_uInt8(0x00) );
         sal_uInt32 nSize = pS->Tell();
         nPendingAttributes=0;
 
         HandleNodes(pTree);
-        *pS << sal_uInt8(END);
+        pS->WriteUChar( sal_uInt8(END) );
 
         nSize = pS->Tell()-nSize;
         pS->Seek(0);
@@ -2021,25 +2021,25 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel)
             break;
         case NLINE:
             {
-            *pS << sal_uInt8(0x0a);
-            *pS << sal_uInt8(LINE);
+            pS->WriteUChar( sal_uInt8(0x0a) );
+            pS->WriteUChar( sal_uInt8(LINE) );
             sal_uInt16  nSize = pNode->GetNumSubNodes();
             for (sal_uInt16 i = 0; i < nSize; i++)
                 if (SmNode *pTemp = pNode->GetSubNode(i))
                     HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END);
+            pS->WriteUChar( sal_uInt8(END) );
             }
             break;
         case NALIGN:
             HandleMAlign(pNode,nLevel);
             break;
         case NBLANK:
-            *pS << sal_uInt8(CHAR);
-            *pS << sal_uInt8(0x98);
+            pS->WriteUChar( sal_uInt8(CHAR) );
+            pS->WriteUChar( sal_uInt8(0x98) );
             if (pNode->GetToken().eType == TSBLANK)
-                *pS << sal_uInt16(0xEB04);
+                pS->WriteUInt16( sal_uInt16(0xEB04) );
             else
-                *pS << sal_uInt16(0xEB05);
+                pS->WriteUInt16( sal_uInt16(0xEB05) );
             break;
         default:
             {
@@ -2057,11 +2057,11 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel)
 int MathType::StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation)
 {
     int nOldPending=nPendingAttributes;
-    *pS << sal_uInt8(TMPL); //Template
-    *pS << sal_uInt8(nSelector); //selector
-    *pS << sal_uInt8(nVariation); //variation
-    *pS << sal_uInt8(0x00); //options
-    *pS << sal_uInt8(LINE);
+    pS->WriteUChar( sal_uInt8(TMPL) ); //Template
+    pS->WriteUChar( sal_uInt8(nSelector) ); //selector
+    pS->WriteUChar( sal_uInt8(nVariation) ); //variation
+    pS->WriteUChar( sal_uInt8(0x00) ); //options
+    pS->WriteUChar( sal_uInt8(LINE) );
     //theres just no way we can now handle any character
     //attributes (from mathtypes perspective) centered
     //over an expression but above template attribute
@@ -2073,39 +2073,39 @@ int MathType::StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation)
 
 void MathType::EndTemplate(int nOldPendingAttributes)
 {
-    *pS << sal_uInt8(END); //end line
-    *pS << sal_uInt8(END); //end template
+    pS->WriteUChar( sal_uInt8(END) ); //end line
+    pS->WriteUChar( sal_uInt8(END) ); //end template
     nPendingAttributes=nOldPendingAttributes;
 }
 
 
 void MathType::HandleSmMatrix(SmMatrixNode *pMatrix,int nLevel)
 {
-    *pS << sal_uInt8(MATRIX);
-    *pS << sal_uInt8(0x00); //vAlign ?
-    *pS << sal_uInt8(0x00); //h_just
-    *pS << sal_uInt8(0x00); //v_just
-    *pS << sal_uInt8(pMatrix->GetNumRows()); //v_just
-    *pS << sal_uInt8(pMatrix->GetNumCols()); //v_just
+    pS->WriteUChar( sal_uInt8(MATRIX) );
+    pS->WriteUChar( sal_uInt8(0x00) ); //vAlign ?
+    pS->WriteUChar( sal_uInt8(0x00) ); //h_just
+    pS->WriteUChar( sal_uInt8(0x00) ); //v_just
+    pS->WriteUChar( sal_uInt8(pMatrix->GetNumRows()) ); //v_just
+    pS->WriteUChar( sal_uInt8(pMatrix->GetNumCols()) ); //v_just
     int nBytes=(pMatrix->GetNumRows()+1)*2/8;
     if (((pMatrix->GetNumRows()+1)*2)%8)
         nBytes++;
     for (sal_uInt16 j = 0; j < nBytes; j++)
-        *pS << sal_uInt8(0x00); //row_parts
+        pS->WriteUChar( sal_uInt8(0x00) ); //row_parts
     nBytes=(pMatrix->GetNumCols()+1)*2/8;
     if (((pMatrix->GetNumCols()+1)*2)%8)
         nBytes++;
     for (sal_uInt16 k = 0; k < nBytes; k++)
-        *pS << sal_uInt8(0x00); //col_parts
+        pS->WriteUChar( sal_uInt8(0x00) ); //col_parts
     sal_uInt16  nSize = pMatrix->GetNumSubNodes();
     for (sal_uInt16 i = 0; i < nSize; i++)
         if (SmNode *pTemp = pMatrix->GetSubNode(i))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //end line
+            pS->WriteUChar( sal_uInt8(END) ); //end line
         }
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 }
 
 
@@ -2121,57 +2121,57 @@ void MathType::HandleTable(SmNode *pNode,int nLevel)
     //without bound in a multi step conversion
 
     if (nLevel == 0)
-        *pS << sal_uInt8(0x0A); //initial size
+        pS->WriteUChar( sal_uInt8(0x0A) ); //initial size
 
     if ( nLevel || (nSize >1))
     {
-        *pS << sal_uInt8(PILE);
-        *pS << sal_uInt8(nHAlign); //vAlign ?
-        *pS << sal_uInt8(0x01); //hAlign
+        pS->WriteUChar( sal_uInt8(PILE) );
+        pS->WriteUChar( sal_uInt8(nHAlign) ); //vAlign ?
+        pS->WriteUChar( sal_uInt8(0x01) ); //hAlign
     }
 
     for (sal_uInt16 i = 0; i < nSize; i++)
         if (SmNode *pTemp = pNode->GetSubNode(i))
         {
-            *pS << sal_uInt8(LINE);
+            pS->WriteUChar( sal_uInt8(LINE) );
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END);
+            pS->WriteUChar( sal_uInt8(END) );
         }
     if (nLevel || (nSize>1))
-        *pS << sal_uInt8(END);
+        pS->WriteUChar( sal_uInt8(END) );
 }
 
 
 void MathType::HandleRoot(SmNode *pNode,int nLevel)
 {
     SmNode *pTemp;
-    *pS << sal_uInt8(TMPL); //Template
-    *pS << sal_uInt8(0x0D); //selector
+    pS->WriteUChar( sal_uInt8(TMPL) ); //Template
+    pS->WriteUChar( sal_uInt8(0x0D) ); //selector
     if (pNode->GetSubNode(0))
-        *pS << sal_uInt8(0x01); //variation
+        pS->WriteUChar( sal_uInt8(0x01) ); //variation
     else
-        *pS << sal_uInt8(0x00); //variation
-    *pS << sal_uInt8(0x00); //options
+        pS->WriteUChar( sal_uInt8(0x00) ); //variation
+    pS->WriteUChar( sal_uInt8(0x00) ); //options
 
     if (NULL != (pTemp = pNode->GetSubNode(2)))
     {
-        *pS << sal_uInt8(LINE); //line
+        pS->WriteUChar( sal_uInt8(LINE) ); //line
         HandleNodes(pTemp,nLevel+1);
-        *pS << sal_uInt8(END);
+        pS->WriteUChar( sal_uInt8(END) );
     }
 
     if (NULL != (pTemp = pNode->GetSubNode(0)))
     {
-        *pS << sal_uInt8(LINE); //line
+        pS->WriteUChar( sal_uInt8(LINE) ); //line
         HandleNodes(pTemp,nLevel+1);
-        *pS << sal_uInt8(END);
+        pS->WriteUChar( sal_uInt8(END) );
     }
     else
-        *pS << sal_uInt8(LINE|0x10); //dummy line
+        pS->WriteUChar( sal_uInt8(LINE|0x10) ); //dummy line
 
 
 
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 }
 
 sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel,
@@ -2192,39 +2192,39 @@ sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel,
     {
         if (pPos)
             *pPos = pS->Tell();
-        *pS << sal_uInt8(TMPL); //Template
-        *pS << sal_uInt8(0x2B); //selector
-        *pS << nVariation2;
-        *pS << sal_uInt8(0x00); //options
+        pS->WriteUChar( sal_uInt8(TMPL) ); //Template
+        pS->WriteUChar( sal_uInt8(0x2B) ); //selector
+        pS->WriteUChar( nVariation2 );
+        pS->WriteUChar( sal_uInt8(0x00) ); //options
 
         if (pContent)
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pContent,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
 
-        *pS << sal_uInt8(0x0B);
+        pS->WriteUChar( sal_uInt8(0x0B) );
 
         SmNode *pTemp;
         if (NULL != (pTemp = pNode->GetSubNode(CSUB+1)))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
         if (bTest && NULL != (pTemp = pNode->GetSubNode(CSUP+1)))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
     }
     return nVariation2;
 }
@@ -2253,29 +2253,29 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel)
 
     if (nVariation!=0xff)
     {
-        *pS << sal_uInt8(TMPL); //Template
-        *pS << sal_uInt8(0x2c); //selector
-        *pS << nVariation;
-        *pS << sal_uInt8(0x00); //options
-        *pS << sal_uInt8(0x0B);
+        pS->WriteUChar( sal_uInt8(TMPL) ); //Template
+        pS->WriteUChar( sal_uInt8(0x2c) ); //selector
+        pS->WriteUChar( nVariation );
+        pS->WriteUChar( sal_uInt8(0x00) ); //options
+        pS->WriteUChar( sal_uInt8(0x0B) );
 
         if (NULL != (pTemp = pNode->GetSubNode(LSUB+1)))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
         if (NULL != (pTemp = pNode->GetSubNode(LSUP+1)))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
-        *pS << sal_uInt8(END);
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
+        pS->WriteUChar( sal_uInt8(END) );
         nVariation=0xff;
     }
 
@@ -2288,7 +2288,7 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel)
     }
 
     if (nVariation2 != 0xff)
-        *pS << sal_uInt8(END);
+        pS->WriteUChar( sal_uInt8(END) );
 
     if (NULL != (pNode->GetSubNode(RSUP+1)))
     {
@@ -2301,58 +2301,58 @@ void MathType::HandleSubSupScript(SmNode *pNode,int nLevel)
 
     if (nVariation!=0xff)
     {
-        *pS << sal_uInt8(TMPL); //Template
-        *pS << sal_uInt8(0x0F); //selector
-        *pS << nVariation;
-        *pS << sal_uInt8(0x00); //options
-        *pS << sal_uInt8(0x0B);
+        pS->WriteUChar( sal_uInt8(TMPL) ); //Template
+        pS->WriteUChar( sal_uInt8(0x0F) ); //selector
+        pS->WriteUChar( nVariation );
+        pS->WriteUChar( sal_uInt8(0x00) ); //options
+        pS->WriteUChar( sal_uInt8(0x0B) );
 
         if (NULL != (pTemp = pNode->GetSubNode(RSUB+1)))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
         if (NULL != (pTemp = pNode->GetSubNode(RSUP+1)))
         {
-            *pS << sal_uInt8(LINE); //line
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
             HandleNodes(pTemp,nLevel+1);
-            *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(END) ); //line
         }
         else
-            *pS << sal_uInt8(LINE|0x10);
-    *pS << sal_uInt8(END); //line
+            pS->WriteUChar( sal_uInt8(LINE|0x10) );
+    pS->WriteUChar( sal_uInt8(END) ); //line
     }
 
     //After subscript mathtype will keep the size of
     //normal text at the subscript size, sigh.
-    *pS << sal_uInt8(0x0A);
+    pS->WriteUChar( sal_uInt8(0x0A) );
 }
 
 
 void MathType::HandleFractions(SmNode *pNode,int nLevel)
 {
     SmNode *pTemp;
-    *pS << sal_uInt8(TMPL); //Template
-    *pS << sal_uInt8(0x0E); //selector
-    *pS << sal_uInt8(0x00); //variation
-    *pS << sal_uInt8(0x00); //options
+    pS->WriteUChar( sal_uInt8(TMPL) ); //Template
+    pS->WriteUChar( sal_uInt8(0x0E) ); //selector
+    pS->WriteUChar( sal_uInt8(0x00) ); //variation
+    pS->WriteUChar( sal_uInt8(0x00) ); //options
 
-    *pS << sal_uInt8(0x0A);
-    *pS << sal_uInt8(LINE); //line
+    pS->WriteUChar( sal_uInt8(0x0A) );
+    pS->WriteUChar( sal_uInt8(LINE) ); //line
     if (NULL != (pTemp = pNode->GetSubNode(0)))
         HandleNodes(pTemp,nLevel+1);
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 
-    *pS << sal_uInt8(0x0A);
-    *pS << sal_uInt8(LINE); //line
+    pS->WriteUChar( sal_uInt8(0x0A) );
+    pS->WriteUChar( sal_uInt8(LINE) ); //line
     if (NULL != (pTemp = pNode->GetSubNode(2)))
         HandleNodes(pTemp,nLevel+1);
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 }
 
 
@@ -2362,7 +2362,7 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
     SmNode *pLeft=pNode->GetSubNode(0);
     SmNode *pRight=pNode->GetSubNode(2);
 
-    *pS << sal_uInt8(TMPL); //Template
+    pS->WriteUChar( sal_uInt8(TMPL) ); //Template
     bIsReInterpBrace=0;
     sal_uInt8 nBSpec=0x10;
     sal_uLong nLoc = pS->Tell();
@@ -2371,42 +2371,42 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
         switch (pLeft->GetToken().eType)
         {
             case TLANGLE:
-                *pS << sal_uInt8(tmANGLE); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmANGLE) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 break;
             case TLBRACE:
-                *pS << sal_uInt8(tmBRACE); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmBRACE) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 nBSpec+=3;
                 break;
             case TLBRACKET:
-                *pS << sal_uInt8(tmBRACK); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmBRACK) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 nBSpec+=3;
                 break;
             case TLFLOOR:
-                *pS << sal_uInt8(tmFLOOR); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmFLOOR) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 break;
             case TLLINE:
-                *pS << sal_uInt8(tmBAR); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmBAR) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 nBSpec+=3;
                 break;
             case TLDLINE:
-                *pS << sal_uInt8(tmDBAR); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmDBAR) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 break;
             default:
-                *pS << sal_uInt8(tmPAREN); //selector
-                *pS << sal_uInt8(0x00); //variation
-                *pS << sal_uInt8(0x00); //options
+                pS->WriteUChar( sal_uInt8(tmPAREN) ); //selector
+                pS->WriteUChar( sal_uInt8(0x00) ); //variation
+                pS->WriteUChar( sal_uInt8(0x00) ); //options
                 nBSpec+=3;
                 break;
         }
@@ -2414,9 +2414,9 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
 
     if (NULL != (pTemp = pNode->GetSubNode(1)))
     {
-        *pS << sal_uInt8(LINE); //line
+        pS->WriteUChar( sal_uInt8(LINE) ); //line
         HandleNodes(pTemp,nLevel+1);
-        *pS << sal_uInt8(END); //options
+        pS->WriteUChar( sal_uInt8(END) ); //options
     }
     nSpec=nBSpec;
     if (pLeft)
@@ -2425,45 +2425,45 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
     {
         sal_uLong nLoc2 = pS->Tell();
         pS->Seek(nLoc);
-        *pS << sal_uInt8(0x2D);
+        pS->WriteUChar( sal_uInt8(0x2D) );
         pS->Seek(nLoc2);
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x96);
-        *pS << sal_uInt16(0xEC07);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x96) );
+        pS->WriteUInt16( sal_uInt16(0xEC07) );
         bIsReInterpBrace=0;
     }
     if (pRight)
         HandleNodes(pRight,nLevel+1);
     nSpec=0x0;
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 }
 
 
 void MathType::HandleVerticalBrace(SmNode *pNode,int nLevel)
 {
     SmNode *pTemp;
-    *pS << sal_uInt8(TMPL); //Template
+    pS->WriteUChar( sal_uInt8(TMPL) ); //Template
     if (pNode->GetToken().eType == TUNDERBRACE)
-        *pS << sal_uInt8(tmLHBRACE); //selector
+        pS->WriteUChar( sal_uInt8(tmLHBRACE) ); //selector
     else
-        *pS << sal_uInt8(tmUHBRACE); //selector
-    *pS << sal_uInt8(0x01); //variation
-    *pS << sal_uInt8(0x00); //options
+        pS->WriteUChar( sal_uInt8(tmUHBRACE) ); //selector
+    pS->WriteUChar( sal_uInt8(0x01) ); //variation
+    pS->WriteUChar( sal_uInt8(0x00) ); //options
 
     if (NULL != (pTemp = pNode->GetSubNode(0)))
     {
-        *pS << sal_uInt8(LINE); //line
+        pS->WriteUChar( sal_uInt8(LINE) ); //line
         HandleNodes(pTemp,nLevel+1);
-        *pS << sal_uInt8(END); //options
+        pS->WriteUChar( sal_uInt8(END) ); //options
     }
 
     if (NULL != (pTemp = pNode->GetSubNode(2)))
     {
-        *pS << sal_uInt8(LINE); //line
+        pS->WriteUChar( sal_uInt8(LINE) ); //line
         HandleNodes(pTemp,nLevel+1);
-        *pS << sal_uInt8(END); //options
+        pS->WriteUChar( sal_uInt8(END) ); //options
     }
-    *pS << sal_uInt8(END);
+    pS->WriteUChar( sal_uInt8(END) );
 }
 
 void MathType::HandleOperator(SmNode *pNode,int nLevel)
@@ -2513,142 +2513,142 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
         nVariation = 2;
         nIntVariation=0;
     }
-    *pS << sal_uInt8(TMPL);
+    pS->WriteUChar( sal_uInt8(TMPL) );
     switch(pNode->GetToken().eType)
     {
     case TINT:
         if (nOldVariation != 0xff)
-            *pS << sal_uInt8(0x18); //selector
+            pS->WriteUChar( sal_uInt8(0x18) ); //selector
         else
-            *pS << sal_uInt8(0x15); //selector
-        *pS << nIntVariation; //variation
+            pS->WriteUChar( sal_uInt8(0x15) ); //selector
+        pS->WriteUChar( nIntVariation ); //variation
         break;
     case TIINT:
         if (nOldVariation != 0xff)
         {
-            *pS << sal_uInt8(0x19);
-            *pS << sal_uInt8(0x01);
+            pS->WriteUChar( sal_uInt8(0x19) );
+            pS->WriteUChar( sal_uInt8(0x01) );
         }
         else
         {
-            *pS << sal_uInt8(0x16);
-            *pS << sal_uInt8(0x00);
+            pS->WriteUChar( sal_uInt8(0x16) );
+            pS->WriteUChar( sal_uInt8(0x00) );
         }
         break;
     case TIIINT:
         if (nOldVariation != 0xff)
         {
-            *pS << sal_uInt8(0x1a);
-            *pS << sal_uInt8(0x01);
+            pS->WriteUChar( sal_uInt8(0x1a) );
+            pS->WriteUChar( sal_uInt8(0x01) );
         }
         else
         {
-            *pS << sal_uInt8(0x17);
-            *pS << sal_uInt8(0x00);
+            pS->WriteUChar( sal_uInt8(0x17) );
+            pS->WriteUChar( sal_uInt8(0x00) );
         }
         break;
     case TLINT:
         if (nOldVariation != 0xff)
         {
-            *pS << sal_uInt8(0x18);
-            *pS << sal_uInt8(0x02);
+            pS->WriteUChar( sal_uInt8(0x18) );
+            pS->WriteUChar( sal_uInt8(0x02) );
         }
         else
         {
-            *pS << sal_uInt8(0x15);
-            *pS << sal_uInt8(0x03);
+            pS->WriteUChar( sal_uInt8(0x15) );
+            pS->WriteUChar( sal_uInt8(0x03) );
         }
         break;
     case TLLINT:
         if (nOldVariation != 0xff)
         {
-            *pS << sal_uInt8(0x19);
-            *pS << sal_uInt8(0x00);
+            pS->WriteUChar( sal_uInt8(0x19) );
+            pS->WriteUChar( sal_uInt8(0x00) );
         }
         else
         {
-            *pS << sal_uInt8(0x16);
-            *pS << sal_uInt8(0x02);
+            pS->WriteUChar( sal_uInt8(0x16) );
+            pS->WriteUChar( sal_uInt8(0x02) );
         }
         break;
     case TLLLINT:
         if (nOldVariation != 0xff)
         {
-            *pS << sal_uInt8(0x1a);
-            *pS << sal_uInt8(0x00);
+            pS->WriteUChar( sal_uInt8(0x1a) );
+            pS->WriteUChar( sal_uInt8(0x00) );
         }
         else
         {
-            *pS << sal_uInt8(0x17);
-            *pS << sal_uInt8(0x02);
+            pS->WriteUChar( sal_uInt8(0x17) );
+            pS->WriteUChar( sal_uInt8(0x02) );
         }
         break;
     case TSUM:
     default:
-        *pS << sal_uInt8(0x1d);
-        *pS << nVariation;
+        pS->WriteUChar( sal_uInt8(0x1d) );
+        pS->WriteUChar( nVariation );
         break;
     case TPROD:
-        *pS << sal_uInt8(0x1f);
-        *pS << nVariation;
+        pS->WriteUChar( sal_uInt8(0x1f) );
+        pS->WriteUChar( nVariation );
         break;
     case TCOPROD:
-        *pS << sal_uInt8(0x21);
-        *pS << nVariation;
+        pS->WriteUChar( sal_uInt8(0x21) );
+        pS->WriteUChar( nVariation );
         break;
     }
-    *pS << sal_uInt8(0x00); //options
+    pS->WriteUChar( sal_uInt8(0x00) ); //options
 
     if (nPos2)
         pS->Seek(nPos2);
     else
     {
-        *pS << sal_uInt8(LINE); //line
+        pS->WriteUChar( sal_uInt8(LINE) ); //line
         HandleNodes(pNode->GetSubNode(1),nLevel+1);
-        *pS << sal_uInt8(END); //line
-        *pS << sal_uInt8(LINE|0x10);
-        *pS << sal_uInt8(LINE|0x10);
+        pS->WriteUChar( sal_uInt8(END) ); //line
+        pS->WriteUChar( sal_uInt8(LINE|0x10) );
+        pS->WriteUChar( sal_uInt8(LINE|0x10) );
     }
 
 
-    *pS << sal_uInt8(0x0D);
+    pS->WriteUChar( sal_uInt8(0x0D) );
     switch(pNode->GetToken().eType)
     {
     case TSUM:
     default:
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x86);
-        *pS << sal_uInt16(0x2211);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x86) );
+        pS->WriteUInt16( sal_uInt16(0x2211) );
         break;
     case TPROD:
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x86);
-        *pS << sal_uInt16(0x220F);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x86) );
+        pS->WriteUInt16( sal_uInt16(0x220F) );
         break;
     case TCOPROD:
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x8B);
-        *pS << sal_uInt16(0x2210);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x8B) );
+        pS->WriteUInt16( sal_uInt16(0x2210) );
         break;
     case TIIINT:
     case TLLLINT:
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x86);
-        *pS << sal_uInt16(0x222B);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x86) );
+        pS->WriteUInt16( sal_uInt16(0x222B) );
     case TIINT:
     case TLLINT:
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x86);
-        *pS << sal_uInt16(0x222B);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x86) );
+        pS->WriteUInt16( sal_uInt16(0x222B) );
     case TINT:
     case TLINT:
-        *pS << sal_uInt8(CHAR);
-        *pS << sal_uInt8(0x86);
-        *pS << sal_uInt16(0x222B);
+        pS->WriteUChar( sal_uInt8(CHAR) );
+        pS->WriteUChar( sal_uInt8(0x86) );
+        pS->WriteUInt16( sal_uInt16(0x222B) );
         break;
     }
-    *pS << sal_uInt8(END);
-    *pS << sal_uInt8(0x0A);
+    pS->WriteUChar( sal_uInt8(END) );
+    pS->WriteUChar( sal_uInt8(0x0A) );
 }
 
 
@@ -2977,60 +2977,60 @@ sal_Bool MathType::HandleLim(SmNode *pNode,int nLevel)
             sal_uInt8 nVariation2=HandleCScript(pNode->GetSubNode(0),NULL,
                 nLevel);
 
-            *pS << sal_uInt8(0x0A);
-            *pS << sal_uInt8(LINE); //line
-            *pS << sal_uInt8(CHAR|0x10);
-            *pS << sal_uInt8(0x82);
-            *pS << sal_uInt16('l');
-            *pS << sal_uInt8(CHAR|0x10);
-            *pS << sal_uInt8(0x82);
-            *pS << sal_uInt16('i');
-            *pS << sal_uInt8(CHAR|0x10);
-            *pS << sal_uInt8(0x82);
-            *pS << sal_uInt16('m');
+            pS->WriteUChar( sal_uInt8(0x0A) );
+            pS->WriteUChar( sal_uInt8(LINE) ); //line
+            pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+            pS->WriteUChar( sal_uInt8(0x82) );
+            pS->WriteUInt16( sal_uInt16('l') );
+            pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+            pS->WriteUChar( sal_uInt8(0x82) );
+            pS->WriteUInt16( sal_uInt16('i') );
+            pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+            pS->WriteUChar( sal_uInt8(0x82) );
+            pS->WriteUInt16( sal_uInt16('m') );
 
             if (pNode->GetToken().eType == TLIMSUP)
             {
-                *pS << sal_uInt8(CHAR); //some space
-                *pS << sal_uInt8(0x98);
-                *pS << sal_uInt16(0xEB04);
-
-                *pS << sal_uInt8(CHAR|0x10);
-                *pS << sal_uInt8(0x82);
-                *pS << sal_uInt16('s');
-                *pS << sal_uInt8(CHAR|0x10);
-                *pS << sal_uInt8(0x82);
-                *pS << sal_uInt16('u');
-                *pS << sal_uInt8(CHAR|0x10);
-                *pS << sal_uInt8(0x82);
-                *pS << sal_uInt16('p');
+                pS->WriteUChar( sal_uInt8(CHAR) ); //some space
+                pS->WriteUChar( sal_uInt8(0x98) );
+                pS->WriteUInt16( sal_uInt16(0xEB04) );
+
+                pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+                pS->WriteUChar( sal_uInt8(0x82) );
+                pS->WriteUInt16( sal_uInt16('s') );
+                pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+                pS->WriteUChar( sal_uInt8(0x82) );
+                pS->WriteUInt16( sal_uInt16('u') );
+                pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+                pS->WriteUChar( sal_uInt8(0x82) );
+                pS->WriteUInt16( sal_uInt16('p') );
             }
             else if (pNode->GetToken().eType == TLIMINF)
             {
-                *pS << sal_uInt8(CHAR); //some space
-                *pS << sal_uInt8(0x98);
-                *pS << sal_uInt16(0xEB04);
-
-                *pS << sal_uInt8(CHAR|0x10);
-                *pS << sal_uInt8(0x82);
-                *pS << sal_uInt16('i');
-                *pS << sal_uInt8(CHAR|0x10);
-                *pS << sal_uInt8(0x82);
-                *pS << sal_uInt16('n');
-                *pS << sal_uInt8(CHAR|0x10);
-                *pS << sal_uInt8(0x82);
-                *pS << sal_uInt16('f');
+                pS->WriteUChar( sal_uInt8(CHAR) ); //some space
+                pS->WriteUChar( sal_uInt8(0x98) );
+                pS->WriteUInt16( sal_uInt16(0xEB04) );
+
+                pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+                pS->WriteUChar( sal_uInt8(0x82) );
+                pS->WriteUInt16( sal_uInt16('i') );
+                pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+                pS->WriteUChar( sal_uInt8(0x82) );
+                pS->WriteUInt16( sal_uInt16('n') );
+                pS->WriteUChar( sal_uInt8(CHAR|0x10) );
+                pS->WriteUChar( sal_uInt8(0x82) );
+                pS->WriteUInt16( sal_uInt16('f') );
             }
 
 
-            *pS << sal_uInt8(CHAR); //some space
-            *pS << sal_uInt8(0x98);
-            *pS << sal_uInt16(0xEB04);
+            pS->WriteUChar( sal_uInt8(CHAR) ); //some space
+            pS->WriteUChar( sal_uInt8(0x98) );
+            pS->WriteUInt16( sal_uInt16(0xEB04) );
 
             if (nVariation2 != 0xff)
             {
-                *pS << sal_uInt8(END);
-                *pS << sal_uInt8(END);
+                pS->WriteUChar( sal_uInt8(END) );
+                pS->WriteUChar( sal_uInt8(END) );
             }
             HandleNodes(pNode->GetSubNode(1),nLevel+1);
             //*pS << sal_uInt8(END); //options
@@ -3066,8 +3066,8 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/)
 {
     if (pNode->GetToken().eType == TMLINE)
     {
-        *pS << sal_uInt8(END);
-        *pS << sal_uInt8(LINE);
+        pS->WriteUChar( sal_uInt8(END) );
+        pS->WriteUChar( sal_uInt8(LINE) );
         bIsReInterpBrace=1;
         return;
     }
@@ -3078,15 +3078,15 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/)
         if ((nArse == 0x2224) || (nArse == 0x2288) || (nArse == 0x2285) ||
             (nArse == 0x2289))
         {
-            *pS << sal_uInt8(CHAR|0x20);
+            pS->WriteUChar( sal_uInt8(CHAR|0x20) );
         }
         else if ((nPendingAttributes) &&
                 (i == ((pTemp->GetText().getLength()+1)/2)-1))
             {
-                *pS << sal_uInt8(0x22);
+                pS->WriteUChar( sal_uInt8(0x22) );
             }
         else
-            *pS << sal_uInt8(CHAR); //char without formula recognition
+            pS->WriteUChar( sal_uInt8(CHAR) ); //char without formula recognition
         //The typeface seems to be MTEXTRA for unicode characters,
         //though how to determine when mathtype chooses one over
         //the other is unknown. This should do the trick
@@ -3110,62 +3110,62 @@ void MathType::HandleMath(SmNode *pNode, int /*nLevel*/)
         else
             nBias = 0x3; //typeface
 
-        *pS << sal_uInt8(nSpec+nBias+128); //typeface
+        pS->WriteUChar( sal_uInt8(nSpec+nBias+128) ); //typeface
 
         if (nArse == 0x2224)
         {
-            *pS << sal_uInt16(0x7C);
-            *pS << sal_uInt8(EMBEL);
-            *pS << sal_uInt8(0x0A);
-            *pS << sal_uInt8(END); //end embel
-            *pS << sal_uInt8(END); //end embel
+            pS->WriteUInt16( sal_uInt16(0x7C) );
+            pS->WriteUChar( sal_uInt8(EMBEL) );
+            pS->WriteUChar( sal_uInt8(0x0A) );
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
         }
         else if (nArse == 0x2225)
-            *pS << sal_uInt16(0xEC09);
+            pS->WriteUInt16( sal_uInt16(0xEC09) );
         else if (nArse == 0xE421)
-            *pS << sal_uInt16(0x2265);
+            pS->WriteUInt16( sal_uInt16(0x2265) );
         else if (nArse == 0x230A)
-            *pS << sal_uInt16(0xF8F0);
+            pS->WriteUInt16( sal_uInt16(0xF8F0) );
         else if (nArse == 0x230B)
-            *pS << sal_uInt16(0xF8FB);
+            pS->WriteUInt16( sal_uInt16(0xF8FB) );
         else if (nArse == 0xE425)
-            *pS << sal_uInt16(0x2264);
+            pS->WriteUInt16( sal_uInt16(0x2264) );
         else if (nArse == 0x226A)
         {
-            *pS << sal_uInt16(0x3C);
-            *pS << sal_uInt8(CHAR);
-            *pS << sal_uInt8(0x98);
-            *pS << sal_uInt16(0xEB01);
-            *pS << sal_uInt8(CHAR);
-            *pS << sal_uInt8(0x86);
-            *pS << sal_uInt16(0x3c);
+            pS->WriteUInt16( sal_uInt16(0x3C) );
+            pS->WriteUChar( sal_uInt8(CHAR) );
+            pS->WriteUChar( sal_uInt8(0x98) );
+            pS->WriteUInt16( sal_uInt16(0xEB01) );
+            pS->WriteUChar( sal_uInt8(CHAR) );
+            pS->WriteUChar( sal_uInt8(0x86) );
+            pS->WriteUInt16( sal_uInt16(0x3c) );
         }
         else if (nArse == 0x2288)
         {
-            *pS << sal_uInt16(0x2286);
-            *pS << sal_uInt8(EMBEL);
-            *pS << sal_uInt8(0x0A);
-            *pS << sal_uInt8(END); //end embel
-            *pS << sal_uInt8(END); //end embel
+            pS->WriteUInt16( sal_uInt16(0x2286) );
+            pS->WriteUChar( sal_uInt8(EMBEL) );
+            pS->WriteUChar( sal_uInt8(0x0A) );
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
         }
         else if (nArse == 0x2289)
         {
-            *pS << sal_uInt16(0x2287);
-            *pS << sal_uInt8(EMBEL);
-            *pS << sal_uInt8(0x0A);
-            *pS << sal_uInt8(END); //end embel
-            *pS << sal_uInt8(END); //end embel
+            pS->WriteUInt16( sal_uInt16(0x2287) );
+            pS->WriteUChar( sal_uInt8(EMBEL) );
+            pS->WriteUChar( sal_uInt8(0x0A) );
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
         }
         else if (nArse == 0x2285)
         {
-            *pS << sal_uInt16(0x2283);
-            *pS << sal_uInt8(EMBEL);
-            *pS << sal_uInt8(0x0A);
-            *pS << sal_uInt8(END); //end embel
-            *pS << sal_uInt8(END); //end embel
+            pS->WriteUInt16( sal_uInt16(0x2283) );
+            pS->WriteUChar( sal_uInt8(EMBEL) );
+            pS->WriteUChar( sal_uInt8(0x0A) );
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
         }
         else
-            *pS << nArse;
+            pS->WriteUInt16( nArse );
     }
     nPendingAttributes = 0;
 }
@@ -3248,33 +3248,33 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
             case TCIRCLE: //Not Exportable
                 break;
             case TCDOT:
-                *pS << sal_uInt8(2);
+                pS->WriteUChar( sal_uInt8(2) );
                 break;
             case TDDOT:
-                *pS << sal_uInt8(3);
+                pS->WriteUChar( sal_uInt8(3) );
                 break;
             case TDDDOT:
-                *pS << sal_uInt8(4);
+                pS->WriteUChar( sal_uInt8(4) );
                 break;
             case TTILDE:
-                *pS << sal_uInt8(8);
+                pS->WriteUChar( sal_uInt8(8) );
                 break;
             case THAT:
-                *pS << sal_uInt8(9);
+                pS->WriteUChar( sal_uInt8(9) );
                 break;
             case TVEC:
-                *pS << sal_uInt8(11);
+                pS->WriteUChar( sal_uInt8(11) );
                 break;
             case TOVERSTRIKE:
-                *pS << sal_uInt8(16);
+                pS->WriteUChar( sal_uInt8(16) );
                 break;
             case TOVERLINE:
                 if ((pIsText->GetToken().eType == TTEXT) &&
                     (pIsText->GetText().getLength() == 1))
-                    *pS << sal_uInt8(17);
+                    pS->WriteUChar( sal_uInt8(17) );
                 break;
             case TBREVE:
-                *pS << sal_uInt8(20);
+                pS->WriteUChar( sal_uInt8(20) );
                 break;
             case TWIDEVEC:
             case TUNDERLINE:
@@ -3282,10 +3282,10 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
             case TWIDEHAT:
                 break;
             case TBAR:
-                *pS << sal_uInt8(17);
+                pS->WriteUChar( sal_uInt8(17) );
                 break;
             default:
-                *pS << sal_uInt8(0x2);
+                pS->WriteUChar( sal_uInt8(0x2) );
                 break;
             }
         pS->Seek(nPos);
@@ -3301,20 +3301,20 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/)
         if ((nPendingAttributes) &&
             (i == ((pTemp->GetText().getLength()+1)/2)-1))
         {
-            *pS << sal_uInt8(0x22);     //char, with attributes right
+            pS->WriteUChar( sal_uInt8(0x22) );     //char, with attributes right
                                 //after the character
         }
         else
-            *pS << sal_uInt8(CHAR);
+            pS->WriteUChar( sal_uInt8(CHAR) );
 
         sal_uInt8 nFace = 0x1;
         if (pNode->GetFont().GetItalic() == ITALIC_NORMAL)
             nFace = 0x3;
         else if (pNode->GetFont().GetWeight() == WEIGHT_BOLD)
             nFace = 0x7;
-        *pS << sal_uInt8(nFace+128); //typeface
+        pS->WriteUChar( sal_uInt8(nFace+128) ); //typeface
         sal_uInt16 nChar = pTemp->GetText()[i];
-        *pS << SmTextNode::ConvertSymbolToUnicode(nChar);
+        pS->WriteUInt16( SmTextNode::ConvertSymbolToUnicode(nChar) );
 
         //Mathtype can only have these sort of character
         //attributes on a single character, starmath can put them
@@ -3331,17 +3331,17 @@ void MathType::HandleText(SmNode *pNode, int /*nLevel*/)
         if ((nPendingAttributes) &&
             (i == ((pTemp->GetText().getLength()+1)/2)-1))
         {
-            *pS << sal_uInt8(EMBEL);
+            pS->WriteUChar( sal_uInt8(EMBEL) );
             while (nPendingAttributes)
             {
-                *pS << sal_uInt8(2);
+                pS->WriteUChar( sal_uInt8(2) );
                 //wedge the attributes in here and clear
                 //the pending stack
                 nPendingAttributes--;
             }
             nInsertion=pS->Tell();
-            *pS << sal_uInt8(END); //end embel
-            *pS << sal_uInt8(END); //end embel
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
+            pS->WriteUChar( sal_uInt8(END) ); //end embel
         }
     }
 }