diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-16 14:05:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-24 11:29:53 +0200 |
| commit | e8aa70b5d44a6cbedacfe0e5d1b1da2c76a3c588 (patch) | |
| tree | 2cb20208eb30391718b57c6302d3dcd6b2e99673 /filter/source | |
| parent | 3688466ab127d7801b4cb752ee6205cc04acb2f7 (diff) | |
fdo#46808, convert comphelper::ConfigurationHelper to XComponentContext
Convert the helper methods to take an XComponentContext parameter,
instead of XMultiServiceFactory.
Change-Id: I9f0098af37b91f107d8799f14caa04756eac82b1
Diffstat (limited to 'filter/source')
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 2 | ||||
| -rw-r--r-- | filter/source/config/cache/filterfactory.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 9159f20a19ab..ee0ac397818a 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -2466,7 +2466,7 @@ sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule) { m_xModuleCfg = css::uno::Reference< css::container::XNameAccess >( ::comphelper::ConfigurationHelper::openConfig( - m_xSMGR, + comphelper::getComponentContext(m_xSMGR), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office/Factories" )), ::comphelper::ConfigurationHelper::E_READONLY), css::uno::UNO_QUERY_THROW); diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index fa918f683060..cfba722a43aa 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -24,6 +24,7 @@ #include "versions.hxx" #include <com/sun/star/lang/XInitialization.hpp> +#include <comphelper/processfactory.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/configurationhelper.hxx> #include <rtl/ustrbuf.hxx> @@ -487,7 +488,7 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const try { css::uno::Reference< css::container::XNameAccess > xModuleConfig( - ::comphelper::ConfigurationHelper::openConfig(xSMGR, + ::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR), CFGPACKAGE_OOO_MODULES, ::comphelper::ConfigurationHelper::E_READONLY), css::uno::UNO_QUERY_THROW); @@ -570,7 +571,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS try { css::uno::Reference< css::container::XNameAccess > xUISortConfig( - ::comphelper::ConfigurationHelper::openConfig(xSMGR, + ::comphelper::ConfigurationHelper::openConfig( comphelper::getComponentContext(xSMGR), CFGPACKAGE_TD_UISORT, ::comphelper::ConfigurationHelper::E_READONLY), css::uno::UNO_QUERY_THROW); |