diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 10:39:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 10:41:58 +0100 |
| commit | f38ccdcc5bf5792a242bf20b282748007160d6e5 (patch) | |
| tree | ded73b66457ad9a96dac7983c83bbc371ceeb58d /filter | |
| parent | Thanks Badaa and Jiayanmin but we don't use in-line commit comments (diff) | |
| download | core-f38ccdcc5bf5792a242bf20b282748007160d6e5.tar.gz core-f38ccdcc5bf5792a242bf20b282748007160d6e5.zip | |
coverity#1202962 Uninitialized pointer field
Change-Id: If400eda10e0b6367c58431c528b84a95a35b76f9
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 61 | ||||
| -rw-r--r-- | filter/source/graphicfilter/icgm/cgm.hxx | 1 |
2 files changed, 38 insertions, 24 deletions
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index a89fd3ba2763..003b725eaeb8 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -32,32 +32,47 @@ using namespace ::com::sun::star; -void CGM::ImplCGMInit() -{ - mbIsFinished = mbPicture = mbMetaFile = mbPictureBody = sal_False; - - mnActCount = 0; - mnOutdx = 28000; - mnOutdy = 21000; - - mpBuf = NULL; - mpChart = NULL; - mpBitmapInUse = NULL; - - pCopyOfE = new CGMElements( *this ); - pElement = new CGMElements( *this ); -} - #ifdef CGM_EXPORT_IMPRESS -CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel ) : - mpGraphic ( NULL ), - mbStatus ( sal_True ), - mpOutAct ( new CGMImpressOutAct( *this, rModel ) ), - mnMode ( nMode ) +CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel ) + : mnOutdx(28000) + , mnOutdy(21000) + , mnVDCXadd(0) + , mnVDCXmul(0) + , mnVDCYmul(0) + , mnVDCdx(0) + , mnVDCdy(0) + , mnXFraction(0) + , mnYFraction(0) + , mbAngReverse(false) + , mpGraphic(NULL) + , mbStatus(true) + , mbMetaFile(false) + , mbIsFinished(false) + , mbPicture(false) + , mbPictureBody(false) + , mbFigure(false) + , mbFirstOutPut(false) + , mnAct4PostReset(0) + , mpBitmapInUse(NULL) + , mpChart(NULL) + , mpOutAct(new CGMImpressOutAct(*this, rModel)) + , mpSource(NULL) + , mnParaSize(0) + , mnActCount(0) + , mpBuf(NULL) + , mnMode(nMode | CGM_EXPORT_IMPRESS) + , mnEscape(0) + , mnElementClass(0) + , mnElementID(0) + , mnElementSize(0) +#ifdef CGM_EXPORT_META + , mpVirDev(NULL) + , mpGDIMetaFile(NULL) +#endif { - mnMode |= CGM_EXPORT_IMPRESS; - ImplCGMInit(); + pElement = new CGMElements( *this ); + pCopyOfE = new CGMElements( *this ); } #endif diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 033e79016e09..ab7076d18610 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -94,7 +94,6 @@ class CGM sal_uInt32 mnElementID; sal_uInt32 mnElementSize; // full parameter size for the latest action - void ImplCGMInit(); sal_uInt32 ImplGetUI16( sal_uInt32 nAlign = 0 ); sal_uInt8 ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision ); long ImplGetI( sal_uInt32 nPrecision ); |