diff options
| author | Noel Grandin <noel@peralex.com> | 2014-01-14 13:52:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-01-16 16:08:34 +0100 |
| commit | c648d0872058941ed18499a8bf1993037d9b5532 (patch) | |
| tree | 47121b3eff267e34480335130106ca1c33be6fd9 /svtools/source/graphic | |
| parent | 70f360f34a9f6605864644feee3c9b9b6ffb79a1 (diff) | |
convert SvStream::operator<< overloads to more explicit methods
This is in preparation for more conversion of SvStream::operator<< calls
to use more explicit method names.
This converts the subclasses that have their own convenience overloads
of operator<< to use normal methods.
Change-Id: I5efd5d9a24c264cb86d2471303dd5849bf91ba80
Diffstat (limited to 'svtools/source/graphic')
| -rw-r--r-- | svtools/source/graphic/grfattr.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/graphic/provider.cxx | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index fb19ddcb6300..1e328c918811 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -100,7 +100,7 @@ SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ) // ------------------------------------------------------------------------ -SvStream& operator<<( SvStream& rOStm, const GraphicAttr& rAttr ) +SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 2 ); const sal_uInt32 nTmp32 = 0; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 8325c3b8d93a..4267ebebc8a1 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -352,7 +352,7 @@ void GraphicObject::Load( SvStream& rIStm ) void GraphicObject::Save( SvStream& rOStm ) { - rOStm << *this; + WriteGraphicObject( rOStm, *this ); } void GraphicObject::Assign( const SvDataCopyStream& rCopyStream ) @@ -1129,12 +1129,13 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) return rIStm; } -SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) +SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); const sal_Bool bLink = rGraphicObj.HasLink(); - rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr(); + WriteGraphic( rOStm, rGraphicObj.GetGraphic() ); + WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() ); rOStm.WriteUChar( bLink ); if( bLink ) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 09a8b999ddff..00250e838eda 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -837,7 +837,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG SvMemoryStream aMemStrm; aMemStrm.SetVersion( SOFFICE_FILEFORMAT_CURRENT ); if( 0 == strcmp( pFilterShortName, MIMETYPE_VCLGRAPHIC ) ) - aMemStrm << aGraphic; + WriteGraphic( aMemStrm, aGraphic ); else { rFilter.ExportGraphic( aGraphic, aPath, aMemStrm, |