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/font.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/font.cxx')
| -rw-r--r-- | vcl/source/gdi/font.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 2da441818035..fb2c49bafa9d 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -655,7 +655,7 @@ void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const rAttrs.SetSymbolFlag( mpImplFont->meCharSet == RTL_TEXTENCODING_SYMBOL ); } -SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) +SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; @@ -664,7 +664,7 @@ SvStream& operator>>( SvStream& rIStm, Impl_Font& rImpl_Font ) rImpl_Font.maFamilyName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); rImpl_Font.maStyleName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); - rIStm >> rImpl_Font.maSize; + ReadPair( rIStm, rImpl_Font.maSize ); rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; rIStm >> nTmp16; rImpl_Font.meFamily = (FontFamily) nTmp16; @@ -736,10 +736,10 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) return rOStm; } -SvStream& operator>>( SvStream& rIStm, Font& rFont ) +SvStream& ReadFont( SvStream& rIStm, Font& rFont ) { rFont.MakeUnique(); - return( rIStm >> *rFont.mpImplFont ); + return ReadImpl_Font( rIStm, *rFont.mpImplFont ); } SvStream& WriteFont( SvStream& rOStm, const Font& rFont ) |