diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-30 13:46:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 22:50:39 +0000 |
| commit | 186b4ebc99a2e80740fee51f9d0276886a003617 (patch) | |
| tree | a86a4ff5fe3cd36add7053212ef37531540be253 /svtools/source/graphic | |
| parent | 95a7e952552adb834f92d1477f83938e7c8d0204 (diff) | |
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>
Diffstat (limited to 'svtools/source/graphic')
| -rw-r--r-- | svtools/source/graphic/grfattr.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 2514ed73b65c..95b92d782968 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -73,7 +73,7 @@ sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const // ------------------------------------------------------------------------ -SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ) +SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt32 nTmp32; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 41049c7afb0f..ae5a73400729 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -214,7 +214,7 @@ void GraphicObject::ImplAutoSwapIn() if( pIStm ) { - (*pIStm) >> maGraphic; + ReadGraphic( *pIStm, maGraphic ); mbAutoSwapped = ( maGraphic.GetType() != GRAPHIC_NONE ); delete pIStm; } @@ -347,7 +347,7 @@ sal_Bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const void GraphicObject::Load( SvStream& rIStm ) { - rIStm >> *this; + ReadGraphicObject( rIStm, *this ); } void GraphicObject::Save( SvStream& rOStm ) @@ -1144,14 +1144,16 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) return 0L; } -SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) +SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) { VersionCompat aCompat( rIStm, STREAM_READ ); Graphic aGraphic; GraphicAttr aAttr; sal_Bool bLink; - rIStm >> aGraphic >> aAttr >> bLink; + ReadGraphic( rIStm, aGraphic ); + ReadGraphicAttr( rIStm, aAttr ); + rIStm >> bLink; rGraphicObj.SetGraphic( aGraphic ); rGraphicObj.SetAttr( aAttr ); |