Kaydet (Commit) 392c3b90 authored tarafından Caolán McNamara's avatar Caolán McNamara

zero init the TabSet too

and move the ColumnDef init into its ctor

Change-Id: I16e5252c53037663caf9f51b55adfbb7d29da549
Reviewed-on: https://gerrit.libreoffice.org/40008Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst bf1ffc64
...@@ -192,28 +192,21 @@ bool HWPSummary::Read(HWPFile & hwpf) ...@@ -192,28 +192,21 @@ bool HWPSummary::Read(HWPFile & hwpf)
return (!hwpf.State()); return (!hwpf.State());
} }
ParaShape::ParaShape(): ParaShape::ParaShape()
index(0), : index(0)
left_margin(0), , left_margin(0)
right_margin(0), , right_margin(0)
indent(0), , indent(0)
lspacing(0), , lspacing(0)
pspacing_prev(0), , pspacing_prev(0)
pspacing_next(0), , pspacing_next(0)
condense(0), , condense(0)
arrange_type(0), , arrange_type(0)
shade(0), , shade(0)
outline(0), , outline(0)
outline_continue(0), , outline_continue(0)
pagebreak(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[0] = 0;
reserved[1] = 0; reserved[1] = 0;
} }
......
...@@ -242,23 +242,37 @@ struct CharShape ...@@ -242,23 +242,37 @@ struct CharShape
/** /**
* @short Tab properties * @short Tab properties
*/ */
typedef struct struct TabSet
{ {
unsigned char type; unsigned char type;
unsigned char dot_continue; unsigned char dot_continue;
hunit position; hunit position;
} TabSet; TabSet()
: type(0)
, dot_continue(0)
, position(0)
{
}
};
/** /**
* @short Column properties * @short Column properties
*/ */
typedef struct struct ColumnDef
{ {
unsigned char ncols; unsigned char ncols;
unsigned char separator; unsigned char separator;
hunit spacing; hunit spacing;
hunit columnlen, columnlen0; hunit columnlen, columnlen0;
} ColumnDef; ColumnDef()
: ncols(0)
, separator(0)
, spacing(0)
, columnlen(0)
, columnlen0(0)
{
}
};
/** /**
* @short Style of paragraph * @short Style of paragraph
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment