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
---
 unotools/source/config/historyoptions.cxx | 4 ++--
 unotools/source/config/saveopt.cxx        | 4 ++--
 unotools/source/config/useroptions.cxx    | 2 +-
 unotools/source/config/viewoptions.cxx    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'unotools/source')

diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 00ff1684de57..141555044ec7 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -138,14 +138,14 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
     {
         m_xCfg = Reference< css::container::XNameAccess > (
             ::comphelper::ConfigurationHelper::openConfig(
-            ::comphelper::getProcessServiceFactory(),
+            ::comphelper::getProcessComponentContext(),
             rtl::OUString(s_sHistories),
             ::comphelper::ConfigurationHelper::E_STANDARD),
             css::uno::UNO_QUERY );
 
         m_xCommonXCU = Reference< css::container::XNameAccess > (
             ::comphelper::ConfigurationHelper::openConfig(
-            ::comphelper::getProcessServiceFactory(),
+            ::comphelper::getProcessComponentContext(),
             rtl::OUString(s_sCommonHistory),
             ::comphelper::ConfigurationHelper::E_STANDARD),
             css::uno::UNO_QUERY );
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 18fc09a77784..7f43c5a6be16 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -552,7 +552,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     try
     {
     css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig(
-        ::comphelper::getProcessServiceFactory(),
+        ::comphelper::getProcessComponentContext(),
         ::rtl::OUString("org.openoffice.Office.Recovery"),
         ::comphelper::ConfigurationHelper::E_READONLY);
 
@@ -739,7 +739,7 @@ void SvtSaveOptions_Impl::Commit()
     PutProperties( aNames, aValues );
 
     css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig(
-        ::comphelper::getProcessServiceFactory(),
+        ::comphelper::getProcessComponentContext(),
         ::rtl::OUString("org.openoffice.Office.Recovery"),
         ::comphelper::ConfigurationHelper::E_STANDARD);
 
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 1da014a205bd..8af1121f9e42 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -146,7 +146,7 @@ SvtUserOptions::Impl::Impl() :
     {
         m_xCfg = uno::Reference<container::XNameAccess>(
             comphelper::ConfigurationHelper::openConfig(
-                comphelper::getProcessServiceFactory(),
+                comphelper::getProcessComponentContext(),
                 sData,
                 comphelper::ConfigurationHelper::E_STANDARD
             ),
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 2b4ffbc3add1..688e1ec0d1ec 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -335,7 +335,7 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const ::rtl::OUString& sList )
     {
         m_xRoot = css::uno::Reference< css::container::XNameAccess >(
                         ::comphelper::ConfigurationHelper::openConfig(
-                            ::comphelper::getProcessServiceFactory(),
+                            ::comphelper::getProcessComponentContext(),
                             PACKAGE_VIEWS,
                             ::comphelper::ConfigurationHelper::E_STANDARD),
                         css::uno::UNO_QUERY);
-- 
cgit