diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-18 10:18:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-18 14:08:06 +0000 |
| commit | b7069ad07dc651f5326cd3a671588d8c1ecf2534 (patch) | |
| tree | c27754f5dac5af716a00c95aafdfcb4fd5f1d6c6 /vcl | |
| parent | 92424bdb2d05934d8f31910e175b0df9f5fe8c77 (diff) | |
Related: rhbz#1014990 valgrind reports uninitialized another variable
Change-Id: I77f082ea145b0f20daa93c3ee04067ecb6c3b108
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/emfwr.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index b628cd872247..d71bdd891f2a 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -287,21 +287,18 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilter { const sal_uLong nHeaderPos = m_rStm.Tell(); - mpHandlesUsed = new sal_Bool[ MAXHANDLES ]; - memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) ); - mnHorTextAlign = mnHandleCount = mnLastPercent = mnRecordPos = mnRecordCount = 0; - mnRecordPlusPos = 0; - mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID; - mbRecordOpen = sal_False; - mbRecordPlusOpen = false; - - maVDev.EnableOutput( sal_False ); maVDev.SetMapMode( rMtf.GetPrefMapMode() ); - mpFilterConfigItem = pFilterConfigItem; - // don't work with pixel as destination map mode -> higher resolution preferrable maDestMapMode.SetMapUnit( MAP_100TH_MM ); + mpFilterConfigItem = pFilterConfigItem; + mpHandlesUsed = new sal_Bool[ MAXHANDLES ]; + memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) ); + mnHandleCount = mnLastPercent = mnRecordCount = mnRecordPos = mnRecordPlusPos = 0; + mbRecordOpen = mbRecordPlusOpen = false; + mbLineChanged = mbFillChanged = mbTextChanged = false; + mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID; + mnHorTextAlign = 0; const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) ); const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); |