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 /vcl/source/gdi/wall.cxx | |
| 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 'vcl/source/gdi/wall.cxx')
| -rw-r--r-- | vcl/source/gdi/wall.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index 3b7bbab66562..a303d25ca508 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -97,7 +97,7 @@ void ImplWallpaper::ImplReleaseCachedBitmap() // ----------------------------------------------------------------------- -SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) +SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; @@ -112,7 +112,7 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) rImplWallpaper.mpBitmap = NULL; // version 1 - rIStm >> rImplWallpaper.maColor; + ReadColor( rIStm, rImplWallpaper.maColor ); rIStm >> nTmp16; rImplWallpaper.meStyle = (WallpaperStyle) nTmp16; // version 2 @@ -125,13 +125,13 @@ SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) if( bRect ) { rImplWallpaper.mpRect = new Rectangle; - rIStm >> *rImplWallpaper.mpRect; + ReadRectangle( rIStm, *rImplWallpaper.mpRect ); } if( bGrad ) { rImplWallpaper.mpGradient = new Gradient; - rIStm >> *rImplWallpaper.mpGradient; + ReadGradient( rIStm, *rImplWallpaper.mpGradient ); } if( bBmp ) @@ -549,10 +549,10 @@ sal_Bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const // ----------------------------------------------------------------------- -SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper ) +SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ) { rWallpaper.ImplMakeUnique(); - return( rIStm >> *rWallpaper.mpImplWallpaper ); + return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper ); } // ----------------------------------------------------------------------- |