diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-01-27 02:56:05 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-01-27 03:24:18 -0600 |
| commit | d75595b28e0145c0fa90b0fcbefa33e40dd43ca9 (patch) | |
| tree | 8ee4999155b4b272088877aa52bde7b0960c280b /starmath | |
| parent | 06b7ba3b6701110709b47248180c75a325ff9a31 (diff) | |
coverity#1038500 : Uninitialized scalar field
Change-Id: I9cc5df332b9bdff59e78a7779496575d44351319
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/dialog.cxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 7e53ecb197a5..3c381c5fa828 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -622,31 +622,30 @@ static const FieldMinMax pMinMaxData[10][4] = SmCategoryDesc::SmCategoryDesc(VclBuilderContainer& rBuilder, sal_uInt16 nCategoryIdx) { ++nCategoryIdx; - FixedText *pTitle = rBuilder.get<FixedText>(OString::number(nCategoryIdx)+"title"); + FixedText* pTitle = rBuilder.get<FixedText>(OString::number(nCategoryIdx)+"title"); if (pTitle) { Name = pTitle->GetText(); + } + for (int i = 0; i < 4; ++i) + { + FixedText* pLabel = rBuilder.get<FixedText>(OString::number(nCategoryIdx)+"label"+OString::number(i+1)); - for (int i = 0; i < 4; ++i) + if (pLabel) { - FixedText *pLabel = rBuilder.get<FixedText>(OString::number(nCategoryIdx)+"label"+OString::number(i+1)); - - if (pLabel) - { - Strings [i] = new OUString(pLabel->GetText()); - FixedImage *pImage = rBuilder.get<FixedImage>(OString::number(nCategoryIdx)+"image"+OString::number(i+1)); - Graphics [i] = new Image(pImage->GetImage()); - } - else - { - Strings [i] = 0; - Graphics [i] = 0; - } - - const FieldMinMax &rMinMax = pMinMaxData[ nCategoryIdx ][i]; - Value[i] = Minimum[i] = rMinMax.nMin; - Maximum[i] = rMinMax.nMax; + Strings [i] = new OUString(pLabel->GetText()); + FixedImage* pImage = rBuilder.get<FixedImage>(OString::number(nCategoryIdx)+"image"+OString::number(i+1)); + Graphics [i] = new Image(pImage->GetImage()); + } + else + { + Strings [i] = 0; + Graphics [i] = 0; } + + const FieldMinMax& rMinMax = pMinMaxData[ nCategoryIdx ][i]; + Value[i] = Minimum[i] = rMinMax.nMin; + Maximum[i] = rMinMax.nMax; } } |