Kaydet (Commit) 9bac7234 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in Sprite

Change-Id: I55eb8f931cdfd1898ff5a74868dc97f31ce1ae7c
Reviewed-on: https://gerrit.libreoffice.org/51551Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 70d2fd48
......@@ -248,7 +248,7 @@ void Writer::endTag()
if( mpSprite && ( (nTag == TAG_END) || (nTag == TAG_SHOWFRAME) || (nTag == TAG_DOACTION) || (nTag == TAG_STARTSOUND) || (nTag == TAG_PLACEOBJECT) || (nTag == TAG_PLACEOBJECT2) || (nTag == TAG_REMOVEOBJECT2) || (nTag == TAG_FRAMELABEL) ) )
{
mpSprite->addTag( mpTag.release() );
mpSprite->addTag( std::move(mpTag) );
}
else
{
......
......@@ -196,10 +196,10 @@ public:
~Sprite();
void write( SvStream& out );
void addTag( Tag* pNewTag );
void addTag( std::unique_ptr<Tag> pNewTag );
private:
std::vector< Tag* > maTags;
std::vector< std::unique_ptr<Tag> > maTags;
sal_uInt16 mnId;
sal_uInt32 mnFrames;
};
......
......@@ -334,8 +334,6 @@ Sprite::Sprite( sal_uInt16 nId )
Sprite::~Sprite()
{
for (auto const& tag : maTags)
delete tag;
}
......@@ -358,15 +356,12 @@ void Sprite::write( SvStream& out )
}
void Sprite::addTag( Tag* pNewTag )
void Sprite::addTag( std::unique_ptr<Tag> pNewTag )
{
if( pNewTag )
{
if( pNewTag->getTagId() == TAG_SHOWFRAME )
mnFrames++;
if( pNewTag->getTagId() == TAG_SHOWFRAME )
mnFrames++;
maTags.push_back( pNewTag );
}
maTags.push_back( std::move(pNewTag) );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment