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

loplugin:useuniqueptr in hierarchy_ucp::DataSupplier_Impl

Change-Id: I56259038649419b5ef02d911c20358d8a8d56917
Reviewed-on: https://gerrit.libreoffice.org/61118
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 11e8e629
...@@ -57,7 +57,7 @@ struct ResultListEntry ...@@ -57,7 +57,7 @@ struct ResultListEntry
// ResultList. // ResultList.
typedef std::vector< ResultListEntry* > ResultList; typedef std::vector< std::unique_ptr<ResultListEntry> > ResultList;
// struct DataSupplier_Impl. // struct DataSupplier_Impl.
...@@ -84,22 +84,9 @@ struct DataSupplier_Impl ...@@ -84,22 +84,9 @@ struct DataSupplier_Impl
rContent->getProvider().get() ), rContent->getProvider().get() ),
rContent->getIdentifier()->getContentIdentifier() ), rContent->getIdentifier()->getContentIdentifier() ),
m_nOpenMode( nOpenMode ), m_bCountFinal( false ) {} m_nOpenMode( nOpenMode ), m_bCountFinal( false ) {}
~DataSupplier_Impl();
}; };
DataSupplier_Impl::~DataSupplier_Impl()
{
ResultList::const_iterator it = m_aResults.begin();
ResultList::const_iterator end = m_aResults.end();
while ( it != end )
{
delete *it;
++it;
}
}
} }
...@@ -247,7 +234,7 @@ bool HierarchyResultSetDataSupplier::getResult( sal_uInt32 nIndex ) ...@@ -247,7 +234,7 @@ bool HierarchyResultSetDataSupplier::getResult( sal_uInt32 nIndex )
const HierarchyEntryData& rResult = *m_pImpl->m_aIterator; const HierarchyEntryData& rResult = *m_pImpl->m_aIterator;
if ( checkResult( rResult ) ) if ( checkResult( rResult ) )
{ {
m_pImpl->m_aResults.push_back( new ResultListEntry( rResult ) ); m_pImpl->m_aResults.emplace_back( new ResultListEntry( rResult ) );
if ( nPos == nIndex ) if ( nPos == nIndex )
{ {
...@@ -294,7 +281,7 @@ sal_uInt32 HierarchyResultSetDataSupplier::totalCount() ...@@ -294,7 +281,7 @@ sal_uInt32 HierarchyResultSetDataSupplier::totalCount()
{ {
const HierarchyEntryData& rResult = *m_pImpl->m_aIterator; const HierarchyEntryData& rResult = *m_pImpl->m_aIterator;
if ( checkResult( rResult ) ) if ( checkResult( rResult ) )
m_pImpl->m_aResults.push_back( new ResultListEntry( rResult ) ); m_pImpl->m_aResults.emplace_back( new ResultListEntry( rResult ) );
} }
m_pImpl->m_bCountFinal = true; m_pImpl->m_bCountFinal = true;
......
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