From e8aa70b5d44a6cbedacfe0e5d1b1da2c76a3c588 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
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
---
 sfx2/source/appl/appopen.cxx | 2 +-
 sfx2/source/appl/appserv.cxx | 2 +-
 sfx2/source/appl/newhelp.cxx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sfx2/source/appl')

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 1d1798ffb659..348f1c11f172 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -999,7 +999,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
                     try
                     {
                         // get registered protocol handlers from configuration
-                        Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessServiceFactory(),
+                        Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(),
                             ::rtl::OUString("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
                         if ( xAccess.is() )
                         {
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 450da3e9eebc..c008ca2286db 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1002,7 +1002,7 @@ static ::rtl::OUString getConfigurationStringValue(
     try
     {
         ::comphelper::ConfigurationHelper::readDirectKey(
-            comphelper::getProcessServiceFactory(),
+            comphelper::getProcessComponentContext(),
             rPackage,
             rRelPath,
             rKey,
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 1441c36db915..3e39f645395c 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2170,7 +2170,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
 {
     sCurrentFactory = SfxHelp::GetCurrentModuleIdentifier();
 
-    Reference< XMultiServiceFactory > xMultiServiceFac = ::comphelper::getProcessServiceFactory();
+    Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
     Reference< XInterface > xConfig;
     ::rtl::OUString sPath( PATH_OFFICE_FACTORIES );
     sPath += sCurrentFactory;
@@ -2185,7 +2185,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
     try
     {
         xConfiguration = ConfigurationHelper::openConfig(
-            xMultiServiceFac, PACKAGE_SETUP, ConfigurationHelper::E_STANDARD );
+            xContext, PACKAGE_SETUP, ConfigurationHelper::E_STANDARD );
         if ( xConfiguration.is() )
         {
             Any aAny = ConfigurationHelper::readRelativeKey( xConfiguration, sPath, sKey );
-- 
cgit