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

loplugin:useuniqueptr in PluginSlideChange

Browse Source 
Change-Id: I60474c40012c2afa2573bc5ba5013e46551d1309
Reviewed-on: https://gerrit.libreoffice.org/51760
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-03-22 14:03:33 +02:00
parent 3c8a6b0a18
commit 0bbfb47332
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
slideshow/source/engine/transitions/slidetransitionfactory.cxx
View File

@@ -154,13 +154,6 @@ public:
virtual ~PluginSlideChange() override
{
mxFactory.clear();
for( const auto& pCurrView : maTransitions )
{
delete pCurrView;
}
maTransitions.clear();
}
bool addTransition( const UnoViewSharedPtr& rView )
@@ -173,7 +166,7 @@ public:
getEnteringBitmap(ViewEntry(rView))->getXBitmap() );
if( rTransition.is() )
maTransitions.push_back( new TransitionViewPair( rTransition, rView ) );
maTransitions.emplace_back( new TransitionViewPair( rTransition, rView ) );
else
return false;
@@ -213,15 +206,11 @@ public:
SAL_INFO("slideshow", "PluginSlideChange viewRemoved");
SlideChangeBase::viewRemoved( rView );
::std::vector< TransitionViewPair* >::const_iterator aEnd(maTransitions.end());
for( ::std::vector< TransitionViewPair* >::iterator aIter =maTransitions.begin();
aIter != aEnd;
++aIter )
for( auto aIter = maTransitions.begin(); aIter != maTransitions.end(); ++aIter )
{
if( ( *aIter )->mpView == rView )
{
SAL_INFO("slideshow", "view removed" );
delete *aIter;
maTransitions.erase( aIter );
break;
}
@@ -264,7 +253,7 @@ public:
private:
// One transition object per view
std::vector< TransitionViewPair* > maTransitions;
std::vector< std::unique_ptr<TransitionViewPair> > maTransitions;
// bool
bool mbSuccess;