diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 10:27:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 11:55:05 +0000 |
| commit | 2bb0386ecbb6aeebbe7a9390df94ce73457e2fe3 (patch) | |
| tree | b8e316511c98ee0558e6c368f373447e4e23a7da /filter | |
| parent | e3457b637a9796740e29a31bb0cdabc062b04bbf (diff) | |
valgrind: ensure these are initialized
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index fc987b8d123c..2f0cf778e067 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -4437,12 +4437,15 @@ void PPTCharPropSet::SetColor( sal_uInt32 nColor ) pCharSet->mnAttrSet |= 1 << PPT_CharAttr_FontColor; } -PPTRuler::PPTRuler() : - nRefCount ( 1 ), - nFlags ( 0 ), - pTab ( NULL ), - nTabCount ( 0 ) +PPTRuler::PPTRuler() + : nRefCount(1) + , nFlags(0) + , nDefaultTab(0x240) + , pTab(NULL) + , nTabCount(0) { + memset(nTextOfs, 0, sizeof(nTextOfs)); + memset(nBulletOfs, 0, sizeof(nBulletOfs)); } PPTRuler::~PPTRuler() @@ -4511,7 +4514,8 @@ PPTTextRulerInterpreter::PPTTextRulerInterpreter( sal_uInt32 nFileOfs, SdrPowerP rIn >> mpImplRuler->nTextOfs[ i ]; if ( mpImplRuler->nFlags & ( 256 << i ) ) rIn >> mpImplRuler->nBulletOfs[ i ]; - if( mpImplRuler->nBulletOfs[ i ] > 0x7fff) { + if( mpImplRuler->nBulletOfs[ i ] > 0x7fff) + { // workaround // when bullet offset is > 0x7fff, the paragraph should look like // * first line text |