fdo#46808, Convert some XMultiServiceFactory to XComponentContext

Change-Id: I7223d8e2c962ca90eda08119ed73a034d334329d

5 files changed, 10 insertions, 10 deletions

diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 6ed4f5580a3f..a9861caad220 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -92,7 +92,7 @@ class Job : public  css::lang::XTypeProvider
         /**
             We need it to create own services on demand.
          */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /**
             Hold the (may asynchronous) job alive.
@@ -176,9 +176,9 @@ class Job : public  css::lang::XTypeProvider
 
     public:
 
-                 Job( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR  ,
+                 Job( const css::uno::Reference< css::uno::XComponentContext >& xContext  ,
                       const css::uno::Reference< css::frame::XFrame >&              xFrame );
-                 Job( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR  ,
+                 Job( const css::uno::Reference< css::uno::XComponentContext >& xContext  ,
                       const css::uno::Reference< css::frame::XModel >&              xModel );
         virtual ~Job(                                                                      );
 
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 47f2c62b17b8..950023034545 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -77,7 +77,7 @@ class JobDispatch : public  css::lang::XTypeProvider
     private:
 
         /** reference to the uno service manager */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** reference to the frame, inside which this dispatch is used */
         css::uno::Reference< css::frame::XFrame > m_xFrame;
@@ -90,7 +90,7 @@ class JobDispatch : public  css::lang::XTypeProvider
 
     public:
 
-                  JobDispatch( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
+                  JobDispatch( const css::uno::Reference< css::uno::XComponentContext >& xContext );
          virtual ~JobDispatch(                                                                     );
 
         void impl_dispatchEvent  ( const OUString&                                            sEvent    ,
diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index 931fb071af80..a557470b52ee 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -65,7 +65,7 @@ class JobExecutor : public  css::lang::XTypeProvider
     private:
 
         /** reference to the uno service manager */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** reference to the module info service */
         css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager;
@@ -84,7 +84,7 @@ class JobExecutor : public  css::lang::XTypeProvider
 
     public:
 
-                  JobExecutor( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
+                  JobExecutor( const css::uno::Reference< css::uno::XComponentContext >& xContext );
          virtual ~JobExecutor(                                                                     );
 
     //___________________________________
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 0a8be679a7bd..de9525eaa88c 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -63,7 +63,7 @@ namespace framework
                                   public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XImageManager>
     {
         public:
-            ModuleImageManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager );
+            ModuleImageManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
             virtual ~ModuleImageManager();
 
             // XComponent
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 25894ce5ecff..efa56ec0a3ab 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -74,7 +74,7 @@ namespace framework
             FWK_DECLARE_XTYPEPROVIDER
             DECLARE_XSERVICEINFO
 
-            ModuleUIConfigurationManager( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceManager );
+            ModuleUIConfigurationManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xServiceManager );
             virtual ~ModuleUIConfigurationManager();
 
             // XComponent
@@ -199,7 +199,7 @@ namespace framework
             OUString                                                                   m_aModuleIdentifier;
             OUString                                                                   m_aModuleShortName;
             com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >      m_xUserRootCommit;
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    m_xServiceManager;
+            com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >        m_xContext;
             ::cppu::OMultiTypeInterfaceContainerHelper                                      m_aListenerContainer;   /// container for ALL Listener
             com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              m_xModuleImageManager;
             com::sun::star::uno::Reference< com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;