fdo#46808, Convert the rest of XMultiServiceFactory in framework module

Change-Id: Ife3caf00ab37a8c344f0ab90e40337b3b5bc1571

13 files changed, 29 insertions, 31 deletions

diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index a17e1dc5416d..73dbfafae86a 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -65,9 +65,6 @@ class TagWindowAsModified :   // interfaces
 
     private:
 
-        /// may we need an uno service manager to create own services
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
-
         /// reference to the frame, where we listen for new loaded documents for updating our own xModel reference
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
 
@@ -84,7 +81,7 @@ class TagWindowAsModified :   // interfaces
 
         //____________________________
         // ctor/dtor
-                 TagWindowAsModified(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+                 TagWindowAsModified();
         virtual ~TagWindowAsModified(                                                                   );
 
         //____________________________
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index a2a89d194fd5..4c0e47bf7d17 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -58,7 +58,7 @@ class DispatchHelper : public ThreadHelpBase                      // must be the
 
         /** global uno service manager.
             Can be used to create own needed services. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** used to wait for asynchronous listener callbacks. */
         ::osl::Condition m_aBlock;
@@ -75,8 +75,8 @@ class DispatchHelper : public ThreadHelpBase                      // must be the
         //---------------------------------------
         // ctor/dtor
 
-                 DispatchHelper( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
-        virtual ~DispatchHelper(                                                                     );
+                 DispatchHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext );
+        virtual ~DispatchHelper(                                                                    );
 
         //---------------------------------------
         // XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index 68dc4d8d83c2..2427622ab20d 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/frame/XModuleManager2.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase3.hxx>
 
 namespace com { namespace sun { namespace star { namespace lang {
@@ -62,7 +63,7 @@ class ModuleManager:
         /** 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;
 
         //---------------------------------------
         /** points to the underlying configuration.
@@ -93,7 +94,7 @@ class ModuleManager:
             css::uno::Reference< css::lang::XMultiServiceFactory > const &
                 manager);
 
-                 ModuleManager(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+                 ModuleManager(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
         virtual ~ModuleManager(                                                                   );
 
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 0c7e2e272be2..d90721e97831 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -122,7 +122,7 @@ class PathSettings : public  css::lang::XTypeProvider             ,
     private:
 
         /** reference to factory, which has create this instance. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         /** list of all path variables and her corresponding values. */
         PathSettings::PathHash m_lPaths;
@@ -156,7 +156,7 @@ class PathSettings : public  css::lang::XTypeProvider             ,
             Attention: It's neccessary for right function of this class, that the order of base
             classes is the right one. Because we transfer information from one base to another
             during this ctor runs! */
-        PathSettings(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+        PathSettings(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
         /** free all used resources ... if it was not already done. */
         virtual ~PathSettings();
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index e9853e1dad79..7604a879a2a4 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -223,7 +223,7 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
     friend class SubstitutePathVariables_Impl;
 
     public:
-        SubstitutePathVariables( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        SubstitutePathVariables( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
         virtual ~SubstitutePathVariables();
 
         //  XInterface, XTypeProvider, XServiceInfo
@@ -281,7 +281,7 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
             SubstitutePathVariables_Impl m_aImpl;                 // Implementation class that access the configuration
             ReSubstFixedVarOrderVector   m_aReSubstFixedVarOrder; // To speed up resubstitution fixed variables (order for lookup)
             ReSubstUserVarOrderVector    m_aReSubstUserVarOrder;  // To speed up resubstitution user variables
-            com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+            com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
 };
 
 }
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index 68654e0c89e7..184b12a07a7c 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -98,14 +98,14 @@ class TaskCreatorService : 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;
 
     //___________________________________________
     // interface
 
     public:
 
-                 TaskCreatorService(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
+                 TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext);
         virtual ~TaskCreatorService(                                                                   );
 
         // XInterface, XTypeProvider, XServiceInfo
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index e2bf729a153b..47846eae0fb0 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -61,7 +61,7 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
                    public ::cppu::OWeakObject
 {
     public:
-        TabWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        TabWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
         virtual ~TabWindow();
 
         //  XInterface, XTypeProvider, XServiceInfo
@@ -166,7 +166,7 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
         sal_Int32                                                                        m_nNextTabID;
         OUString                                                                  m_aTitlePropName;
         OUString                                                                  m_aPosPropName;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >     m_xContext;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow >            m_xTopWindow;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >               m_xContainerWindow;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >               m_xTabControlWindow;
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index fb08f20aafbb..df66e495e065 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -45,7 +45,7 @@ class TabWinFactory :  protected ThreadHelpBase
                        public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleComponentFactory, com::sun::star::lang::XServiceInfo>
 {
     public:
-        TabWinFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        TabWinFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
         virtual ~TabWinFactory();
 
         //  XInterface, XTypeProvider, XServiceInfo
@@ -56,7 +56,7 @@ class TabWinFactory :  protected ThreadHelpBase
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& Context ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >    m_xContext;
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit2 >             m_xToolkit;
 };
 
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 1ca6d2383df2..47d1d910c728 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -64,7 +64,7 @@ namespace framework
             FWK_DECLARE_XTYPEPROVIDER
             DECLARE_XSERVICEINFO
 
-            ModuleUIConfigurationManagerSupplier( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+            ModuleUIConfigurationManagerSupplier( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
             virtual ~ModuleUIConfigurationManagerSupplier();
 
             // XComponent
@@ -94,7 +94,7 @@ namespace framework
             com::sun::star::uno::Reference< com::sun::star::embed::XStorage >                   m_xUserCfgRootStorage;
             com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject >          m_xUserRootCommit;
             com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 >          m_xModuleMgr;
-            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
    };
 }
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index ea58ce908ce3..c0930ca72db2 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -45,7 +45,7 @@ namespace framework
                                                             ::com::sun::star::ui::XUIElementFactory>
     {
         public:
-            MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~MenuBarFactory();
 
             //  XInterface, XTypeProvider, XServiceInfo
@@ -63,9 +63,9 @@ namespace framework
                         ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
 
         protected:
-            MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool );
+            MenuBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,bool );
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >     m_xContext;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2 >     m_xModuleManager;
     };
 }
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index 2e0e0cd956a8..382d56bcf9e1 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -34,7 +34,7 @@ namespace framework
 class StatusBarFactory :  public MenuBarFactory
 {
     public:
-        StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
 
         //  XInterface, XTypeProvider, XServiceInfo
         DECLARE_XSERVICEINFO
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index 43384bebec02..db166b228d9a 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -34,7 +34,7 @@ namespace framework
 class ToolBoxFactory :  public MenuBarFactory
 {
     public:
-        ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
 
         //  XInterface, XTypeProvider, XServiceInfo
         DECLARE_XSERVICEINFO
diff --git a/framework/inc/uifactory/uicontrollerfactory.hxx b/framework/inc/uifactory/uicontrollerfactory.hxx
index df3f70aa8603..fd5dfac5ab1a 100644
--- a/framework/inc/uifactory/uicontrollerfactory.hxx
+++ b/framework/inc/uifactory/uicontrollerfactory.hxx
@@ -61,16 +61,16 @@ class UIControllerFactory :  protected ThreadHelpBase, // Struct for right inita
         virtual void SAL_CALL deregisterController( const OUString& aCommandURL, const OUString& aModuleName ) throw (::com::sun::star::uno::RuntimeException);
 
     protected:
-        UIControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager, const rtl::OUString &rUINode  );
+        UIControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, const rtl::OUString &rUINode  );
         sal_Bool                                                                         m_bConfigRead;
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >     m_xContext;
         ConfigurationAccess_ControllerFactory*                                           m_pConfigAccess;
 };
 
 class PopupMenuControllerFactory :  public UIControllerFactory
 {
     public:
-        PopupMenuControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        PopupMenuControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
 
         //  XInterface, XTypeProvider, XServiceInfo
         DECLARE_XSERVICEINFO
@@ -79,7 +79,7 @@ class PopupMenuControllerFactory :  public UIControllerFactory
 class ToolbarControllerFactory :  public UIControllerFactory
 {
     public:
-        ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        ToolbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
 
         //  XInterface, XTypeProvider, XServiceInfo
         DECLARE_XSERVICEINFO
@@ -88,7 +88,7 @@ class ToolbarControllerFactory :  public UIControllerFactory
 class StatusbarControllerFactory :  public UIControllerFactory
 {
     public:
-        StatusbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+        StatusbarControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
 
         //  XInterface, XTypeProvider, XServiceInfo
         DECLARE_XSERVICEINFO