diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-19 12:34:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-21 09:53:49 +0200 |
| commit | ca09ee972cfcdc1642f73f95bfc02481102a724d (patch) | |
| tree | eb2d745c7ca879014fe09d5b35137818759e50d1 | |
| parent | c66cd027864a7cab9cb2dc722439c848b769451c (diff) | |
restore zero init of mpGroupLevel members
since...
commit 19b34f615c04555f27978e2823ba735a9c9f882e
Date: Fri Jul 7 15:58:40 2017 +0200
loplugin:useuniqueptr in filter
originally
- mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] ();
and turn this into a tidy member init list
Change-Id: Ic3f012b348cfa4f4f30da678fd6bfc172d22e693
Reviewed-on: https://gerrit.libreoffice.org/42465
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | filter/source/graphicfilter/icgm/actimpr.cxx | 20 | ||||
| -rw-r--r-- | filter/source/graphicfilter/icgm/outact.hxx | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 16665f2e2445..aee11c2432df 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -52,16 +52,14 @@ using namespace ::com::sun::star; - -CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) : - nFinalTextCount ( 0 ) +CGMImpressOutAct::CGMImpressOutAct(CGM& rCGM, const uno::Reference< frame::XModel > & rModel) + : mnCurrentPage(0) + , mnGroupActCount(0) + , mnGroupLevel(0) + , maGroupLevel() + , mpCGM(&rCGM) + , nFinalTextCount(0) { - mpCGM = &rCGM; - mnCurrentPage = 0; - mnGroupActCount = mnGroupLevel = 0; - - mpGradient = nullptr; - if ( mpCGM->mbStatus ) { bool bStatRet = false; @@ -386,7 +384,7 @@ void CGMImpressOutAct::BeginGroup() { if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL ) { - mpGroupLevel[ mnGroupLevel ] = maXShapes->getCount(); + maGroupLevel[mnGroupLevel] = maXShapes->getCount(); } mnGroupLevel++; mnGroupActCount = mpCGM->mnActCount; @@ -398,7 +396,7 @@ void CGMImpressOutAct::EndGroup() mnGroupLevel--; if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL ) { - sal_uInt32 nFirstIndex = mpGroupLevel[ mnGroupLevel ]; + sal_uInt32 nFirstIndex = maGroupLevel[mnGroupLevel]; if ( nFirstIndex == 0xffffffff ) nFirstIndex = 0; sal_uInt32 nCurrentCount = maXShapes->getCount(); diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 059010e9507b..1092bc665f16 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -46,7 +46,7 @@ class CGMImpressOutAct sal_uInt32 mnGroupActCount; // grouping sal_uInt32 mnGroupLevel; std::array<sal_uInt32, CGM_OUTACT_MAX_GROUP_LEVEL> - mpGroupLevel; + maGroupLevel; std::vector<PolyFlags> maFlags; std::vector<Point> maPoints; |