diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-02-08 16:19:25 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 08:46:13 +0000 |
| commit | 5b19a738ed7aa943cc05a313dbed7b45ec081d95 (patch) | |
| tree | d42893cd6f4bedc0fd70a07b34430f6ebd74d79b /sc/source/filter/xcl97 | |
| parent | 0bf5254b00a21da3dd348a7155c2a40b8ae2d8fe (diff) | |
replace pointers with objects in std::vectors
Change-Id: Id5577ae0b3bdf31b6d5e409cd2c0033d9f2591a2
Reviewed-on: https://gerrit.libreoffice.org/34046
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/xcl97')
| -rw-r--r-- | sc/source/filter/xcl97/XclExpChangeTrack.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 15 |
2 files changed, 8 insertions, 15 deletions
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index a3254edbe451..a9cce7fcc2d3 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -137,20 +137,18 @@ XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack ) for (; it != itEnd; ++it) { lcl_GenerateGUID( aGUID, bValidGUID ); - aViews.push_back( new XclExpUserBView(*it, aGUID) ); + aViews.emplace_back( *it, aGUID ); } } XclExpUserBViewList::~XclExpUserBViewList() { - for( iterator iter = aViews.begin(); iter != aViews.end(); ++iter ) - delete *iter; } void XclExpUserBViewList::Save( XclExpStream& rStrm ) { - for( iterator iter = aViews.begin(); iter != aViews.end(); ++iter ) - (*iter)->Save( rStrm ); + for( XclExpUserBView& rView : aViews ) + rView.Save( rStrm ); } XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ) : diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index f35be3157e1f..1a7f1f97c17e 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1462,7 +1462,7 @@ ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) while( rDoc.IsScenario( nNewTab ) ) { - aScenes.push_back( new ExcEScenario( rRoot, nNewTab ) ); + aScenes.emplace_back( rRoot, nNewTab ); if( rDoc.IsActiveScenario( nNewTab ) ) nActive = static_cast<sal_uInt16>(nNewTab - nFirstTab); @@ -1472,9 +1472,6 @@ ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) ExcEScenarioManager::~ExcEScenarioManager() { - std::vector<ExcEScenario*>::iterator pIter; - for( pIter = aScenes.begin(); pIter != aScenes.end(); ++pIter ) - delete *pIter; } void ExcEScenarioManager::SaveCont( XclExpStream& rStrm ) @@ -1490,9 +1487,8 @@ void ExcEScenarioManager::Save( XclExpStream& rStrm ) if( !aScenes.empty() ) ExcRecord::Save( rStrm ); - std::vector<ExcEScenario*>::iterator pIter; - for( pIter = aScenes.begin(); pIter != aScenes.end(); ++pIter ) - (*pIter)->Save( rStrm ); + for( ExcEScenario& rScenario : aScenes ) + rScenario.Save( rStrm ); } void ExcEScenarioManager::SaveXml( XclExpXmlStream& rStrm ) @@ -1507,9 +1503,8 @@ void ExcEScenarioManager::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_sqref, FSEND ); - std::vector<ExcEScenario*>::iterator pIter; - for( pIter = aScenes.begin(); pIter != aScenes.end(); ++pIter ) - (*pIter)->SaveXml( rStrm ); + for( ExcEScenario& rScenario : aScenes ) + rScenario.SaveXml( rStrm ); rWorkbook->endElement( XML_scenarios ); } |