From e8aa70b5d44a6cbedacfe0e5d1b1da2c76a3c588 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Oct 2012 14:05:41 +0200 Subject: fdo#46808, convert comphelper::ConfigurationHelper to XComponentContext Convert the helper methods to take an XComponentContext parameter, instead of XMultiServiceFactory. Change-Id: I9f0098af37b91f107d8799f14caa04756eac82b1 --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'writerfilter/source') diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 069e94c4b4c5..c371723efe43 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -76,14 +76,14 @@ using namespace ::rtl; namespace writerfilter { namespace dmapper{ -sal_Bool lcl_IsUsingEnhancedFields( const uno::Reference< lang::XMultiServiceFactory >& rFac ) +sal_Bool lcl_IsUsingEnhancedFields( const uno::Reference< uno::XComponentContext >& rxContext ) { bool bResult(sal_False); try { OUString writerConfig = "org.openoffice.Office.Common"; - uno::Reference< uno::XInterface > xCfgAccess = ::comphelper::ConfigurationHelper::openConfig( rFac, writerConfig, ::comphelper::ConfigurationHelper::E_READONLY ); + uno::Reference< uno::XInterface > xCfgAccess = ::comphelper::ConfigurationHelper::openConfig( rxContext, writerConfig, ::comphelper::ConfigurationHelper::E_READONLY ); ::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess, OUString( "Filter/Microsoft/Import" ), OUString( "ImportWWFieldsAsEnhancedFields" ) ) >>= bResult; } @@ -198,7 +198,7 @@ DomainMapper_Impl::DomainMapper_Impl( getTableManager( ).setHandler(m_pTableHandler); getTableManager( ).startLevel(); - m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( uno::Reference< lang::XMultiServiceFactory >( m_xComponentContext->getServiceManager(), uno::UNO_QUERY ) ); + m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( m_xComponentContext ); } -- cgit