convert specialised SvStream::operator>> methods to ReadXXX methods

as preparation for converting the SvStream::operator>> methods on
primitive types

Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9
Reviewed-on: https://gerrit.libreoffice.org/7798
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

6 files changed, 22 insertions, 22 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index e2ac8f0d1fc3..9004f17299a8 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -270,11 +270,11 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign)
     rIn >> rDesign.m_bCreated;      // not used
     rIn >> rDesign.m_nButtonThema;
     rIn >> rDesign.m_bUserAttr;
-    rIn >> rDesign.m_aBackColor;
-    rIn >> rDesign.m_aTextColor;
-    rIn >> rDesign.m_aLinkColor;
-    rIn >> rDesign.m_aVLinkColor;
-    rIn >> rDesign.m_aALinkColor;
+    ReadColor( rIn, rDesign.m_aBackColor );
+    ReadColor( rIn, rDesign.m_aTextColor );
+    ReadColor( rIn, rDesign.m_aLinkColor );
+    ReadColor( rIn, rDesign.m_aVLinkColor );
+    ReadColor( rIn, rDesign.m_aALinkColor );
     rIn >> rDesign.m_bUseAttribs;
     rIn >> rDesign.m_bUseColor;
 
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 4340967ffbf9..bf9ddf2e7a44 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -214,7 +214,7 @@ public:
     }
 public:
 
-    friend SvStream& operator>>(SvStream& rIn, AnimationNode& rAtom);
+    friend SvStream& ReadAnimationNode(SvStream& rIn, AnimationNode& rAtom);
     friend SvStream& WriteAnimationNode(SvStream& rOut, AnimationNode& rAtom);
 };
 
diff --git a/sd/source/filter/ppt/pptatom.cxx b/sd/source/filter/ppt/pptatom.cxx
index 51afde39e573..69d964a7dba7 100644
--- a/sd/source/filter/ppt/pptatom.cxx
+++ b/sd/source/filter/ppt/pptatom.cxx
@@ -46,7 +46,7 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream )
                 && ( mrStream.Tell() < nStreamSize )
                 && ( mrStream.Tell() < maRecordHeader.GetRecEndFilePos() ) )
             {
-                mrStream >> aChildHeader;
+                ReadDffRecordHeader( mrStream, aChildHeader );
 
                 if( mrStream.GetError() == 0 )
                 {
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index e28dba65afc0..5398d39eba9c 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -129,7 +129,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto
     SvStream* pCurrentUserStream = rStorage.OpenSotStream( OUString( "Current User" ), STREAM_STD_READ );
     if( pCurrentUserStream )
     {
-        *pCurrentUserStream >> aParam.aCurrentUserAtom;
+        ReadPptCurrentUserAtom( *pCurrentUserStream, aParam.aCurrentUserAtom );
         delete pCurrentUserStream;
     }
 
@@ -760,7 +760,7 @@ sal_Bool ImplSdPPTImport::Import()
                     while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) )
                     {
                         DffRecordHeader aHd;
-                         rStCtrl >> aHd;
+                        ReadDffRecordHeader( rStCtrl, aHd );
                         switch( aHd.nRecType )
                         {
                             case PPT_PST_PPDrawing :
@@ -781,7 +781,7 @@ sal_Bool ImplSdPPTImport::Import()
                                             while( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aEscherObjListHd.GetRecEndFilePos() ) )
                                             {
                                                 DffRecordHeader aHd2;
-                                                rStCtrl >> aHd2;
+                                                ReadDffRecordHeader( rStCtrl, aHd2 );
                                                 if ( ( aHd2.nRecType == DFF_msofbtSpContainer ) || ( aHd2.nRecType == DFF_msofbtSpgrContainer ) )
                                                 {
                                                     if ( nObjCount++ )      // skipping the first object
@@ -812,7 +812,7 @@ sal_Bool ImplSdPPTImport::Import()
                                     while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aProgTagHd.GetRecEndFilePos() ) )
                                     {
                                         DffRecordHeader aProgTagContentHd;
-                                        rStCtrl >> aProgTagContentHd;
+                                        ReadDffRecordHeader( rStCtrl, aProgTagContentHd );
                                         switch( aProgTagContentHd.nRecType )
                                         {
                                             case DFF_msofbtAnimGroup :
@@ -918,7 +918,7 @@ sal_Bool ImplSdPPTImport::Import()
                     while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aPageHd.GetRecEndFilePos() ) )
                     {
                         DffRecordHeader aHd;
-                        rStCtrl >> aHd;
+                        ReadDffRecordHeader( rStCtrl, aHd );
                         switch ( aHd.nRecType )
                         {
                             case PPT_PST_ProgTags :
@@ -929,7 +929,7 @@ sal_Bool ImplSdPPTImport::Import()
                                     while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < aProgTagHd.GetRecEndFilePos() ) )
                                     {
                                         DffRecordHeader aProgTagContentHd;
-                                        rStCtrl >> aProgTagContentHd;
+                                        ReadDffRecordHeader( rStCtrl, aProgTagContentHd );
                                         switch( aProgTagContentHd.nRecType )
                                         {
                                             case DFF_msofbtAnimGroup :
@@ -1517,7 +1517,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
                 while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) )
                 {
                     DffRecordHeader aHd;
-                    rStCtrl >> aHd;
+                    ReadDffRecordHeader( rStCtrl, aHd );
                     switch ( aHd.nRecType )
                     {
                         case PPT_PST_SSSlideInfoAtom:
@@ -1980,7 +1980,7 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const
         while ( ( rStCtrl.Tell() < pHd->GetRecEndFilePos() ) && aRetVal.isEmpty() )
         {
             DffRecordHeader aHdMovie;
-            rStCtrl >> aHdMovie;
+            ReadDffRecordHeader( rStCtrl, aHdMovie );
             switch( aHdMovie.nRecType )
             {
                 case PPT_PST_ExAviMovie :
@@ -2000,7 +2000,7 @@ OUString ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const
                                 while( rStCtrl.Tell() < aExVideoHd.GetRecEndFilePos() )
                                 {
                                     DffRecordHeader aHd;
-                                    rStCtrl >> aHd;
+                                    ReadDffRecordHeader( rStCtrl, aHd );
                                     switch( aHd.nRecType )
                                     {
                                         case PPT_PST_CString :
@@ -2575,7 +2575,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                 DffRecordHeader aHd;
                 do
                 {
-                    rSt >> aHd;
+                    ReadDffRecordHeader( rSt, aHd );
                     sal_uInt32 nHdRecEnd = aHd.GetRecEndFilePos();
                     switch ( aHd.nRecType )
                     {
@@ -2638,7 +2638,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                             if ( SeekToRec( rSt, PPT_PST_InteractiveInfoAtom, nHdRecEnd, &aHdInteractiveInfoAtom ) )
                             {
                                 PptInteractiveInfoAtom aInteractiveInfoAtom;
-                                rSt >> aInteractiveInfoAtom;
+                                ReadPptInteractiveInfoAtom( rSt, aInteractiveInfoAtom );
 
                                 // interactive object
                                 SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj, true);
@@ -2691,7 +2691,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
                 bInhabitanceChecked = sal_True;
                 if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) )
                     break;
-                rSt >> aMasterShapeHd;
+                ReadDffRecordHeader( rSt, aMasterShapeHd );
                 if ( !SeekToRec( rSt, DFF_msofbtClientData, aMasterShapeHd.GetRecEndFilePos(), &aMasterShapeHd ) )
                     break;
                 aMasterShapeHd.SeekToContent( rSt );
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index cc6229fc8f7f..d7317f4cc1eb 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -717,7 +717,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
                             {
                                 XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) );
 
-                                *xStm >> aFillData;
+                                ReadXFillExchangeData( *xStm, aFillData );
                                 const Color aColor( ( (XFillColorItem&) aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR ) ).GetColorValue() );
                                 static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, sal_True );
                                 nRet = nDropAction;
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index e3e4efac6ebc..3b755f1026bc 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1177,7 +1177,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
             Point   aInsertPos( rPos );
             Graphic aGraphic;
 
-            *xStm >> aGraphic;
+            ReadGraphic( *xStm, aGraphic );
 
             if( pOwnData && pOwnData->GetWorkDocument() )
             {
@@ -1293,7 +1293,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
         {
             XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) );
 
-            *xStm >> aFillData;
+            ReadXFillExchangeData( *xStm, aFillData );
 
             if( IsUndoEnabled() )
             {