summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-06 14:40:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-09 11:33:43 +0100
commitabe39f7781f59b96c5a8d3dd5b41c60fdf04ad84 (patch)
tree0f72d1968e5f25e3f280688a414398e3f4a7cce8 /xmlhelp
parentbdb1c72198f60fdd91460e26282134d43bc0e2df (diff)
improve loplugin:unusedfields
noticed something that wasn't being picked up, wrote some tests, and found an unhandled case in Plugin::getParentFunctionDecl Change-Id: I52b4ea273be6614e197392dfc4d6053bbc1704de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90141 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx17
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx5
2 files changed, 8 insertions, 14 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
index 40a87124cef3..04e8596f6455 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
@@ -76,8 +76,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
const uno::Sequence< beans::Property >& seq,
const URLParameter& aURLParameter,
Databases* pDatabases )
- : ResultSetBase( rxContext,xProvider,seq ),
- m_aURLParameter( aURLParameter )
+ : ResultSetBase( rxContext,xProvider,seq )
{
Reference< XExtendedTransliteration > xTrans = Transliteration::create( rxContext );
Locale aLocale( aURLParameter.get_language(),
@@ -89,7 +88,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
vector< vector< OUString > > queryList;
{
sal_Int32 idx;
- OUString query = m_aURLParameter.get_query();
+ OUString query = aURLParameter.get_query();
while( !query.isEmpty() )
{
idx = query.indexOf( ' ' );
@@ -114,11 +113,11 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
}
vector< OUString > aCompleteResultVector;
- OUString scope = m_aURLParameter.get_scope();
+ OUString scope = aURLParameter.get_scope();
bool bCaptionsOnly = scope == "Heading";
- sal_Int32 hitCount = m_aURLParameter.get_hitCount();
+ sal_Int32 hitCount = aURLParameter.get_hitCount();
- IndexFolderIterator aIndexFolderIt( *pDatabases, m_aURLParameter.get_module(), m_aURLParameter.get_language() );
+ IndexFolderIterator aIndexFolderIt( *pDatabases, aURLParameter.get_module(), aURLParameter.get_language() );
OUString idxDir;
bool bExtension = false;
vector< vector<HitItem> > aIndexFolderResultVectorVector;
@@ -253,7 +252,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
for( int j = 0 ; j < nVectorCount ; ++j )
pCurrentVectorIndex[j] = 0;
- sal_Int32 nTotalHitCount = m_aURLParameter.get_hitCount();
+ sal_Int32 nTotalHitCount = aURLParameter.get_hitCount();
sal_Int32 nHitCount = 0;
while( nHitCount < nTotalHitCount )
{
@@ -312,9 +311,9 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< uno::XComponentConte
m_aPath[m_nRow] =
m_aPath[m_nRow] +
"?Language=" +
- m_aURLParameter.get_language() +
+ aURLParameter.get_language() +
"&System=" +
- m_aURLParameter.get_system();
+ aURLParameter.get_system();
uno::Reference< XContent > content = queryContent();
if( content.is() )
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index 2a3127b2b5ac..bc1318719b3a 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -40,11 +40,6 @@ namespace chelp {
const css::uno::Sequence< css::beans::Property >& seq,
const URLParameter& aURLParameter,
Databases* pDatabases );
-
-
- private:
-
- URLParameter const m_aURLParameter;
};
}