summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-04-12 14:43:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-04-15 20:10:15 +0100
commit95c802719aabaa1aa46519ae60c7b4ecea6016fc (patch)
tree04c41cdc1acf1913e5650415a56dfa3e8f861358 /filter
parentfdo#72287 Scroll automatically to show selected item when keyboard used. (diff)
downloadcore-95c802719aabaa1aa46519ae60c7b4ecea6016fc.tar.gz
core-95c802719aabaa1aa46519ae60c7b4ecea6016fc.zip
coverity#707859 Uninitialized pointer field
Change-Id: I1bc431746d9017db2ed2bbde797527e249804a1d
Diffstat (limited to 'filter')
-rw-r--r--filter/source/t602/t602filter.cxx8
-rw-r--r--filter/source/t602/t602filter.hxx50
2 files changed, 50 insertions, 8 deletions
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 98b6b257bfc3..5acdfc05afc4 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -131,8 +131,12 @@ namespace T602ImportFilter {
inistruct ini;
-T602ImportFilter::T602ImportFilter(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r ) :
- mxMSF( r ) {}
+T602ImportFilter::T602ImportFilter(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r )
+ : mxMSF(r)
+ , mpAttrList(NULL)
+ , node(START)
+{
+}
T602ImportFilter::~T602ImportFilter()
{
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 499b6785a0f0..13b11a6cb02a 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -163,7 +163,8 @@ private:
tnode node; // START
- struct {
+ struct format602struct
+ {
sal_Int16 mt; // row for header
sal_Int16 mb; // row for footer
sal_Int16 tb; // tabs
@@ -173,7 +174,21 @@ private:
sal_Int16 lm; // left border
sal_Int16 rm; // right border
sal_Int16 pl; // page length
- } format602;
+ format602struct()
+ : mt(0)
+ , mb(0)
+ , tb(0)
+ , ct(0)
+ , pn(0)
+ , lh(0)
+ , lm(0)
+ , rm(0)
+ , pl(0)
+ {
+ }
+ };
+
+ format602struct format602;
// Initialisation constants - they are not changed during the conversion
@@ -181,16 +196,27 @@ private:
// Font state - changes based on font
- struct {
+ struct fststruct
+ {
fonts nowfnt; // current font
fonts oldfnt; // previous font
bool uline; // underlined
bool olduline; // previous value of uline (font change)
- } fst;
+ fststruct()
+ : nowfnt(standard)
+ , oldfnt(standard)
+ , uline(false)
+ , olduline(false)
+ {
+ }
+ };
+
+ fststruct fst;
// Paragraph state
- struct {
+ struct pststruct
+ {
sal_Int16 pars; // the number of line endings times linespacing on the current page
bool comment; // in comments
sal_Int16 wasspace; // 0 there was a space - for reformatting
@@ -198,7 +224,19 @@ private:
bool ccafterln; // false
bool willbeeop; // false
bool waspar; // false
- } pst;
+ pststruct()
+ : pars(0)
+ , comment(false)
+ , wasspace(0)
+ , wasfdash(false)
+ , ccafterln(false)
+ , willbeeop(false)
+ , waspar(false)
+ {
+ }
+ };
+
+ pststruct pst;
void Reset602();
unsigned char Readchar602();