From 9ffdf7adc00d8e9d931184d3008f4e505e4a5024 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 16 May 2018 10:05:56 +0200 Subject: loplugin:unusedfields in tools..xmlhelp Change-Id: I5e909a8def86ce9ad150440e6c6ad304e855cc69 Reviewed-on: https://gerrit.libreoffice.org/54415 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 10 ++++------ xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx | 6 ------ xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2 +- xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) (limited to 'xmlhelp') diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index dc7982a87e73..b2b7e29a2dbe 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -34,11 +34,9 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext const uno::Sequence< beans::Property >& seq, URLParameter const & aURLParameter, Databases* pDatabases ) - : ResultSetBase( rxContext, xProvider,seq ), - m_aURLParameter( aURLParameter ), - m_pDatabases( pDatabases ) + : ResultSetBase( rxContext, xProvider,seq ) { - m_aPath = m_pDatabases->getModuleList( m_aURLParameter.get_language() ); + m_aPath = pDatabases->getModuleList( aURLParameter.get_language() ); m_aItems.resize( m_aPath.size() ); m_aIdents.resize( m_aPath.size() ); @@ -52,9 +50,9 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext "vnd.sun.star.help://" + m_aPath[i] + "?Language=" + - m_aURLParameter.get_language() + + aURLParameter.get_language() + "&System=" + - m_aURLParameter.get_system(); + aURLParameter.get_system(); m_nRow = sal_Int32( i ); diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx index 20c41e738b68..6a54edd07c1a 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx @@ -41,12 +41,6 @@ namespace chelp { const css::uno::Sequence< css::beans::Property >& seq, URLParameter const & aURLParameter, Databases* pDatabases ); - - - private: - - URLParameter m_aURLParameter; - Databases* m_pDatabases; }; } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index b43d0d547b95..fb0aa90cb62b 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -152,7 +152,7 @@ OUString URLParameter::get_title() } -OUString const & URLParameter::get_language() +OUString const & URLParameter::get_language() const { return m_aLanguage; } diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index b70b445c0b20..5b30916c278a 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -144,7 +144,7 @@ namespace chelp { return m_aModule; } - OUString const & get_language(); + OUString const & get_language() const; OUString const & get_program(); -- cgit ce-4.0.6.2'>distro/collabora/libreoffice-4.0.6.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-11-23move preventduplicateinteraction from framework to sfx2 consumerCaolán McNamara
2017-09-18unused menu extension supplier stuffNoel Grandin
2017-07-21migrate to boost::gettextCaolán McNamara
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky
2016-06-08tdf#99815 use XNotifyingDispatch in sfx2Juergen Funk
2016-03-11framework: Kill BmkMenuMaxim Monastirsky
2016-01-12GetImageFromURL/SetImageProducer unusedNoel Grandin
2014-07-08use SimpleReferenceObject in comphelper moduleNoel Grandin
2014-06-04update_pch: add a bunch of pch filesThomas Arnhold