diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 15:56:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 07:29:06 +0100 |
| commit | 9110118117d45a6cff1c50f3bd3087f97206ff51 (patch) | |
| tree | ea16b4a25d26d81ecd049f1209b40e579330263d /filter | |
| parent | f72b5d4b9af50e2a85ad39eef40f0463f17b7d68 (diff) | |
loplugin:useuniqueptr in PPTExtParaProv
Change-Id: I8013b0b6c75eca6426389a3d5ac8e4d7bf31ef4d
Reviewed-on: https://gerrit.libreoffice.org/50697
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 57043ed79b30..a5b878ea0769 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3202,15 +3202,15 @@ bool PPTExtParaProv::GetGraphic( sal_uInt32 nInstance, Graphic& rGraph ) const PPTBuGraEntry* pPtr = nullptr; if ( nInstance < aBuGraList.size() ) { - pPtr = aBuGraList[ nInstance ]; + pPtr = aBuGraList[ nInstance ].get(); if ( pPtr->nInstance == nInstance ) bRetValue = true; } if ( !bRetValue ) { - for (PPTBuGraEntry* i : aBuGraList) + for (std::unique_ptr<PPTBuGraEntry> const & i : aBuGraList) { - pPtr = i; + pPtr = i.get(); if ( pPtr->nInstance == nInstance ) { bRetValue = true; @@ -3277,9 +3277,9 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const } } if ( n < nBuGraCount ) { - aBuGraList.insert( aBuGraList.begin() + n, pBuGra ); + aBuGraList.emplace( aBuGraList.begin() + n, pBuGra ); } else { - aBuGraList.push_back( pBuGra ); + aBuGraList.emplace_back( pBuGra ); } } #ifdef DBG_UTIL @@ -3370,9 +3370,6 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const PPTExtParaProv::~PPTExtParaProv() { - for (PPTBuGraEntry* i : aBuGraList) - delete i; - aBuGraList.clear(); } PPTNumberFormatCreator::PPTNumberFormatCreator( PPTExtParaProv* pParaProv ) |