From 186b4ebc99a2e80740fee51f9d0276886a003617 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 30 Jan 2014 13:46:42 +0200
Subject: 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>
---
 svx/inc/galobj.hxx               | 2 +-
 svx/source/gallery2/gallery1.cxx | 2 +-
 svx/source/gallery2/galobj.cxx   | 4 ++--
 svx/source/gallery2/galtheme.cxx | 6 +++---
 svx/source/xoutdev/xattr.cxx     | 2 +-
 svx/source/xoutdev/xattrbmp.cxx  | 4 ++--
 svx/source/xoutdev/xexch.cxx     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'svx')

diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 8a68903bb3e1..ad04daad9a70 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -87,7 +87,7 @@ public:
     void                    SetTitle( const OUString& rTitle );
 
     friend SvStream&        WriteSgaObject( SvStream& rOut, const SgaObject& rObj );
-    friend SvStream&        operator>>( SvStream& rIn, SgaObject& rObj );
+    friend SvStream&        ReadSgaObject( SvStream& rIn, SgaObject& rObj );
 
     BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
 };
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c9c034868070..d250c6fa0d59 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -624,7 +624,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry
                 if( pIStm )
                 {
                     pTheme = new GalleryTheme( this, (GalleryThemeEntry*) pThemeEntry );
-                    *pIStm >> *pTheme;
+                    ReadGalleryTheme( *pIStm, *pTheme );
 
                     if( pIStm->GetError() )
                     {
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 6d85fa8da31c..17f5da756217 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -208,7 +208,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
     }
     else
     {
-        rIn >> aThumbMtf;
+        ReadGDIMetaFile( rIn, aThumbMtf );
     }
 
     OUString aTmpStr = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8);
@@ -258,7 +258,7 @@ SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj )
     return rOut;
 }
 
-SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
+SvStream& ReadSgaObject( SvStream& rIn, SgaObject& rObj )
 {
     sal_uInt16 nReadVersion;
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 182c207c0a4a..3fc57358f03a 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -174,7 +174,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
 
                 if( pSgaObj )
                 {
-                    *pIStm >> *pSgaObj;
+                    ReadSgaObject( *pIStm, *pSgaObj );
                     pSgaObj->ImplUpdateURL( pEntry->aURL );
                 }
             }
@@ -644,7 +644,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
                 if( pObj )
                 {
                     pIStm->Seek( pEntry->nOffset );
-                    *pIStm >> *pObj;
+                    ReadSgaObject( *pIStm, *pObj);
                     pEntry->nOffset = pTmpStm->Tell();
                     WriteSgaObject( *pTmpStm, *pObj );
                     delete pObj;
@@ -1517,7 +1517,7 @@ SvStream& WriteGalleryTheme( SvStream& rOut, const GalleryTheme& rTheme )
     return rTheme.WriteData( rOut );
 }
 
-SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme )
+SvStream& ReadGalleryTheme( SvStream& rIn, GalleryTheme& rTheme )
 {
     return rTheme.ReadData( rIn );
 }
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 92c94d2ec87c..3350feb0523a 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -294,7 +294,7 @@ XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) :
 {
     if (!IsIndex())
     {
-        rIn >> aColor;
+        ReadColor( rIn, aColor );
     }
 }
 
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 04e8c8c7f490..a52c0d1fd116 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -318,8 +318,8 @@ XFillBitmapItem::XFillBitmapItem(SvStream& rIn, sal_uInt16 nVer)
                 Color aColorPix;
                 Color aColorBack;
 
-                rIn >> aColorPix;
-                rIn >> aColorBack;
+                ReadColor( rIn, aColorPix );
+                ReadColor( rIn, aColorBack );
 
                 const Bitmap aBitmap(createHistorical8x8FromArray(aArray, aColorPix, aColorBack));
 
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 54ef1f447b75..693f6a7f6a6f 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -87,7 +87,7 @@ SvStream& WriteXFillExchangeData( SvStream& rOStm, const XFillExchangeData& rDat
 }
 
 /// binary export (currently w/o version control because it is not persistent)
-SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData )
+SvStream& ReadXFillExchangeData( SvStream& rIStm, XFillExchangeData& rData )
 {
     DBG_ASSERT( rData.pPool, "XFillExchangeData has no pool" );
 
-- 
cgit