Kaydet (Commit) 207d8b88 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in ContentImplHelper

Change-Id: I56909fcaf8088a353bbd0bb783c88d51b9f0822f
Reviewed-on: https://gerrit.libreoffice.org/62654
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 478f3f01
......@@ -87,7 +87,7 @@ struct hashPtr
typedef std::unordered_map
<
XPropertiesChangeListenerPtr,
PropertyEventSequence*,
PropertyEventSequence,
hashPtr,
equalPtr
>
......@@ -696,11 +696,10 @@ void ContentImplHelper::notifyPropertiesChange(
if ( it == aListeners.end() )
{
// Not in map - create and insert new entry.
p = new PropertyEventSequence( nCount );
aListeners[ pListener ] = p;
p = &aListeners.emplace( pListener, PropertyEventSequence(nCount)).first->second;
}
else
p = (*it).second;
p = &it->second;
if ( p )
p->append( rEvent );
......@@ -714,15 +713,13 @@ void ContentImplHelper::notifyPropertiesChange(
{
beans::XPropertiesChangeListener* pListener =
static_cast< beans::XPropertiesChangeListener * >( (*it).first );
PropertyEventSequence* pSeq = (*it).second;
PropertyEventSequence pSeq = std::move(it->second);
// Remove current element.
aListeners.erase( it );
// Propagate event.
pListener->propertiesChange( pSeq->getEvents() );
delete pSeq;
pListener->propertiesChange( pSeq.getEvents() );
it = aListeners.begin();
}
......
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