diff options
Diffstat (limited to 'xmlhelp')
4 files changed, 6 insertions, 14 deletions
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(); |