fdo#46808, Convert some XMultiServiceFactory to XComponentContext

Change-Id: I8272ecab34711654ed27625a571cf2553ffd7468

7 files changed, 16 insertions, 16 deletions

diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index a5cfa5e61d39..b564f91b96fa 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -170,7 +170,7 @@ class StatusIndicatorFactory : public  css::lang::XTypeProvider
         IndicatorStack m_aStack;
 
         /** uno service manager to create own needed uno resources. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** most active indicator child, which could work with our shared indicator window only. */
         css::uno::Reference< css::task::XStatusIndicator > m_xActiveChild;
@@ -213,7 +213,7 @@ class StatusIndicatorFactory : public  css::lang::XTypeProvider
 
         //---------------------------------------
         // ctor
-        StatusIndicatorFactory(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+        StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
         //---------------------------------------
         // XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index b6ac8255951e..7dfc262c641f 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -30,7 +30,7 @@
 
 #include <general.h>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <com/sun/star/lang/XInitialization.hpp>
 
@@ -88,7 +88,7 @@ class TitleBarUpdate : // interfaces
     private:
 
         /// may we need an uno service manager to create own services
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /// reference to the frame which was created by the office himself
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
@@ -100,7 +100,7 @@ class TitleBarUpdate : // interfaces
 
         //____________________________
         // ctor/dtor
-                 TitleBarUpdate(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+                 TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext);
         virtual ~TitleBarUpdate(                                                                   );
 
         //____________________________
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index ed8d71ff800a..a54fbcbb7231 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -58,7 +58,7 @@ class ShellJob : private ThreadHelpBase
 
         //.......................................
         /** @short  reference to an uno service manager. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
     //-------------------------------------------
     // native interface
@@ -67,11 +67,11 @@ class ShellJob : private ThreadHelpBase
         //---------------------------------------
         /** @short  create new instance of this class.
 
-            @param  xSMGR
+            @param  xContext
                     reference to the uno service manager, which created this instance.
                     Can be used later to create own needed uno resources on demand.
          */
-        ShellJob(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+        ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
         //---------------------------------------
         /** @short  does nothing real ...
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index e88893a97a93..bfdfc4b2cc5e 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -59,14 +59,13 @@ class DispatchRecorder
 {
     // private member
     private:
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR        ;
         DispatchStatementList                                  m_aStatements;
         sal_Int32                                              m_nRecordingID ;
         css::uno::Reference< css::script::XTypeConverter >     m_xConverter;
 
     // public interface
     public:
-        DispatchRecorder( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
+        DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xSMGR );
         ~DispatchRecorder();
 
         // XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 2d837c05884d..51359c0ca391 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -307,7 +307,7 @@ class AutoRecovery  : public  css::lang::XTypeProvider
         /** @short  the global uno service manager.
             @descr  Must be used to create own needed services.
          */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         //---------------------------------------
         /** @short  points to the underlying recovery configuration.
@@ -439,7 +439,7 @@ class AutoRecovery  : public  css::lang::XTypeProvider
 
     public:
 
-                 AutoRecovery(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+                 AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext);
         virtual ~AutoRecovery(                                                                   );
 
         // XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx
index 17517c326b06..734291c7b72e 100644
--- a/framework/inc/services/backingcomp.hxx
+++ b/framework/inc/services/backingcomp.hxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XKeyListener.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <com/sun/star/frame/XFrame.hpp>
 
@@ -74,7 +75,7 @@ class BackingComp : public  css::lang::XTypeProvider
 
         /** the global uno service manager.
             Must be used to create own needed services. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** reference to the component window. */
         css::uno::Reference< css::awt::XWindow > m_xWindow;
@@ -90,7 +91,7 @@ class BackingComp : public  css::lang::XTypeProvider
 
     public:
 
-                 BackingComp( const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR );
+                 BackingComp( const css::uno::Reference< css::uno::XComponentContext >& xContext );
         virtual ~BackingComp(                                                                    );
 
         // XInterface
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 7bf8d4838304..9abb77a14bc6 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -93,7 +93,7 @@ namespace framework
         public:
             enum { DOCKINGAREAS_COUNT = 4 };
 
-            LayoutManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rSMGR );
+            LayoutManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
             virtual ~LayoutManager();
 
             /** declaration of XInterface, XTypeProvider, XServiceInfo */
@@ -285,7 +285,7 @@ namespace framework
             virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper();
             virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException);
 
-            css::uno::Reference< css::lang::XMultiServiceFactory >                      m_xSMGR; /** reference to factory, which has created this instance. */
+            css::uno::Reference< css::uno::XComponentContext >                          m_xContext; /** reference to factory, which has created this instance. */
             css::uno::Reference< css::util::XURLTransformer >                           m_xURLTransformer;
             css::uno::Reference< css::frame::XFrame >                                   m_xFrame;
             css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >        m_xModuleCfgMgr;