[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/gdi/svmconverter.cxx |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 6da8f03ac24c9cdf6941ca855492f11ce1215e5e
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Mar 9 09:18:46 2017 +0000

    scope and zero up a few things
    
    Change-Id: I8784eb729196daea7e49ffbace6f8b13ef24e7c1

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 099c791..61fd049 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 );

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits