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

loplugin:useuniqueptr in ResultSetForQuery

Change-Id: Ie375f7fded2592cd1e926f14be0216608c2695d6
Reviewed-on: https://gerrit.libreoffice.org/63130
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ee204f8f
...@@ -128,7 +128,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte ...@@ -128,7 +128,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
try try
{ {
vector< vector<HitItem>* > aQueryListResultVectorVector; vector< vector<HitItem> > aQueryListResultVectorVector;
set< OUString > aSet,aCurrent,aResultSet; set< OUString > aSet,aCurrent,aResultSet;
int nQueryListSize = queryList.size(); int nQueryListSize = queryList.size();
...@@ -140,8 +140,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte ...@@ -140,8 +140,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
vector<HitItem>* pQueryResultVector; vector<HitItem>* pQueryResultVector;
if( nQueryListSize > 1 ) if( nQueryListSize > 1 )
{ {
pQueryResultVector = new vector<HitItem>; aQueryListResultVectorVector.emplace_back();
aQueryListResultVectorVector.push_back( pQueryResultVector ); pQueryResultVector = &aQueryListResultVectorVector.back();
} }
else else
{ {
...@@ -197,8 +197,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte ...@@ -197,8 +197,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
{ {
for( int n = 0 ; n < nQueryListSize ; ++n ) for( int n = 0 ; n < nQueryListSize ; ++n )
{ {
vector<HitItem>* pQueryResultVector = aQueryListResultVectorVector[n]; vector<HitItem>& rQueryResultVector = aQueryListResultVectorVector[n];
vector<HitItem>& rQueryResultVector = *pQueryResultVector;
int nItemCount = rQueryResultVector.size(); int nItemCount = rQueryResultVector.size();
for( int i = 0 ; i < nItemCount ; ++i ) for( int i = 0 ; i < nItemCount ; ++i )
...@@ -229,8 +228,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte ...@@ -229,8 +228,6 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
} }
} }
} }
delete pQueryResultVector;
} }
sort( aIndexFolderResultVector.begin(), aIndexFolderResultVector.end() ); sort( aIndexFolderResultVector.begin(), aIndexFolderResultVector.end() );
......
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