diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-05 10:41:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 15:31:40 +0000 |
| commit | 15535e32ddcfee451d4dbc9be9de0b8c9f9d78d4 (patch) | |
| tree | db4badc477cea1ecd51f5fab82ce0f24ae20f155 /vcl/source/gdi/font.cxx | |
| parent | 7accbd8c0d7f1d0b87748f0de599c4d8b469a61e (diff) | |
convert SvStream::operator>> methods to ReadXXX methods
First, I updated the clang rewriter to do the conversion.
Then I lightly hand-tweaked the output for the few places where
the rewriter messed up, mostly when dealing with calls on "this".
Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9
Reviewed-on: https://gerrit.libreoffice.org/7879
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'vcl/source/gdi/font.cxx')
| -rw-r--r-- | vcl/source/gdi/font.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index fb2c49bafa9d..738e463c43ef 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -666,33 +666,33 @@ SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font ) rImpl_Font.maStyleName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); ReadPair( rIStm, rImpl_Font.maSize ); - rIStm >> nTmp16; rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; - rIStm >> nTmp16; rImpl_Font.meFamily = (FontFamily) nTmp16; - rIStm >> nTmp16; rImpl_Font.mePitch = (FontPitch) nTmp16; - rIStm >> nTmp16; rImpl_Font.meWeight = (FontWeight) nTmp16; - rIStm >> nTmp16; rImpl_Font.meUnderline = (FontUnderline) nTmp16; - rIStm >> nTmp16; rImpl_Font.meStrikeout = (FontStrikeout) nTmp16; - rIStm >> nTmp16; rImpl_Font.meItalic = (FontItalic) nTmp16; - rIStm >> nTmp16; rImpl_Font.maLanguageTag.reset( (LanguageType) nTmp16); - rIStm >> nTmp16; rImpl_Font.meWidthType = (FontWidth) nTmp16; - - rIStm >> rImpl_Font.mnOrientation; - - rIStm >> bTmp; rImpl_Font.mbWordLine = bTmp; - rIStm >> bTmp; rImpl_Font.mbOutline = bTmp; - rIStm >> bTmp; rImpl_Font.mbShadow = bTmp; - rIStm >> nTmp8; rImpl_Font.mnKerning = nTmp8; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meCharSet = (rtl_TextEncoding) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meFamily = (FontFamily) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.mePitch = (FontPitch) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meWeight = (FontWeight) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meUnderline = (FontUnderline) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meStrikeout = (FontStrikeout) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meItalic = (FontItalic) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.maLanguageTag.reset( (LanguageType) nTmp16); + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meWidthType = (FontWidth) nTmp16; + + rIStm.ReadInt16( rImpl_Font.mnOrientation ); + + rIStm.ReadUChar( bTmp ); rImpl_Font.mbWordLine = bTmp; + rIStm.ReadUChar( bTmp ); rImpl_Font.mbOutline = bTmp; + rIStm.ReadUChar( bTmp ); rImpl_Font.mbShadow = bTmp; + rIStm.ReadUChar( nTmp8 ); rImpl_Font.mnKerning = nTmp8; if( aCompat.GetVersion() >= 2 ) { - rIStm >> nTmp8; rImpl_Font.meRelief = (FontRelief)nTmp8; - rIStm >> nTmp16; rImpl_Font.maCJKLanguageTag.reset( (LanguageType)nTmp16); - rIStm >> bTmp; rImpl_Font.mbVertical = bTmp; - rIStm >> nTmp16; rImpl_Font.meEmphasisMark = (FontEmphasisMark)nTmp16; + rIStm.ReadUChar( nTmp8 ); rImpl_Font.meRelief = (FontRelief)nTmp8; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.maCJKLanguageTag.reset( (LanguageType)nTmp16); + rIStm.ReadUChar( bTmp ); rImpl_Font.mbVertical = bTmp; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meEmphasisMark = (FontEmphasisMark)nTmp16; } if( aCompat.GetVersion() >= 3 ) { - rIStm >> nTmp16; rImpl_Font.meOverline = (FontUnderline) nTmp16; + rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meOverline = (FontUnderline) nTmp16; } // Relief // CJKContextLanguage |