From 392c3b9093fdc8d64a2db2c98d070c2b0fd833aa Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 16 Jul 2017 14:45:10 +0100
Subject: zero init the TabSet too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and move the ColumnDef init into its ctor

Change-Id: I16e5252c53037663caf9f51b55adfbb7d29da549
Reviewed-on: https://gerrit.libreoffice.org/40008
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 hwpfilter/source/hinfo.cxx | 35 ++++++++++++++---------------------
 hwpfilter/source/hinfo.h   | 22 ++++++++++++++++++----
 2 files changed, 32 insertions(+), 25 deletions(-)

(limited to 'hwpfilter')

diff --git a/hwpfilter/source/hinfo.cxx b/hwpfilter/source/hinfo.cxx
index 3ad38721404e..d6b30ee6b815 100644
--- a/hwpfilter/source/hinfo.cxx
+++ b/hwpfilter/source/hinfo.cxx
@@ -192,28 +192,21 @@ bool HWPSummary::Read(HWPFile & hwpf)
     return (!hwpf.State());
 }
 
-ParaShape::ParaShape():
-    index(0),
-    left_margin(0),
-    right_margin(0),
-    indent(0),
-    lspacing(0),
-    pspacing_prev(0),
-    pspacing_next(0),
-    condense(0),
-    arrange_type(0),
-    shade(0),
-    outline(0),
-    outline_continue(0),
-    pagebreak(0)
+ParaShape::ParaShape()
+    : index(0)
+    , left_margin(0)
+    , right_margin(0)
+    , indent(0)
+    , lspacing(0)
+    , pspacing_prev(0)
+    , pspacing_next(0)
+    , condense(0)
+    , arrange_type(0)
+    , shade(0)
+    , outline(0)
+    , outline_continue(0)
+    , pagebreak(0)
 {
-    coldef.ncols = 0;
-    coldef.separator = 0;
-    coldef.spacing = 0;
-    coldef.columnlen = 0;
-    coldef.columnlen0 = 0;
-    reserved[0] = 0;
-    reserved[1] = 0;
     reserved[0] = 0;
     reserved[1] = 0;
 }
diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h
index 864e2ac031ec..61ff7b9d442f 100644
--- a/hwpfilter/source/hinfo.h
+++ b/hwpfilter/source/hinfo.h
@@ -242,23 +242,37 @@ struct CharShape
 /**
  * @short Tab properties
  */
-typedef struct
+struct TabSet
 {
     unsigned char type;
     unsigned char dot_continue;
     hunit     position;
-} TabSet;
+    TabSet()
+        : type(0)
+        , dot_continue(0)
+        , position(0)
+    {
+    }
+};
 
 /**
  * @short Column properties
  */
-typedef struct
+struct ColumnDef
 {
     unsigned char ncols;
     unsigned char separator;
     hunit     spacing;
     hunit     columnlen, columnlen0;
-} ColumnDef;
+    ColumnDef()
+        : ncols(0)
+        , separator(0)
+        , spacing(0)
+        , columnlen(0)
+        , columnlen0(0)
+    {
+    }
+};
 
 /**
  * @short Style of paragraph
-- 
cgit v1.2.3