mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore zero init of mpGroupLevel members

Browse Source 
since...

commit 19b34f615c
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>
This commit is contained in:
Caolán McNamara
2017-09-19 12:34:06 +01:00
parent c66cd02786
commit ca09ee972c
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
filter/source/graphicfilter/icgm/actimpr.cxx
View File

@@ -52,16 +52,14 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
CGMImpressOutAct::CGMImpressOutAct(CGM& rCGM, const uno::Reference< frame::XModel > & rModel)
CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) : : mnCurrentPage(0)
nFinalTextCount ( 0 ) , mnGroupActCount(0)
, mnGroupLevel(0)
, maGroupLevel()
, mpCGM(&rCGM)
, nFinalTextCount(0)
{ {
mpCGM = &rCGM;
mnCurrentPage = 0;
mnGroupActCount = mnGroupLevel = 0;
mpGradient = nullptr;
if ( mpCGM->mbStatus ) if ( mpCGM->mbStatus )
{ {
bool bStatRet = false; bool bStatRet = false;
@@ -386,7 +384,7 @@ void CGMImpressOutAct::BeginGroup()
{ {
if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL ) if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL )
{ {
mpGroupLevel[ mnGroupLevel ] = maXShapes->getCount(); maGroupLevel[mnGroupLevel] = maXShapes->getCount();
} }
mnGroupLevel++; mnGroupLevel++;
mnGroupActCount = mpCGM->mnActCount; mnGroupActCount = mpCGM->mnActCount;
@@ -398,7 +396,7 @@ void CGMImpressOutAct::EndGroup()
mnGroupLevel--; mnGroupLevel--;
if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL ) if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL )
{ {
sal_uInt32 nFirstIndex = mpGroupLevel[ mnGroupLevel ]; sal_uInt32 nFirstIndex = maGroupLevel[mnGroupLevel];
if ( nFirstIndex == 0xffffffff ) if ( nFirstIndex == 0xffffffff )
nFirstIndex = 0; nFirstIndex = 0;
sal_uInt32 nCurrentCount = maXShapes->getCount(); sal_uInt32 nCurrentCount = maXShapes->getCount();

2
filter/source/graphicfilter/icgm/outact.hxx
View File

@@ -46,7 +46,7 @@ class CGMImpressOutAct
sal_uInt32 mnGroupActCount; // grouping sal_uInt32 mnGroupActCount; // grouping
sal_uInt32 mnGroupLevel; sal_uInt32 mnGroupLevel;
std::array<sal_uInt32, CGM_OUTACT_MAX_GROUP_LEVEL> std::array<sal_uInt32, CGM_OUTACT_MAX_GROUP_LEVEL>
mpGroupLevel; maGroupLevel;
std::vector<PolyFlags> maFlags; std::vector<PolyFlags> maFlags;
std::vector<Point> maPoints; std::vector<Point> maPoints;