fdo#46808, convert XMultiServiceFactory to XComponentContext

Change-Id: I5ed0b12bf37e7d235fc88182c006a6ed07ef2343

3 files changed, 11 insertions, 11 deletions

diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index c4f866577ccc..51e06de59be0 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -45,7 +45,7 @@ class LoadDispatcher : private ThreadHelpBase
     private:
 
         /** @short  can be used to create own needed services on demand. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** @short  TODO document me */
         css::uno::WeakReference< css::frame::XFrame > m_xOwnerFrame;
@@ -70,7 +70,7 @@ class LoadDispatcher : private ThreadHelpBase
                     That means: It can be used to load any further requested content into tzhe here(!)
                     specified target frame.
 
-            @param  xSMGR
+            @param  xContext
                     will be used to create own needed services on demand.
 
             @param  xOwnerFrame
@@ -83,8 +83,8 @@ class LoadDispatcher : private ThreadHelpBase
             @param  nSearchFlags
                     used in case sTargetFrame isnt a special one.
          */
-        LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR       ,
-                       const css::uno::Reference< css::frame::XFrame >&              xOwnerFrame ,
+        LoadDispatcher(const css::uno::Reference< css::uno::XComponentContext >& xContext,
+                       const css::uno::Reference< css::frame::XFrame >&          xOwnerFrame ,
                        const OUString                                         sTargetName ,
                              sal_Int32                                               nSearchFlags);
 
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 9624e9c99fa0..64fc5e41a1d9 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -48,7 +48,7 @@ class WindowCommandDispatch : private ThreadHelpBase
     private:
 
         /// can be used to create own needed services on demand.
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /// knows the frame, where we dispatch our commands as weak reference
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
@@ -69,13 +69,13 @@ class WindowCommandDispatch : private ThreadHelpBase
                     Means: 1 MACDispatch object is bound to 1 Frame/Window pair in which context
                     the detected commands will be executed.
 
-            @param  xSMGR
+            @param  xContext
                     will be used to create own needed services on demand.
 
             @param  xFrame
                     used as for new detected commands.
          */
-        WindowCommandDispatch(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
+        WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >&     xContext ,
                               const css::uno::Reference< css::frame::XFrame >&              xFrame);
 
         //_______________________________________
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index f8c78193eb7b..dc62622306bd 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -110,7 +110,7 @@ private:
     /** @short  reference to an uno service manager, which must be used
                 to created on needed services on demand.
      */
-    css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     /** @short  points to the frame, which uses this LoadEnv object
                 and must be used to start target search there.
@@ -200,7 +200,7 @@ public:
 
     /** @short  initialize a new instance of this load environment.
 
-        @param  xSMGR
+        @param  xContext
                 reference to an uno service manager, which can be used internaly
                 to create on needed services on demand.
 
@@ -209,7 +209,7 @@ public:
         @throw  A RuntimeException in case any internal process indicates, that
                 the whole runtime cant be used any longer.
      */
-    LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
+    LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
         throw(LoadEnvException, css::uno::RuntimeException);
 
     /** @short  deinitialize an instance of this class in the right way.
@@ -217,7 +217,7 @@ public:
     ~LoadEnv();
 
     static css::uno::Reference< css::lang::XComponent > loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >&    xLoader,
-                                                                             const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR  ,
+                                                                             const css::uno::Reference< css::uno::XComponentContext >&     xContext,
                                                                              const OUString&                                        sURL   ,
                                                                              const OUString&                                        sTarget,
                                                                                    sal_Int32                                               nFlags ,