diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-09 09:18:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-09 09:41:47 +0000 |
| commit | 6da8f03ac24c9cdf6941ca855492f11ce1215e5e (patch) | |
| tree | c0472956d80a23a75c63b44dc99ea665715f4f03 /vcl | |
| parent | c60bdb06f580e0be6c5c4eb1977d98115d0b03b9 (diff) | |
scope and zero up a few things
Change-Id: I8784eb729196daea7e49ffbace6f8b13ef24e7c1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/svmconverter.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx index 099c7917ae4b..61fd049b776e 100644 --- a/vcl/source/gdi/svmconverter.cxx +++ b/vcl/source/gdi/svmconverter.cxx @@ -855,19 +855,20 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { vcl::Font aFont; char aName[ 32 ]; - sal_Int32 nWidth, nHeight; - sal_Int16 nCharSet, nFamily, nPitch, nAlign, nWeight, nUnderline, nStrikeout; - sal_Int16 nCharOrient, nLineOrient; - bool bItalic, bOutline, bShadow, bTransparent; ImplReadColor( rIStm, aActionColor ); aFont.SetColor( aActionColor ); ImplReadColor( rIStm, aActionColor ); aFont.SetFillColor( aActionColor ); rIStm.ReadBytes( aName, 32 ); aFont.SetFamilyName( OUString( aName, strlen(aName), rIStm.GetStreamCharSet() ) ); - rIStm.ReadInt32( nWidth ).ReadInt32( nHeight ); - rIStm.ReadInt16( nCharOrient ).ReadInt16( nLineOrient ); - rIStm.ReadInt16( nCharSet ).ReadInt16( nFamily ).ReadInt16( nPitch ).ReadInt16( nAlign ).ReadInt16( nWeight ).ReadInt16( nUnderline ).ReadInt16( nStrikeout ); - rIStm.ReadCharAsBool( bItalic ).ReadCharAsBool( bOutline ).ReadCharAsBool( bShadow ).ReadCharAsBool( bTransparent ); + + sal_Int32 nWidth(0), nHeight(0); + rIStm.ReadInt32(nWidth).ReadInt32(nHeight); + sal_Int16 nCharOrient(0), nLineOrient(0); + rIStm.ReadInt16(nCharOrient).ReadInt16(nLineOrient); + sal_Int16 nCharSet(0), nFamily(0), nPitch(0), nAlign(0), nWeight(0), nUnderline(0), nStrikeout(0); + rIStm.ReadInt16(nCharSet).ReadInt16(nFamily).ReadInt16(nPitch).ReadInt16(nAlign).ReadInt16(nWeight).ReadInt16(nUnderline).ReadInt16(nStrikeout); + bool bItalic(false), bOutline(false), bShadow(false), bTransparent(false); + rIStm.ReadCharAsBool(bItalic).ReadCharAsBool(bOutline).ReadCharAsBool(bShadow).ReadCharAsBool(bTransparent); aFont.SetFontSize( Size( nWidth, nHeight ) ); aFont.SetCharSet( (rtl_TextEncoding) nCharSet ); |