diff options
Diffstat (limited to 'scaddins/source/analysis/analysishelper.cxx')
| -rw-r--r-- | scaddins/source/analysis/analysishelper.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 20bd97273fc3..a6b8e7df568c 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2298,10 +2298,10 @@ double ConvertDataLinear::ConvertFromBase( double f, sal_Int16 n ) const ConvertDataList::ConvertDataList() { -#define NEWD(str,unit,cl) maVector.push_back(new ConvertData(str,unit,cl)) -#define NEWDP(str,unit,cl) maVector.push_back(new ConvertData(str,unit,cl,true)) -#define NEWL(str,unit,offs,cl) maVector.push_back(new ConvertDataLinear(str,unit,offs,cl)) -#define NEWLP(str,unit,offs,cl) maVector.push_back(new ConvertDataLinear(str,unit,offs,cl,true)) +#define NEWD(str,unit,cl) maVector.emplace_back(new ConvertData(str,unit,cl)) +#define NEWDP(str,unit,cl) maVector.emplace_back(new ConvertData(str,unit,cl,true)) +#define NEWL(str,unit,offs,cl) maVector.emplace_back(new ConvertDataLinear(str,unit,offs,cl)) +#define NEWLP(str,unit,offs,cl) maVector.emplace_back(new ConvertDataLinear(str,unit,offs,cl,true)) // *** are extra and not standard Excel Analysis Addin! @@ -2481,8 +2481,6 @@ ConvertDataList::ConvertDataList() ConvertDataList::~ConvertDataList() { - for( std::vector<ConvertData*>::const_iterator it = maVector.begin(); it != maVector.end(); ++it ) - delete *it; } @@ -2495,10 +2493,10 @@ double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUStr sal_Int16 nLevelFrom = 0; sal_Int16 nLevelTo = 0; - std::vector<ConvertData*>::iterator it = maVector.begin(); + auto it = maVector.begin(); while( it != maVector.end() && ( bSearchFrom || bSearchTo ) ) { - ConvertData* p = *it; + ConvertData* p = it->get(); if( bSearchFrom ) { sal_Int16 n = p->GetMatchingLevel( rFrom ); |