ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

loplugin:useuniqueptr in hierarchy_ucp::DataSupplier_Impl

Browse Source 
Change-Id: I56259038649419b5ef02d911c20358d8a8d56917
Reviewed-on: https://gerrit.libreoffice.org/61118
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-10-01 08:17:49 +02:00
parent 11e8e62903
commit df9e895763
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+3 -16
View File
@@ -57,7 +57,7 @@ struct ResultListEntry
// ResultList.
typedef std::vector< ResultListEntry* > ResultList;
typedef std::vector< std::unique_ptr<ResultListEntry> > ResultList;
// struct DataSupplier_Impl.
@@ -84,22 +84,9 @@ struct DataSupplier_Impl
rContent->getProvider().get() ),
rContent->getIdentifier()->getContentIdentifier() ),
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 )
const HierarchyEntryData& rResult = *m_pImpl->m_aIterator;
if ( checkResult( rResult ) )
{
m_pImpl->m_aResults.push_back( new ResultListEntry( rResult ) );
m_pImpl->m_aResults.emplace_back( new ResultListEntry( rResult ) );
if ( nPos == nIndex )
{
@@ -294,7 +281,7 @@ sal_uInt32 HierarchyResultSetDataSupplier::totalCount()
{
const HierarchyEntryData& rResult = *m_pImpl->m_aIterator;
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;