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

Caolán McNamara caolanm at redhat.com
Mon Jan 11 09:29:45 PST 2016


 vcl/source/font/fontattributes.cxx |   26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

New commits:
commit c93a43c0c9113bc1c787fe6b3c5e58a8bfd80be0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 11 17:08:39 2016 +0000

    initialize new member variables
    
    Change-Id: I3839bc134b337ccb7cfdb2ee70524e4721c8f83c

diff --git a/vcl/source/font/fontattributes.cxx b/vcl/source/font/fontattributes.cxx
index be3ab68..49060f0 100644
--- a/vcl/source/font/fontattributes.cxx
+++ b/vcl/source/font/fontattributes.cxx
@@ -93,7 +93,18 @@ bool FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes
 }
 
 FontAttributes::FontAttributes()
-    : mnWidth ( 0 )
+    : meWeight(WEIGHT_DONTKNOW)
+    , meItalic(ITALIC_DONTKNOW)
+    , meFamily(FAMILY_DONTKNOW)
+    , mePitch(PITCH_DONTKNOW)
+    , meWidthType(WIDTH_DONTKNOW)
+    , mbSymbolFlag(false)
+    , mnQuality(0)
+    , mbOrientation(false)
+    , mbDevice(false)
+    , mbSubsettable(false)
+    , mbEmbeddable(false)
+    , mnWidth ( 0 )
     , mnOrientation( 0 )
     , mnAscent( 0 )
     , mnDescent( 0 )
@@ -136,7 +147,18 @@ FontAttributes::FontAttributes()
 }
 
 FontAttributes::FontAttributes( const FontSelectPattern& rFontSelData )
-    : mnWidth ( rFontSelData.mnWidth )
+    : meWeight(WEIGHT_DONTKNOW)
+    , meItalic(ITALIC_DONTKNOW)
+    , meFamily(FAMILY_DONTKNOW)
+    , mePitch(PITCH_DONTKNOW)
+    , meWidthType(WIDTH_DONTKNOW)
+    , mbSymbolFlag(false)
+    , mnQuality(0)
+    , mbOrientation(false)
+    , mbDevice(false)
+    , mbSubsettable(false)
+    , mbEmbeddable(false)
+    , mnWidth ( rFontSelData.mnWidth )
     , mnOrientation( (short)(rFontSelData.mnOrientation) )
     , mnAscent( 0 )
     , mnDescent( 0 )


More information about the Libreoffice-commits mailing list