From 77d215ae2ed9bd08444a5128729066b6025bef27 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 4 Jan 2013 11:20:21 +0200
Subject: fdo#46808, use new method
 OConfigurationTreeRoot::createWithComponentContext

.. everywhere that was using createWithServiceFactory, and delete the old
method.

Change-Id: I02cb2bfbcc2390494383579d2f14caa4fc5b8014
---
 unotools/inc/unotools/confignode.hxx           | 15 ---------------
 unotools/inc/unotools/configvaluecontainer.hxx |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'unotools/inc')

diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx
index 51ce1e05c904..765a5ecb23b6 100644
--- a/unotools/inc/unotools/confignode.hxx
+++ b/unotools/inc/unotools/confignode.hxx
@@ -281,21 +281,6 @@ namespace utl
                 sal_Bool _bLazyWrite = sal_True
             );
 
-        /** open a new top-level configuration node<p/>
-            opens a new node which is the root if an own configuration sub tree. This is what "top level" means: The
-            node does not have a parent. It does not mean that the node represents a module tree (like org.openoffice.Office.Writer
-            or such).<br/>
-            In opposite to <method>createWithProvider</method>, createWithProvider expects a service factory. This factory
-            is used to create a configuration provider, and this provider is used to retrieve the node
-            @see    createWithProvider
-            @param      _rxORB          service factory to use to create the configuration provider.
-            @param      _rPath          path to the node the object should represent
-            @param      _nDepth         depth for node retrieval
-            @param      _eMode          specifies which privileges should be applied when retrieving the node
-        */
-        static OConfigurationTreeRoot createWithServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
-            const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True);
-
         /** open a new top-level configuration node<p/>
             opens a new node which is the root if an own configuration sub tree. This is what "top level" means: The
             node does not have a parent. It does not mean that the node represents a module tree (like org.openoffice.Office.Writer
diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx
index 42da163916c1..b01eb9e8119c 100644
--- a/unotools/inc/unotools/configvaluecontainer.hxx
+++ b/unotools/inc/unotools/configvaluecontainer.hxx
@@ -20,7 +20,7 @@
 
 #ifndef UNOTOOLS_CONFIGVALUECONTAINER_HXX
 #define UNOTOOLS_CONFIGVALUECONTAINER_HXX
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/mutex.hxx>
 
 //.........................................................................
@@ -84,7 +84,7 @@ namespace utl
                 specifies the number of levels to access under the node given by <arg>_pConfigLocation</arg>
         */
         OConfigurationValueContainer(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
             ::osl::Mutex& _rAccessSafety,
             const sal_Char* _pConfigLocation,
             const sal_uInt16 _nAccessFlags = CVC_UPDATE_ACCESS | CVC_LAZY_UPDATE,
-- 
cgit