fdo#46808, Adapt reflection::ProxyFactory UNO service to new style

The service is deprecated, but we still have a handful of in-tree
users, and converting it lets me thread XComponentContext through
a bunch of classes.

Change-Id: Iffdfe537ada6b9e4a89f9b3c8dd82ca85f4bfaba

2 files changed, 16 insertions, 16 deletions

diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index dfd144becd1b..1b4ab52cf69b 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.hxx
@@ -76,7 +76,7 @@ namespace comphelper
 
     public:
         /** ctor
-            @param _rxORB
+            @param _rxContext
                 a service factory
 
             @param _rxInnerAccessible
@@ -86,7 +86,7 @@ namespace comphelper
                 The XAccessible which is our parent
         */
         OAccessibleWrapper(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxInnerAccessible,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible
         );
@@ -160,7 +160,7 @@ namespace comphelper
     protected:
         /** ctor
 
-            @param _rxORB
+            @param _rxContext
                 a service factory
 
             @param _rxInnerAccessibleContext
@@ -176,7 +176,7 @@ namespace comphelper
                 The XAccessible to return in the getAccessibleParent call
         */
         OAccessibleContextWrapperHelper(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             ::cppu::OBroadcastHelper& _rBHelper,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerAccessibleContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxOwningAccessible,
@@ -247,7 +247,7 @@ namespace comphelper
     public:
         /** ctor
 
-            @param _rxORB
+            @param _rxContext
                 a service factory
 
             @param _rxInnerAccessibleContext
@@ -263,7 +263,7 @@ namespace comphelper
                 The XAccessible to return in the getAccessibleParent call
         */
         OAccessibleContextWrapper(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext >& _rxInnerAccessibleContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxOwningAccessible,
             const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxParentAccessible
@@ -330,8 +330,8 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC OWrappedAccessibleChildrenManager : public OWrappedAccessibleChildrenManager_Base
     {
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                                m_xORB;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+                                m_xContext;
         ::com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible >
                                 m_aOwningAccessible;    // the XAccessible which belongs to the XAccessibleContext which we work for
         AccessibleMap           m_aChildrenMap;         // for caching children
@@ -340,7 +340,7 @@ namespace comphelper
     public:
         /// ctor
         OWrappedAccessibleChildrenManager(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext
         );
 
         /** specifies if the children are to be consideren transient (i.e.: not cached)
diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx b/comphelper/inc/comphelper/proxyaggregation.hxx
index de32f583c6ab..2d78b865b547 100644
--- a/comphelper/inc/comphelper/proxyaggregation.hxx
+++ b/comphelper/inc/comphelper/proxyaggregation.hxx
@@ -82,16 +82,16 @@ namespace comphelper
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >             m_xProxyAggregate;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >           m_xProxyTypeAccess;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >    m_xORB;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
 
     protected:
-        inline const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getORB()
+        inline const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getComponentContext()
         {
-            return m_xORB;
+            return m_xContext;
         }
 
     protected:
-        OProxyAggregation( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
+        OProxyAggregation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext );
         ~OProxyAggregation();
 
         /// to be called from within your ctor
@@ -138,7 +138,7 @@ namespace comphelper
 
     protected:
         // OProxyAggregation
-        using OProxyAggregation::getORB;
+        using OProxyAggregation::getComponentContext;
 
         // XInterface
         ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException);
@@ -148,7 +148,7 @@ namespace comphelper
 
     protected:
         OComponentProxyAggregationHelper(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             ::cppu::OBroadcastHelper& _rBHelper
         );
         virtual ~OComponentProxyAggregationHelper( );
@@ -183,7 +183,7 @@ namespace comphelper
     {
     protected:
         OComponentProxyAggregation(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComponent
         );