convert SvStream::operator>> methods to ReadXXX methods

First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".

Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

10 files changed, 169 insertions, 172 deletions

diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 24cc1a868fa1..29a0a87d67c1 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -405,10 +405,10 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobal
 
     // First check what type of Object...
     sal_uInt16 nWhich;
-    rIStream >> nWhich;
+    rIStream.ReadUInt16( nWhich );
 
     sal_uInt32 nStructSz;
-    rIStream >> nStructSz;
+    rIStream.ReadUInt32( nStructSz );
 
     if (nWhich != EE_FORMAT_BIN)
     {
@@ -1272,13 +1272,13 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const
 
 void EditTextObjectImpl::CreateData( SvStream& rIStream )
 {
-    rIStream >> nVersion;
+    rIStream.ReadUInt16( nVersion );
 
     // The text object was first created with the current setting of
     // pTextObjectPool.
     sal_Bool bOwnerOfCurrent = bOwnerOfPool;
     sal_Bool b;
-    rIStream >> b;
+    rIStream.ReadUChar( b );
     bOwnerOfPool = b;
 
     if ( bOwnerOfCurrent && !bOwnerOfPool )
@@ -1298,13 +1298,13 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
 
     // CharSet, in which it was saved:
     sal_uInt16 nCharSet;
-    rIStream >> nCharSet;
+    rIStream.ReadUInt16( nCharSet );
 
     rtl_TextEncoding eSrcEncoding = GetSOLoadTextEncoding( (rtl_TextEncoding)nCharSet );
 
     // The number of paragraphs ...
     sal_uInt16 nParagraphs;
-    rIStream >> nParagraphs;
+    rIStream.ReadUInt16( nParagraphs );
 
     // The individual paragraphs ...
     for ( sal_uLong nPara = 0; nPara < nParagraphs; nPara++ )
@@ -1318,7 +1318,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
         // StyleName and Family...
         pC->GetStyle() = rIStream.ReadUniOrByteString(eSrcEncoding);
         sal_uInt16 nStyleFamily;
-        rIStream >> nStyleFamily;
+        rIStream.ReadUInt16( nStyleFamily );
         pC->GetFamily() = (SfxStyleFamily)nStyleFamily;
 
         // Paragraph attributes ...
@@ -1326,7 +1326,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
 
         // The number of attributes ...
         sal_uInt16 nTmp16;
-        rIStream >> nTmp16;
+        rIStream.ReadUInt16( nTmp16 );
         size_t nAttribs = nTmp16;
 
         // And the individual attributes
@@ -1338,11 +1338,11 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
             sal_uInt16 _nWhich, nStart, nEnd;
             const SfxPoolItem* pItem;
 
-            rIStream >> _nWhich;
+            rIStream.ReadUInt16( _nWhich );
             _nWhich = pPool->GetNewWhich( _nWhich );
             pItem = pPool->LoadSurrogate( rIStream, _nWhich, 0 );
-            rIStream >> nStart;
-            rIStream >> nEnd;
+            rIStream.ReadUInt16( nStart );
+            rIStream.ReadUInt16( nEnd );
             if ( pItem )
             {
                 if ( pItem->Which() == EE_FEATURE_NOTCONV )
@@ -1464,7 +1464,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
     if ( nVersion >= 400 )
     {
         sal_uInt16 nTmpMetric;
-        rIStream >> nTmpMetric;
+        rIStream.ReadUInt16( nTmpMetric );
         if ( nVersion >= 401 )
         {
             // In the 400 there was a bug in text objects with the own Pool,
@@ -1477,23 +1477,23 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
 
     if ( nVersion >= 600 )
     {
-        rIStream >> nUserType;
-        rIStream >> nObjSettings;
+        rIStream.ReadUInt16( nUserType );
+        rIStream.ReadUInt32( nObjSettings );
     }
 
     if ( nVersion >= 601 )
     {
         sal_Bool bTmp;
-        rIStream >> bTmp;
+        rIStream.ReadUChar( bTmp );
         bVertical = bTmp;
     }
 
     if ( nVersion >= 602 )
     {
-        rIStream >> nScriptType;
+        rIStream.ReadUInt16( nScriptType );
 
         sal_Bool bUnicodeStrings;
-        rIStream >> bUnicodeStrings;
+        rIStream.ReadUChar( bUnicodeStrings );
         if ( bUnicodeStrings )
         {
             for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
@@ -1502,7 +1502,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
                 sal_uInt16 nL;
 
                 // Text
-                rIStream >> nL;
+                rIStream.ReadUInt16( nL );
                 if ( nL )
                 {
                     rtl_uString *pStr = rtl_uString_alloc(nL);
@@ -1511,7 +1511,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
                 }
 
                 // StyleSheetName
-                rIStream >> nL;
+                rIStream.ReadUInt16( nL );
                 if ( nL )
                 {
                     rtl_uString *pStr = rtl_uString_alloc(nL);
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index d7af9a2e584b..52d2f99a181f 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -67,18 +67,18 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
     Color aColor;
     ReadColor( rStream, aColor );    aFont.SetColor( aColor );
     sal_uInt16 nTemp;
-    rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetFamily((FontFamily)nTemp);
 
-    rStream >> nTemp;
+    rStream.ReadUInt16( nTemp );
     nTemp = (sal_uInt16)GetSOLoadTextEncoding((rtl_TextEncoding)nTemp);
     aFont.SetCharSet((rtl_TextEncoding)nTemp);
 
-    rStream >> nTemp; aFont.SetPitch((FontPitch)nTemp);
-    rStream >> nTemp; aFont.SetAlign((FontAlign)nTemp);
-    rStream >> nTemp; aFont.SetWeight((FontWeight)nTemp);
-    rStream >> nTemp; aFont.SetUnderline((FontUnderline)nTemp);
-    rStream >> nTemp; aFont.SetStrikeout((FontStrikeout)nTemp);
-    rStream >> nTemp; aFont.SetItalic((FontItalic)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetPitch((FontPitch)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetAlign((FontAlign)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetWeight((FontWeight)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetUnderline((FontUnderline)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetStrikeout((FontStrikeout)nTemp);
+    rStream.ReadUInt16( nTemp ); aFont.SetItalic((FontItalic)nTemp);
 
     // UNICODE: rStream >> aName; aFont.SetName( aName );
     OUString aName = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
@@ -88,14 +88,14 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
     {
         //#fdo39428 SvStream no longer supports operator>>(long&)
         sal_Int32 nHeight(0), nWidth(0);
-        rStream >> nHeight; rStream >> nWidth; Size aSize( nWidth, nHeight );
+        rStream.ReadInt32( nHeight ); rStream.ReadInt32( nWidth ); Size aSize( nWidth, nHeight );
         aFont.SetSize( aSize );
     }
 
     sal_Bool bTemp;
-    rStream >> bTemp; aFont.SetOutline( bTemp );
-    rStream >> bTemp; aFont.SetShadow( bTemp );
-    rStream >> bTemp; aFont.SetTransparent( bTemp );
+    rStream.ReadUChar( bTemp ); aFont.SetOutline( bTemp );
+    rStream.ReadUChar( bTemp ); aFont.SetShadow( bTemp );
+    rStream.ReadUChar( bTemp ); aFont.SetTransparent( bTemp );
     return aFont;
 }
 
@@ -115,7 +115,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) :
     SfxPoolItem( _nWhich ),
     pGraphicObject( NULL )
 {
-    rStrm >> nStyle;
+    rStrm.ReadUInt16( nStyle );
 
     if( nStyle != BS_BMP )
         aFont = CreateFont( rStrm, BULITEM_VERSION );
@@ -145,16 +145,16 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) :
 
     //#fdo39428 SvStream no longer supports operator>>(long&)
     sal_Int32 nTmp(0);
-    rStrm >> nTmp; nWidth = nTmp;
-    rStrm >> nStart;
-    rStrm >> nJustify;
+    rStrm.ReadInt32( nTmp ); nWidth = nTmp;
+    rStrm.ReadUInt16( nStart );
+    rStrm.ReadUChar( nJustify );
 
     char cTmpSymbol;
-    rStrm >> cTmpSymbol;
+    rStrm.ReadChar( cTmpSymbol );
     //convert single byte to unicode
     cSymbol = OUString(&cTmpSymbol, 1, aFont.GetCharSet()).toChar();
 
-    rStrm >> nScale;
+    rStrm.ReadUInt16( nScale );
 
     // UNICODE: rStrm >> aPrevText;
     aPrevText = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index cd86e0ebc47c..9887a5a72105 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -417,9 +417,9 @@ void SvxDateField::Load( SvPersistStream & rStm )
 {
     sal_uInt16 nType, nFormat;
 
-    rStm >> nFixDate;
-    rStm >> nType;
-    rStm >> nFormat;
+    rStm.ReadUInt32( nFixDate );
+    rStm.ReadUInt16( nType );
+    rStm.ReadUInt16( nFormat );
 
     eType = (SvxDateType)nType;
     eFormat= (SvxDateFormat)nFormat;
@@ -564,7 +564,7 @@ static OUString read_unicode( SvPersistStream & rStm )
 {
     rtl_uString *pStr = NULL;
     sal_uInt16 nL = 0;
-    rStm >> nL;
+    rStm.ReadUInt16( nL );
     if ( nL )
     {
         pStr = rtl_uString_alloc(nL);
@@ -579,7 +579,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
 {
     sal_uInt16 nFormat = 0;
 
-    rStm >> nFormat;
+    rStm.ReadUInt16( nFormat );
     eFormat= (SvxURLFormat)nFormat;
 
     aURL = read_unicode( rStm );
@@ -798,8 +798,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
     sal_uInt16 nType, nFormat;
 
     rStm.ReadInt64(m_nFixTime);
-    rStm >> nType;
-    rStm >> nFormat;
+    rStm.ReadUInt16( nType );
+    rStm.ReadUInt16( nFormat );
 
     eType = (SvxTimeType) nType;
     eFormat= (SvxTimeFormat) nFormat;
@@ -944,8 +944,8 @@ void SvxExtFileField::Load( SvPersistStream & rStm )
     // UNICODE: rStm >> aFile;
     aFile = rStm.ReadUniOrByteString(rStm.GetStreamCharSet());
 
-    rStm >> nType;
-    rStm >> nFormat;
+    rStm.ReadUInt16( nType );
+    rStm.ReadUInt16( nFormat );
 
     eType = (SvxFileType) nType;
     eFormat= (SvxFileFormat) nFormat;
@@ -1099,8 +1099,8 @@ void SvxAuthorField::Load( SvPersistStream & rStm )
     aFirstName = read_unicode( rStm );
     aShortName = read_unicode( rStm );
 
-    rStm >> nType;
-    rStm >> nFormat;
+    rStm.ReadUInt16( nType );
+    rStm.ReadUInt16( nFormat );
 
     eType = (SvxAuthorType) nType;
     eFormat= (SvxAuthorFormat) nFormat;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index d07ffd293e4b..6eb012ad26e0 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -125,10 +125,10 @@ namespace
         sal_uInt16 nOutline, nInline, nDistance;
         sal_uInt16 nStyle = NONE;
         Color aColor;
-        ReadColor( stream, aColor ) >> nOutline >> nInline >> nDistance;
+        ReadColor( stream, aColor ).ReadUInt16( nOutline ).ReadUInt16( nInline ).ReadUInt16( nDistance );
 
         if (version >= BORDER_LINE_WITH_STYLE_VERSION)
-            stream >> nStyle;
+            stream.ReadUInt16( nStyle );
 
         SvxBorderLine border(&aColor);
         border.GuessLinesWidths(nStyle, nOutline, nInline, nDistance);
@@ -178,7 +178,7 @@ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 nBin;
-    rStrm >> nBin;
+    rStrm.ReadSChar( nBin );
     return new SvxPaperBinItem( Which(), nBin );
 }
 
@@ -399,7 +399,7 @@ SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     //#fdo39428 SvStream no longer supports operator>>(long&)
     sal_Int32 nWidth(0), nHeight(0);
-    rStrm >> nWidth >> nHeight;
+    rStrm.ReadInt32( nWidth ).ReadInt32( nHeight );
 
     SvxSizeItem* pAttr = new SvxSizeItem( Which() );
     pAttr->SetSize(Size(nWidth, nHeight));
@@ -739,15 +739,14 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
 
     if ( nVersion >= LRSPACE_AUTOFIRST_VERSION )
     {
-        rStrm >> left >> prpleft >> right >> prpright >> firstline >>
-                 prpfirstline >> txtleft >> autofirst;
+        rStrm.ReadUInt16( left ).ReadUInt16( prpleft ).ReadUInt16( right ).ReadUInt16( prpright ).ReadInt16( firstline ).                 ReadUInt16( prpfirstline ).ReadUInt16( txtleft ).ReadSChar( autofirst );
 
         sal_uInt32 nPos = rStrm.Tell();
         sal_uInt32 nMarker;
-        rStrm >> nMarker;
+        rStrm.ReadUInt32( nMarker );
         if ( nMarker == BULLETLR_MARKER )
         {
-            rStrm >> firstline;
+            rStrm.ReadInt16( firstline );
             if ( firstline < 0 )
                 left = left + static_cast<sal_uInt16>(firstline);   // see below: txtleft = ...
         }
@@ -756,18 +755,16 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
     }
     else if ( nVersion == LRSPACE_TXTLEFT_VERSION )
     {
-        rStrm >> left >> prpleft >> right >> prpright >> firstline >>
-                 prpfirstline >> txtleft;
+        rStrm.ReadUInt16( left ).ReadUInt16( prpleft ).ReadUInt16( right ).ReadUInt16( prpright ).ReadInt16( firstline ).                 ReadUInt16( prpfirstline ).ReadUInt16( txtleft );
     }
     else if ( nVersion == LRSPACE_16_VERSION )
     {
-        rStrm >> left >> prpleft >> right >> prpright >> firstline >>
-                 prpfirstline;
+        rStrm.ReadUInt16( left ).ReadUInt16( prpleft ).ReadUInt16( right ).ReadUInt16( prpright ).ReadInt16( firstline ).                 ReadUInt16( prpfirstline );
     }
     else
     {
         sal_Int8 nL, nR, nFL;
-        rStrm >> left >> nL >> right >> nR >> firstline >> nFL;
+        rStrm.ReadUInt16( left ).ReadSChar( nL ).ReadUInt16( right ).ReadSChar( nR ).ReadInt16( firstline ).ReadSChar( nFL );
         prpleft = (sal_uInt16)nL;
         prpright = (sal_uInt16)nR;
         prpfirstline = (sal_uInt16)nFL;
@@ -787,10 +784,10 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
     if( nVersion >= LRSPACE_NEGATIVE_VERSION && ( autofirst & 0x80 ) )
     {
         sal_Int32 nMargin;
-        rStrm >> nMargin;
+        rStrm.ReadInt32( nMargin );
         pAttr->nLeftMargin = nMargin;
         pAttr->nTxtLeft = firstline >= 0 ? nMargin : nMargin - firstline;
-        rStrm >> nMargin;
+        rStrm.ReadInt32( nMargin );
         pAttr->nRightMargin = nMargin;
     }
     return pAttr;
@@ -1042,11 +1039,11 @@ SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
     sal_uInt16 upper, lower, nPL = 0, nPU = 0;
 
     if ( nVersion == ULSPACE_16_VERSION )
-        rStrm >> upper >> nPU >> lower >> nPL;
+        rStrm.ReadUInt16( upper ).ReadUInt16( nPU ).ReadUInt16( lower ).ReadUInt16( nPL );
     else
     {
         sal_Int8 nU, nL;
-        rStrm >> upper >> nU >> lower >> nL;
+        rStrm.ReadUInt16( upper ).ReadSChar( nU ).ReadUInt16( lower ).ReadSChar( nL );
         nPL = (sal_uInt16)nL;
         nPU = (sal_uInt16)nU;
     }
@@ -1102,7 +1099,7 @@ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c
 SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsPrint;
-    rStrm >> bIsPrint;
+    rStrm.ReadSChar( bIsPrint );
     return new SvxPrintItem( Which(), sal_Bool( bIsPrint != 0 ) );
 }
 
@@ -1157,7 +1154,7 @@ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsOpaque;
-    rStrm >> bIsOpaque;
+    rStrm.ReadSChar( bIsOpaque );
     return new SvxOpaqueItem( Which(), sal_Bool( bIsOpaque != 0 ) );
 }
 
@@ -1302,7 +1299,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 cFlags;
-    rStrm >> cFlags;
+    rStrm.ReadSChar( cFlags );
     SvxProtectItem* pAttr = new SvxProtectItem( Which() );
     pAttr->SetPosProtect( sal_Bool( ( cFlags & 0x01 ) != 0 ) );
     pAttr->SetSizeProtect( sal_Bool(  ( cFlags & 0x02 ) != 0 ) );
@@ -1570,10 +1567,10 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const
     Color aColor;
     Color aFillColor;
     sal_Int8 nStyle;
-    rStrm >> cLoc >> _nWidth
-          >> bTrans;
+    rStrm.ReadSChar( cLoc ).ReadUInt16( _nWidth )
+         .ReadUChar( bTrans );
     ReadColor( rStrm, aColor );
-    ReadColor( rStrm, aFillColor ) >> nStyle;
+    ReadColor( rStrm, aFillColor ).ReadSChar( nStyle );
     aColor.SetTransparency(bTrans ? 0xff : 0);
     return new SvxShadowItem( Which(), &aColor, _nWidth, (SvxShadowLocation)cLoc );
 }
@@ -2305,7 +2302,7 @@ bool SvxBoxItem::HasMetrics() const
 SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
 {
     sal_uInt16 nDistance;
-    rStrm >> nDistance;
+    rStrm.ReadUInt16( nDistance );
     SvxBoxItem* pAttr = new SvxBoxItem( Which() );
 
     sal_uInt16 aLineMap[4] = { BOX_LINE_TOP, BOX_LINE_LEFT,
@@ -2314,7 +2311,7 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
     sal_Int8 cLine;
     while( true )
     {
-        rStrm >> cLine;
+        rStrm.ReadSChar( cLine );
 
         if( cLine > 3 )
             break;
@@ -2328,7 +2325,7 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
         for( sal_uInt16 i=0; i < 4; i++ )
         {
             sal_uInt16 nDist;
-            rStrm >> nDist;
+            rStrm.ReadUInt16( nDist );
             pAttr->SetDistance( nDist, aLineMap[i] );
         }
     }
@@ -2674,7 +2671,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 cFlags;
     sal_uInt16 _nDefDist;
-    rStrm >> cFlags >> _nDefDist;
+    rStrm.ReadSChar( cFlags ).ReadUInt16( _nDefDist );
 
     SvxBoxInfoItem* pAttr = new SvxBoxInfoItem( Which() );
 
@@ -2686,13 +2683,13 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
     while( true )
     {
         sal_Int8 cLine;
-        rStrm >> cLine;
+        rStrm.ReadSChar( cLine );
 
         if( cLine > 1 )
             break;
         short nOutline, nInline, nDistance;
         Color aColor;
-        ReadColor( rStrm, aColor ) >> nOutline >> nInline >> nDistance;
+        ReadColor( rStrm, aColor ).ReadInt16( nOutline ).ReadInt16( nInline ).ReadInt16( nDistance );
         SvxBorderLine aBorder( &aColor );
         aBorder.GuessLinesWidths(NONE, nOutline, nInline, nDistance);
 
@@ -3063,9 +3060,9 @@ sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
 SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
     sal_Int8 eBreak, bDummy;
-    rStrm >> eBreak;
+    rStrm.ReadSChar( eBreak );
     if( FMTBREAK_NOAUTO > nVersion )
-        rStrm >> bDummy;
+        rStrm.ReadSChar( bDummy );
     return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() );
 }
 
@@ -3096,7 +3093,7 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsKeep;
-    rStrm >> bIsKeep;
+    rStrm.ReadSChar( bIsKeep );
     return new SvxFmtKeepItem( sal_Bool( bIsKeep != 0 ), Which() );
 }
 
@@ -3321,7 +3318,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
     short        nOutline, nInline, nDistance;
     Color        aColor;
 
-    ReadColor( rStrm, aColor ) >> nOutline >> nInline >> nDistance;
+    ReadColor( rStrm, aColor ).ReadInt16( nOutline ).ReadInt16( nInline ).ReadInt16( nDistance );
     if( nOutline )
     {
         SvxBorderLine aLine( &aColor );
@@ -3476,10 +3473,10 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
     Color aTempFillColor;
     sal_Int8 nStyle;
 
-    rStream >> bTrans;
+    rStream.ReadUChar( bTrans );
     ReadColor( rStream, aTempColor );
     ReadColor( rStream, aTempFillColor );
-    rStream >> nStyle;
+    rStream.ReadSChar( nStyle );
 
     switch ( nStyle )
     {
@@ -3532,7 +3529,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
         sal_uInt16 nDoLoad = 0;
         sal_Int8 nPos;
 
-        rStream >> nDoLoad;
+        rStream.ReadUInt16( nDoLoad );
 
         if ( nDoLoad & LOAD_GRAPHIC )
         {
@@ -3567,7 +3564,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
             maStrFilter = rStream.ReadUniOrByteString(rStream.GetStreamCharSet());
         }
 
-        rStream >> nPos;
+        rStream.ReadSChar( nPos );
 
         eGraphicPos = (SvxGraphicPosition)nPos;
     }
@@ -4211,7 +4208,7 @@ SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/ ) const
 {
     sal_uInt16 nValue;
-    rStrm >> nValue;
+    rStrm.ReadUInt16( nValue );
     return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
 }
 
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index 038beffea56a..827edd7bcc86 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -184,7 +184,7 @@ SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
 SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
-    rStream >> nVal;
+    rStream.ReadUInt16( nVal );
     return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() );
 }
 
@@ -330,7 +330,7 @@ SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
 SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
-    rStream >> nVal;
+    rStream.ReadUInt16( nVal );
     return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() );
 }
 
@@ -422,7 +422,7 @@ SfxPoolItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const
 SfxPoolItem* SvxJustifyMethodItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
-    rStream >> nVal;
+    rStream.ReadUInt16( nVal );
     return new SvxJustifyMethodItem( (SvxCellJustifyMethod)nVal, Which() );
 }
 
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 528142cd9066..8a87a64642e3 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -181,36 +181,36 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
 {
     sal_uInt16 nTmp16;
     sal_Int32  nTmp32;
-    rStream >> nTmp16; // Version number
+    rStream.ReadUInt16( nTmp16 ); // Version number
 
-    rStream >> nTmp16; SetNumberingType( nTmp16 );
-    rStream >> nTmp16; eNumAdjust = ( SvxAdjust )nTmp16;
-    rStream >> nTmp16; nInclUpperLevels = nTmp16;
-    rStream >> nStart;
-    rStream >> nTmp16; cBullet = (sal_Unicode)nTmp16;
+    rStream.ReadUInt16( nTmp16 ); SetNumberingType( nTmp16 );
+    rStream.ReadUInt16( nTmp16 ); eNumAdjust = ( SvxAdjust )nTmp16;
+    rStream.ReadUInt16( nTmp16 ); nInclUpperLevels = nTmp16;
+    rStream.ReadUInt16( nStart );
+    rStream.ReadUInt16( nTmp16 ); cBullet = (sal_Unicode)nTmp16;
 
-    rStream >> nFirstLineOffset;
-    rStream >> nAbsLSpace;
-    rStream >> nLSpace;
+    rStream.ReadInt16( nFirstLineOffset );
+    rStream.ReadInt16( nAbsLSpace );
+    rStream.ReadInt16( nLSpace );
 
-    rStream >> nCharTextDistance;
+    rStream.ReadInt16( nCharTextDistance );
 
     sPrefix = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
     sSuffix = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
     sCharStyleName = rStream.ReadUniOrByteString( rStream.GetStreamCharSet() );
 
     sal_uInt16 hasGraphicBrush = 0;
-    rStream >> hasGraphicBrush;
+    rStream.ReadUInt16( hasGraphicBrush );
     if ( hasGraphicBrush )
     {
         pGraphicBrush = new SvxBrushItem( SID_ATTR_BRUSH );
         pGraphicBrush = (SvxBrushItem*)(pGraphicBrush->Create( rStream, BRUSH_GRAPHIC_VERSION ));
     }
     else pGraphicBrush = 0;
-    rStream >> nTmp16; eVertOrient = nTmp16;
+    rStream.ReadUInt16( nTmp16 ); eVertOrient = nTmp16;
 
     sal_uInt16 hasBulletFont = 0;
-    rStream >> hasBulletFont;
+    rStream.ReadUInt16( hasBulletFont );
     if ( hasBulletFont )
     {
         pBulletFont = new Font( );
@@ -220,14 +220,14 @@ SvxNumberFormat::SvxNumberFormat( SvStream &rStream )
     ReadPair( rStream, aGraphicSize );
 
     ReadColor( rStream, nBulletColor );
-    rStream >> nBulletRelSize;
-    rStream >> nTmp16; SetShowSymbol( nTmp16 );
+    rStream.ReadUInt16( nBulletRelSize );
+    rStream.ReadUInt16( nTmp16 ); SetShowSymbol( nTmp16 );
 
-    rStream >> nTmp16; mePositionAndSpaceMode = ( SvxNumPositionAndSpaceMode )nTmp16;
-    rStream >> nTmp16; meLabelFollowedBy = ( LabelFollowedBy )nTmp16;
-    rStream >> nTmp32; mnListtabPos = nTmp32;
-    rStream >> nTmp32; mnFirstLineIndent = nTmp32;
-    rStream >> nTmp32; mnIndentAt = nTmp32;
+    rStream.ReadUInt16( nTmp16 ); mePositionAndSpaceMode = ( SvxNumPositionAndSpaceMode )nTmp16;
+    rStream.ReadUInt16( nTmp16 ); meLabelFollowedBy = ( LabelFollowedBy )nTmp16;
+    rStream.ReadInt32( nTmp32 ); mnListtabPos = nTmp32;
+    rStream.ReadInt32( nTmp32 ); mnFirstLineIndent = nTmp32;
+    rStream.ReadInt32( nTmp32 ); mnIndentAt = nTmp32;
 
 }
 SvxNumberFormat::~SvxNumberFormat()
@@ -677,17 +677,17 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
 SvxNumRule::SvxNumRule( SvStream &rStream )
 {
     sal_uInt16 nTmp16;
-    rStream >> nTmp16; // NUM_ITEM_VERSION
-    rStream >> nLevelCount;
+    rStream.ReadUInt16( nTmp16 ); // NUM_ITEM_VERSION
+    rStream.ReadUInt16( nLevelCount );
 
     // first nFeatureFlags of old Versions
-    rStream >> nTmp16; nFeatureFlags = nTmp16;
-    rStream >> nTmp16; bContinuousNumbering = nTmp16;
-    rStream >> nTmp16; eNumberingType = ( SvxNumRuleType )nTmp16;
+    rStream.ReadUInt16( nTmp16 ); nFeatureFlags = nTmp16;
+    rStream.ReadUInt16( nTmp16 ); bContinuousNumbering = nTmp16;
+    rStream.ReadUInt16( nTmp16 ); eNumberingType = ( SvxNumRuleType )nTmp16;
 
     for (sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
     {
-        rStream >> nTmp16;
+        rStream.ReadUInt16( nTmp16 );
         sal_Bool hasNumberingFormat = nTmp16 & 1;
         aFmtsSet[i] = nTmp16 & 2; // fdo#68648 reset flag
         if ( hasNumberingFormat ){
@@ -700,7 +700,7 @@ SvxNumRule::SvxNumRule( SvStream &rStream )
         }
     }
     //second nFeatureFlags for new versions
-    rStream >> nTmp16; nFeatureFlags = nTmp16;
+    rStream.ReadUInt16( nTmp16 ); nFeatureFlags = nTmp16;
 }
 
 SvxNumRule* SvxNumRule::Create( SvStream & rStream )
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 3cb1f4ce7882..0fcb3d31b32a 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -171,7 +171,7 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
 SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt8 _nMinLead, _nMinTrail;
-    rStrm >> _nMinLead >> _nMinTrail;
+    rStrm.ReadUChar( _nMinLead ).ReadUChar( _nMinTrail );
     SfxHyphenRegionItem* pAttr = new SfxHyphenRegionItem( Which() );
     pAttr->GetMinLead() = _nMinLead;
     pAttr->GetMinTrail() = _nMinTrail;
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 9bf4746439ee..3ecd59d08b45 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -260,11 +260,11 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const
     sal_uInt16  nHeight;
     sal_Int8    nRule, nInterRule;
 
-    rStrm >> nPropSpace
-          >> nInterSpace
-          >> nHeight
-          >> nRule
-          >> nInterRule;
+    rStrm.ReadSChar( nPropSpace )
+         .ReadInt16( nInterSpace )
+         .ReadUInt16( nHeight )
+         .ReadSChar( nRule )
+         .ReadSChar( nInterRule );
 
     SvxLineSpacingItem* pAttr = new SvxLineSpacingItem( nHeight, Which() );
     pAttr->SetInterLineSpace( nInterSpace );
@@ -492,12 +492,12 @@ sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const
 SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const
 {
     char eAdjustment;
-    rStrm >> eAdjustment;
+    rStrm.ReadChar( eAdjustment );
     SvxAdjustItem *pRet = new SvxAdjustItem( (SvxAdjust)eAdjustment, Which() );
     if( nVersion >= ADJUST_LASTBLOCK_VERSION )
     {
         sal_Int8 nFlags;
-        rStrm >> nFlags;
+        rStrm.ReadSChar( nFlags );
         pRet->bOneBlock = 0 != (nFlags & 0x0001);
         pRet->bLastCenter = 0 != (nFlags & 0x0002);
         pRet->bLastBlock = 0 != (nFlags & 0x0004);
@@ -543,7 +543,7 @@ SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Int8 nLines;
-    rStrm >> nLines;
+    rStrm.ReadSChar( nLines );
     return new SvxWidowsItem( nLines, Which() );
 }
 
@@ -614,7 +614,7 @@ SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Int8 nLines;
-    rStrm >> nLines;
+    rStrm.ReadSChar( nLines );
     return new SvxOrphansItem( nLines, Which() );
 }
 
@@ -811,7 +811,7 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Int8 _bHyphen, _bHyphenPageEnd;
     sal_Int8 _nMinLead, _nMinTrail, _nMaxHyphens;
-    rStrm >> _bHyphen >> _bHyphenPageEnd >> _nMinLead >> _nMinTrail >> _nMaxHyphens;
+    rStrm.ReadSChar( _bHyphen ).ReadSChar( _bHyphenPageEnd ).ReadSChar( _nMinLead ).ReadSChar( _nMinTrail ).ReadSChar( _nMaxHyphens );
     SvxHyphenZoneItem* pAttr = new SvxHyphenZoneItem( sal_False, Which() );
     pAttr->SetHyphen( sal_Bool( _bHyphen != 0 ) );
     pAttr->SetPageEnd( sal_Bool( _bHyphenPageEnd != 0 ) );
@@ -1141,7 +1141,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
 SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 nTabs;
-    rStrm >> nTabs;
+    rStrm.ReadSChar( nTabs );
     SvxTabStopItem* pAttr =
         new SvxTabStopItem( 0, 0, SVX_TAB_ADJUST_DEFAULT, Which() );
 
@@ -1150,7 +1150,7 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const
         sal_Int32 nPos(0);
         sal_Int8 eAdjust;
         unsigned char cDecimal, cFill;
-        rStrm >> nPos >> eAdjust >> cDecimal >> cFill;
+        rStrm.ReadInt32( nPos ).ReadSChar( eAdjust ).ReadUChar( cDecimal ).ReadUChar( cFill );
         if( !i || SVX_TAB_ADJUST_DEFAULT != eAdjust )
             pAttr->Insert( SvxTabStop
                 ( nPos, (SvxTabAdjust)eAdjust, sal_Unicode(cDecimal), sal_Unicode(cFill) ) );
@@ -1265,7 +1265,7 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Int8 bIsSplit;
-    rStrm >> bIsSplit;
+    rStrm.ReadSChar( bIsSplit );
     return new SvxFmtSplitItem( sal_Bool( bIsSplit != 0 ), Which() );
 }
 
@@ -1384,7 +1384,7 @@ SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool bFlag;
-    rStrm >> bFlag;
+    rStrm.ReadUChar( bFlag );
     return new SvxScriptSpaceItem( bFlag, Which() );
 }
 
@@ -1437,7 +1437,7 @@ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool nValue;
-    rStrm >> nValue;
+    rStrm.ReadUChar( nValue );
     return new SvxHangingPunctuationItem( nValue, Which() );
 }
 
@@ -1490,7 +1490,7 @@ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool nValue;
-    rStrm >> nValue;
+    rStrm.ReadUChar( nValue );
     return new SvxForbiddenRuleItem( nValue, Which() );
 }
 
@@ -1546,7 +1546,7 @@ SfxPoolItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const
 SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
-    rStrm >> nVal;
+    rStrm.ReadUInt16( nVal );
     return new SvxParaVertAlignItem( nVal, Which() );
 }
 
@@ -1632,7 +1632,7 @@ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_Bool bFlag;
-    rStrm >> bFlag;
+    rStrm.ReadUChar( bFlag );
     return new SvxParaGridItem( bFlag, Which() );
 }
 
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 82753f2f0b4a..493fcc1f0b46 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -39,7 +39,7 @@ bool SdrMeasureField::operator==(const SvxFieldData& rSrc) const
 void SdrMeasureField::Load(SvPersistStream& rIn)
 {
     sal_uInt16 nFieldKind;
-    rIn>>nFieldKind;
+    rIn.ReadUInt16( nFieldKind );
     eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
 }
 
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index ca05faec0fcd..19110d8028d4 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -402,9 +402,9 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding;
     OUString aName, aStyle;
-    rStrm >> _eFamily;
-    rStrm >> eFontPitch;
-    rStrm >> eFontTextEncoding;
+    rStrm.ReadUChar( _eFamily );
+    rStrm.ReadUChar( eFontPitch );
+    rStrm.ReadUChar( eFontTextEncoding );
 
     // UNICODE: rStrm >> aName;
     aName = rStrm.ReadUniOrByteString(rStrm.GetStreamCharSet());
@@ -422,7 +422,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
     // Check if we have stored unicode
     sal_Size nStreamPos = rStrm.Tell();
     sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
-    rStrm >> nMagic;
+    rStrm.ReadUInt32( nMagic );
     if ( nMagic == STORE_UNICODE_MAGIC_MARKER )
     {
         aName = rStrm.ReadUniOrByteString( RTL_TEXTENCODING_UNICODE );
@@ -504,7 +504,7 @@ SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nPosture;
-    rStrm >> nPosture;
+    rStrm.ReadUChar( nPosture );
     return new SvxPostureItem( (const FontItalic)nPosture, Which() );
 }
 
@@ -669,7 +669,7 @@ SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nWeight;
-    rStrm >> nWeight;
+    rStrm.ReadUChar( nWeight );
     return new SvxWeightItem( (FontWeight)nWeight, Which() );
 }
 
@@ -791,19 +791,19 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
 {
     sal_uInt16 nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
 
-    rStrm >> nsize;
+    rStrm.ReadUInt16( nsize );
 
     if( FONTHEIGHT_16_VERSION <= nVersion )
-        rStrm >> nprop;
+        rStrm.ReadUInt16( nprop );
     else
     {
         sal_uInt8 nP;
-        rStrm  >> nP;
+        rStrm .ReadUChar( nP );
         nprop = (sal_uInt16)nP;
     }
 
     if( FONTHEIGHT_UNIT_VERSION <= nVersion )
-        rStrm >> nPropUnit;
+        rStrm.ReadUInt16( nPropUnit );
 
     SvxFontHeightItem* pItem = new SvxFontHeightItem( nsize, 100, Which() );
     pItem->SetProp( nprop, (SfxMapUnit)nPropUnit );
@@ -1184,8 +1184,8 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
     sal_uInt16 nS;
     sal_uInt16 nP;
 
-    rStrm >> nS;
-    rStrm >> nP;
+    rStrm.ReadUInt16( nS );
+    rStrm.ReadUInt16( nP );
     SvxFontWidthItem* pItem = new SvxFontWidthItem( 0, nP, Which() );
     pItem->SetWidthValue( nS );
     return pItem;
@@ -1326,7 +1326,7 @@ SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
-    rStrm >> nState;
+    rStrm.ReadUChar( nState );
     return new SvxTextLineItem(  (FontUnderline)nState, Which() );
 }
 
@@ -1454,7 +1454,7 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
-    rStrm >> nState;
+    rStrm.ReadUChar( nState );
     return new SvxUnderlineItem(  (FontUnderline)nState, Which() );
 }
 
@@ -1487,7 +1487,7 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
-    rStrm >> nState;
+    rStrm.ReadUChar( nState );
     return new SvxOverlineItem(  (FontUnderline)nState, Which() );
 }
 
@@ -1554,7 +1554,7 @@ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*
 SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 eCross;
-    rStrm >> eCross;
+    rStrm.ReadUChar( eCross );
     return new SvxCrossedOutItem(  (FontStrikeout)eCross, Which() );
 }
 
@@ -1651,7 +1651,7 @@ SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
-    rStrm >> nState;
+    rStrm.ReadUChar( nState );
     return new SvxShadowedItem( nState, Which() );
 }
 
@@ -1712,7 +1712,7 @@ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
-    rStrm >> nState;
+    rStrm.ReadUChar( nState );
     return new SvxAutoKernItem( nState, Which() );
 }
 
@@ -1774,7 +1774,7 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio
 SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
-    rStrm >> bValue;
+    rStrm.ReadUChar( bValue );
     return new SvxWordLineModeItem( bValue, Which() );
 }
 
@@ -1835,7 +1835,7 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
-    rStrm >> bValue;
+    rStrm.ReadUChar( bValue );
     return new SvxContourItem( bValue, Which() );
 }
 
@@ -1896,7 +1896,7 @@ SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt16 nSize;
-    rStrm >> nSize;
+    rStrm.ReadUInt16( nSize );
     return new SvxPropSizeItem( nSize, Which() );
 }
 
@@ -2093,7 +2093,7 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 cSet;
     Color aColor;
-    rStrm >> cSet;
+    rStrm.ReadUChar( cSet );
     ReadColor( rStrm, aColor );
     return new SvxCharSetColorItem( aColor,  (rtl_TextEncoding)cSet, Which() );
 }
@@ -2154,7 +2154,7 @@ bool SvxKerningItem::HasMetrics() const
 SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     short nValue;
-    rStrm >> nValue;
+    rStrm.ReadInt16( nValue );
     return new SvxKerningItem( nValue, Which() );
 }
 
@@ -2253,7 +2253,7 @@ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
 SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 cMap;
-    rStrm >> cMap;
+    rStrm.ReadUChar( cMap );
     return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
 }
 
@@ -2394,7 +2394,7 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 _nProp;
     short _nEsc;
-    rStrm >> _nProp >> _nEsc;
+    rStrm.ReadUChar( _nProp ).ReadInt16( _nEsc );
     return new SvxEscapementItem( _nEsc, _nProp, Which() );
 }
 
@@ -2566,7 +2566,7 @@ SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt16 nValue;
-    rStrm >> nValue;
+    rStrm.ReadUInt16( nValue );
     return new SvxLanguageItem( (LanguageType)nValue, Which() );
 }
 
@@ -2666,7 +2666,7 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion
 SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_Bool bValue;
-    rStrm >> bValue;
+    rStrm.ReadUChar( bValue );
     return new SvxNoLinebreakItem( bValue, Which() );
 }
 
@@ -2711,7 +2711,7 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
 SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_Bool bValue;
-    rStrm >> bValue;
+    rStrm.ReadUChar( bValue );
     return new SvxNoHyphenItem( bValue, Which() );
 }
 
@@ -2799,7 +2799,7 @@ SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c
 SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
 {
     sal_uInt8 nState;
-    rStrm >> nState;
+    rStrm.ReadUChar( nState );
     return new SvxBlinkItem( nState, Which() );
 }
 
@@ -2862,7 +2862,7 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
 SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nValue;
-    rStrm >> nValue;
+    rStrm.ReadUInt16( nValue );
     return new SvxEmphasisMarkItem( (FontEmphasisMark)nValue, Which() );
 }
 
@@ -3104,7 +3104,7 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) con
 {
     sal_Bool _bOn;
     sal_Unicode cStart, cEnd;
-    rStrm >> _bOn >> cStart >> cEnd;
+    rStrm.ReadUChar( _bOn ).ReadUInt16( cStart ).ReadUInt16( cEnd );
     return new SvxTwoLinesItem( _bOn, cStart, cEnd, Which() );
 }
 
@@ -3145,7 +3145,7 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
     sal_Bool b;
-    rStrm >> nVal >> b;
+    rStrm.ReadUInt16( nVal ).ReadUChar( b );
     return new SvxCharRotateItem( nVal, b, Which() );
 }
 
@@ -3263,7 +3263,7 @@ SfxPoolItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const
 SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
     sal_uInt16 nVal;
-    rStrm >> nVal;
+    rStrm.ReadUInt16( nVal );
     SvxCharScaleWidthItem* pItem = new SvxCharScaleWidthItem( nVal, Which() );
 
     if ( Which() == EE_CHAR_FONTWIDTH )
@@ -3271,9 +3271,9 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, sal_uInt16 ) const
         // Was a SvxFontWidthItem in 5.2
         // sal_uInt16 nFixWidth, sal_uInt16 nPropWidth.
         // nFixWidth has never been used...
-        rStrm >> nVal;
+        rStrm.ReadUInt16( nVal );
         sal_uInt16 nTest;
-        rStrm >> nTest;
+        rStrm.ReadUInt16( nTest );
         if ( nTest == 0x1234 )
             pItem->SetValue( nVal );
         else
@@ -3373,7 +3373,7 @@ SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool * ) const
 SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const
 {
     sal_uInt16 nVal;
-    rStrm >> nVal;
+    rStrm.ReadUInt16( nVal );
     return new SvxCharReliefItem( (FontRelief)nVal, Which() );
 }