summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-10-05 20:49:26 +0200
committerJulien Nabet <serval2412@yahoo.fr>2021-10-05 23:09:56 +0200
commit10ad9560fba562f494fa44fc8a7bd2388d9e8c5c (patch)
tree734c31a455749a7c30556a05b62bcf21cf9ad7df /xmlhelp
parent1f90b8086fcad7ac033e76a96bf102db7c15e44f (diff)
drop 'using namespace std' in o* r* x*
Change-Id: I15d56d133cf464a3cb6483be785b1259c7f35b43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123120 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx29
1 files changed, 14 insertions, 15 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 6fa762de325e..3806dd68bdd4 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -44,7 +44,6 @@
#include "resultsetforquery.hxx"
#include "databases.hxx"
-using namespace std;
using namespace chelp;
using namespace com::sun::star;
using namespace com::sun::star::ucb;
@@ -85,7 +84,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
xTrans->loadModule(TransliterationModules_UPPERCASE_LOWERCASE,
aLocale );
- vector< vector< OUString > > queryList;
+ std::vector< std::vector< OUString > > queryList;
{
sal_Int32 idx;
OUString query = aURLParameter.get_query();
@@ -95,7 +94,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
if( idx == -1 )
idx = query.getLength();
- vector< OUString > currentQuery;
+ std::vector< OUString > currentQuery;
OUString tmp(query.copy( 0,idx ));
Sequence<sal_Int32> aSeq;
OUString toliterate = xTrans->transliterate(
@@ -112,7 +111,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
}
}
- vector< OUString > aCompleteResultVector;
+ std::vector< OUString > aCompleteResultVector;
OUString scope = aURLParameter.get_scope();
bool bCaptionsOnly = scope == "Heading";
sal_Int32 hitCount = aURLParameter.get_hitCount();
@@ -120,7 +119,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
IndexFolderIterator aIndexFolderIt( *pDatabases, aURLParameter.get_module(), aURLParameter.get_language() );
OUString idxDir;
bool bExtension = false;
- vector< vector<HitItem> > aIndexFolderResultVectorVector;
+ std::vector< std::vector<HitItem> > aIndexFolderResultVectorVector;
bool bTemporary;
for (;;)
@@ -128,12 +127,12 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
idxDir = aIndexFolderIt.nextIndexFolder( bExtension, bTemporary );
if( idxDir.isEmpty() )
break;
- vector<HitItem> aIndexFolderResultVector;
+ std::vector<HitItem> aIndexFolderResultVector;
try
{
- vector< vector<HitItem> > aQueryListResultVectorVector;
- set< OUString > aSet,aCurrent,aResultSet;
+ std::vector< std::vector<HitItem> > aQueryListResultVectorVector;
+ std::set< OUString > aSet,aCurrent,aResultSet;
int nQueryListSize = queryList.size();
if( nQueryListSize > 1 )
@@ -141,7 +140,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
for( int i = 0; i < nQueryListSize; ++i )
{
- vector<HitItem>* pQueryResultVector;
+ std::vector<HitItem>* pQueryResultVector;
if( nQueryListSize > 1 )
{
aQueryListResultVectorVector.emplace_back();
@@ -156,8 +155,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
const std::vector< OUString >& aListItem = queryList[i];
OUString aNewQueryStr = aListItem[0];
- vector<float> aScoreVector;
- vector<OUString> aPathVector;
+ std::vector<float> aScoreVector;
+ std::vector<OUString> aPathVector;
try
{
@@ -201,7 +200,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
{
for( int n = 0 ; n < nQueryListSize ; ++n )
{
- vector<HitItem>& rQueryResultVector = aQueryListResultVectorVector[n];
+ std::vector<HitItem>& rQueryResultVector = aQueryListResultVectorVector[n];
int nItemCount = rQueryResultVector.size();
for( int i = 0 ; i < nItemCount ; ++i )
@@ -251,7 +250,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
int nVectorCount = aIndexFolderResultVectorVector.size();
- std::unique_ptr<std::vector<HitItem>::size_type[]> pCurrentVectorIndex(new vector<HitItem>::size_type[nVectorCount]);
+ std::unique_ptr<std::vector<HitItem>::size_type[]> pCurrentVectorIndex(new std::vector<HitItem>::size_type[nVectorCount]);
for( int j = 0 ; j < nVectorCount ; ++j )
pCurrentVectorIndex[j] = 0;
@@ -263,7 +262,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
float fBestScore = 0.0;
for( int k = 0 ; k < nVectorCount ; ++k )
{
- vector<HitItem>& rIndexFolderVector = aIndexFolderResultVectorVector[k];
+ std::vector<HitItem>& rIndexFolderVector = aIndexFolderResultVectorVector[k];
if( pCurrentVectorIndex[k] < rIndexFolderVector.size() )
{
const HitItem& rItem = rIndexFolderVector[ pCurrentVectorIndex[k] ];
@@ -279,7 +278,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
if( iVectorWithBestScore == -1 ) // No item left at all
break;
- vector<HitItem>& rIndexFolderVector = aIndexFolderResultVectorVector[iVectorWithBestScore];
+ std::vector<HitItem>& rIndexFolderVector = aIndexFolderResultVectorVector[iVectorWithBestScore];
const HitItem& rItem = rIndexFolderVector[ pCurrentVectorIndex[iVectorWithBestScore] ];
pCurrentVectorIndex[iVectorWithBestScore]++;