fdo#46808, Convert some XMultiservice in framework module

Change-Id: Id4dd0bafd40cf96271527c9c970c4ab31527644c

28 files changed, 108 insertions, 113 deletions

diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index a4b98ddcb4fd..0e31c5e7ba77 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -130,8 +130,8 @@ class Desktop   :   // interfaces
     public:
 
         //  constructor / destructor
-                 Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
-        virtual ~Desktop(                                                                        );
+                 Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext );
+        virtual ~Desktop(                                                                    );
 
         //  XInterface, XTypeProvider, XServiceInfo
         FWK_DECLARE_XINTERFACE
@@ -403,7 +403,7 @@ class Desktop   :   // interfaces
     #ifdef ENABLE_ASSERTIONS
     private:
 
-        static sal_Bool implcp_ctor                     ( const css::uno::Reference< css::lang::XMultiServiceFactory >&     xFactory         );
+        static sal_Bool implcp_ctor                     ( const css::uno::Reference< css::uno::XComponentContext >&         xFactory         );
         static sal_Bool implcp_addEventListener         ( const css::uno::Reference< css::lang::XEventListener >&           xListener        );
         static sal_Bool implcp_removeEventListener      ( const css::uno::Reference< css::lang::XEventListener >&           xListener        );
 
@@ -418,7 +418,7 @@ class Desktop   :   // interfaces
     //-------------------------------------------------------------------------------------------------------------
     private:
 
-        css::uno::Reference< css::lang::XMultiServiceFactory >          m_xFactory                  ;   /// reference to factory, which has create this instance
+        css::uno::Reference< css::uno::XComponentContext >              m_xContext                  ;   /// reference to factory, which has create this instance
         FrameContainer                                                  m_aChildTaskContainer       ;   /// array of child tasks (children of desktop are tasks; and tasks are also frames - But pure frames are not accepted!)
         ::cppu::OMultiTypeInterfaceContainerHelper                      m_aListenerContainer        ;   /// container for ALL Listener
         css::uno::Reference< css::frame::XFrames >                      m_xFramesHelper             ;   /// helper for XFrames, XIndexAccess, XElementAccess and implementation of a childcontainer!
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index c8024b6e4b68..32bd460e4e42 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -85,7 +85,7 @@ class SessionListener :   // interfaces
 
         /** reference to the uno service manager, which created this service.
             It can be used to create own needed helper services. */
-        css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
         css::uno::Reference< css::frame::XSessionManagerClient > m_rSessionManager;
 
@@ -123,7 +123,7 @@ class SessionListener :   // interfaces
                     needed services.
          */
 
-        SessionListener( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
+        SessionListener( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
         virtual ~SessionListener();
 
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 68d93517f08d..a5f4fcfd9fd2 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -47,7 +47,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~ControlMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 255fc519751a..d642a9c37b17 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -44,7 +44,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~FontMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 32a2244838be..c4d43aee3a4d 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -45,7 +45,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~FontSizeMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index 996543ce2b0b..4eeb25073b92 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -27,7 +27,7 @@ namespace framework
     class FooterMenuController :  public HeaderMenuController
     {
         public:
-            FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~FooterMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 3a6613e87b31..4d7ae54ae861 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -46,7 +46,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter = sal_False );
+            HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, bool _bFooter = sal_False );
             virtual ~HeaderMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 84c43ad09d23..38ada6c17f36 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -47,7 +47,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~LanguageSelectionMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index 72e360aab968..c712115a88fd 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -51,13 +51,13 @@ namespace framework
             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >  aArgs;
          };
          DECL_STATIC_LINK( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo* );
-        ::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::XDispatchProvider > m_xDispatchProvider;
         OUString m_aModuleIdentifier;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels;
 
         public:
-            MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~MacrosMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index b86242ef0534..f2ee4ac33f71 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -57,7 +57,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~NewMenuController();
 
             // XServiceInfo
@@ -106,6 +106,7 @@ namespace framework
             OUString       m_aTargetFrame;
             OUString       m_aModuleIdentifier;
             OUString       m_aEmptyDocURL;
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xDocAcceleratorManager;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager;
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index eb4e09af7020..f10014e4340c 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
@@ -45,7 +44,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~ObjectMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index d23e1db5dbfc..fe5b59480c0d 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -38,7 +38,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~RecentFilesMenuController();
 
             // XServiceInfo
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index e5ba4bf74458..3547abbe3edc 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -51,7 +51,7 @@ namespace framework
         using svt::PopupMenuControllerBase::disposing;
 
         public:
-            ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~ToolbarsMenuController();
 
             // XServiceInfo
@@ -90,6 +90,7 @@ namespace framework
             void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
             sal_Bool isContextSensitiveToolbarNonVisible();
 
+            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >                m_xContext;
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >                m_xPersistentWindowState;
             ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >                m_xUICommandDescription;
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager >   m_xModuleCfgMgr;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index b98f863acc7c..7f55504cbe08 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -117,7 +117,7 @@ DEFINE_XTYPEPROVIDER_16                 (   Desktop
                                             css::frame::XUntitledNumbers
                                         )
 
-DEFINE_XSERVICEINFO_ONEINSTANCESERVICE  (   Desktop                                                 ,
+DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2(   Desktop                                                 ,
                                             ::cppu::OWeakObject                                     ,
                                             DECLARE_ASCII("com.sun.star.frame.Desktop"             ),
                                             IMPLEMENTATIONNAME_DESKTOP
@@ -143,7 +143,7 @@ DEFINE_INIT_SERVICE                     (   Desktop,
                                                 // Initialize a new dispatchhelper-object to handle dispatches.
                                                 // We use these helper as slave for our interceptor helper ... not directly!
                                                 // But he is event listener on THIS instance!
-                                                DispatchProvider* pDispatchHelper = new DispatchProvider( comphelper::getComponentContext(m_xFactory), this );
+                                                DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this );
                                                 css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY );
 
                                                 //-------------------------------------------------------------------------------------------------------------
@@ -195,7 +195,7 @@ DEFINE_INIT_SERVICE                     (   Desktop,
 
     @onerror    We throw an ASSERT in debug version or do nothing in relaese version.
 *//*-*************************************************************************************************************/
-Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext )
         //  Init baseclasses first
         //  Attention: Don't change order of initialization!
         //      ThreadHelpBase is a struct with a lock as member. We can't use a lock as direct member!
@@ -209,7 +209,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >&
         #ifdef ENABLE_ASSERTIONS
         ,   m_bIsTerminated         ( sal_False                                     )   // see dispose() for further information!
         #endif
-        ,   m_xFactory              ( xFactory                                      )
+        ,   m_xContext              ( xContext                                      )
         ,   m_aChildTaskContainer   (                                               )
         ,   m_aListenerContainer    ( m_aLock.getShareableOslMutex()                )
         ,   m_xFramesHelper         (                                               )
@@ -230,7 +230,7 @@ Desktop::Desktop( const css::uno::Reference< css::lang::XMultiServiceFactory >&
 {
     // Safe impossible cases
     // We don't accept all incoming parameter.
-    LOG_ASSERT2( implcp_ctor( xFactory ), "Desktop::Desktop()", "Invalid parameter detected!")
+    LOG_ASSERT2( implcp_ctor( xContext ), "Desktop::Desktop()", "Invalid parameter detected!")
 }
 
 /*-************************************************************************************************************//**
@@ -643,11 +643,11 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
 
     ReadGuard aReadLock(m_aLock);
     css::uno::Reference< css::frame::XComponentLoader > xThis(static_cast< css::frame::XComponentLoader* >(this), css::uno::UNO_QUERY);
-    css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xFactory;
+    css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext;
     aReadLock.unlock();
 
     SAL_INFO( "fwk.desktop", "PERFORMANCE - Desktop::loadComponentFromURL()" );
-    return LoadEnv::loadComponentFromURL(xThis, comphelper::getComponentContext(xSMGR), sURL, sTargetFrameName, nSearchFlags, lArguments);
+    return LoadEnv::loadComponentFromURL(xThis, xContext, sURL, sTargetFrameName, nSearchFlags, lArguments);
 }
 
 /*-************************************************************************************************************//**
@@ -1038,7 +1038,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
     // get threadsafe some necessary member which are neccessary for following functionality
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
-    css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory;
+    css::uno::Reference< css::uno::XComponentContext> xContext = m_xContext;
     aReadLock.unlock();
     /* } SAFE */
 
@@ -1049,7 +1049,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
     //-----------------------------------------------------------------------------------------------------
     if ( sTargetFrameName==SPECIALTARGET_BLANK )
     {
-        TaskCreator aCreator( comphelper::getComponentContext(xFactory) );
+        TaskCreator aCreator( xContext );
         xTarget = aCreator.createTask(sTargetFrameName,sal_False);
     }
 
@@ -1147,7 +1147,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
             (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
            )
         {
-            TaskCreator aCreator( comphelper::getComponentContext(xFactory) );
+            TaskCreator aCreator( xContext );
             xTarget = aCreator.createTask(sTargetFrameName,sal_False);
         }
     }
@@ -1218,7 +1218,7 @@ void SAL_CALL Desktop::dispose()
     m_xDispatchHelper.clear();
     m_xFramesHelper.clear();
     m_xLastFrame.clear();
-    m_xFactory.clear();
+    m_xContext.clear();
 
     m_xPipeTerminator.clear();
     m_xQuickLauncher.clear();
@@ -1982,11 +1982,11 @@ void Desktop::impl_sendNotifyTerminationEvent()
 
 //*****************************************************************************************************************
 //  We work with valid servicemanager only.
-sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
+sal_Bool Desktop::implcp_ctor( const css::uno::Reference< css::uno::XComponentContext >& xContext )
 {
     return(
-            ( &xFactory     ==  NULL        )   ||
-            ( xFactory.is() ==  sal_False   )
+            ( &xContext     ==  NULL        )   ||
+            ( xContext.is() ==  sal_False   )
           );
 }
 
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 98ab2c0e705f..05f01b5bf293 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -87,7 +87,7 @@ DEFINE_XTYPEPROVIDER_5(
         css::frame::XStatusListener,
         css::lang::XServiceInfo)
 
-DEFINE_XSERVICEINFO_ONEINSTANCESERVICE(
+DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2(
        SessionListener,
        cppu::OWeakObject,
        "com.sun.star.frame.SessionListener",
@@ -100,10 +100,10 @@ DEFINE_INIT_SERVICE(SessionListener,
                     }
                    )
 
-SessionListener::SessionListener(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR )
+SessionListener::SessionListener(const css::uno::Reference< css::uno::XComponentContext >& rxContext )
         : ThreadHelpBase      (&Application::GetSolarMutex())
         , OWeakObject         (                             )
-        , m_xSMGR             (xSMGR                        )
+        , m_xContext          (rxContext                    )
         , m_bRestored( sal_False )
         , m_bSessionStoreRequested( sal_False )
         , m_bAllowUserInteractionOnQuit( sal_False )
@@ -133,8 +133,8 @@ void SessionListener::StoreSession( sal_Bool bAsync )
         // on stop event m_rSessionManager->saveDone(this); in case of asynchronous call
         // in case of synchronous call the caller should do saveDone() call himself!
 
-        css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( ::comphelper::getComponentContext(m_xSMGR) );
-        css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( ::comphelper::getComponentContext(m_xSMGR) );
+        css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext );
+        css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext );
         URL aURL;
         aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionSave");
         xURLTransformer->parseStrict(aURL);
@@ -165,8 +165,8 @@ void SessionListener::QuitSessionQuietly()
         // xd->dispatch("vnd.sun.star.autorecovery:/doSessionQuietQuit, async=false
         // it is done synchronously to avoid conflict with normal quit process
 
-        css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( ::comphelper::getComponentContext(m_xSMGR) );
-        css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( ::comphelper::getComponentContext(m_xSMGR) );
+        css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext );
+        css::uno::Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext );
         URL aURL;
         aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionQuietQuit");
         xURLTransformer->parseStrict(aURL);
@@ -210,7 +210,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any  >& args)
     }
     if (!m_rSessionManager.is())
         m_rSessionManager = css::uno::Reference< XSessionManagerClient >
-            (m_xSMGR->createInstance(aSMgr), UNO_QUERY);
+            (m_xContext->getServiceManager()->createInstanceWithContext(aSMgr, m_xContext), UNO_QUERY);
 
     if (m_rSessionManager.is())
     {
@@ -246,11 +246,11 @@ sal_Bool SAL_CALL SessionListener::doRestore()
     ResetableGuard aGuard(m_aLock);
     m_bRestored = sal_False;
     try {
-        css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( ::comphelper::getComponentContext(m_xSMGR) );
+        css::uno::Reference< XDispatch > xDispatch = css::frame::AutoRecovery::create( m_xContext );
 
         URL aURL;
         aURL.Complete = OUString("vnd.sun.star.autorecovery:/doSessionRestore");
-        css::uno::Reference< XURLTransformer > xURLTransformer(URLTransformer::create(::comphelper::getComponentContext(m_xSMGR)));
+        css::uno::Reference< XURLTransformer > xURLTransformer(URLTransformer::create(m_xContext));
         xURLTransformer->parseStrict(aURL);
         Sequence< PropertyValue > args;
         xDispatch->addStatusListener(this, aURL);
@@ -297,7 +297,7 @@ void SAL_CALL SessionListener::approveInteraction( sal_Bool bInteractionGranted
             // first of all let the session be stored to be sure that we lose no information
             StoreSession( sal_False );
 
-            css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( comphelper::getComponentContext(m_xSMGR) );
+            css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext );
             // honestly: how many implementations of XDesktop will we ever have?
             // so casting this directly to the implementation
             Desktop* pDesktop(dynamic_cast<Desktop*>(xDesktop.get()));
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 4c1276e8bbb6..bda92e0932a9 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -178,7 +178,7 @@ using namespace com::sun::star::container;
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   ControlMenuController                   ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   ControlMenuController                   ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_CONTROLMENUCONTROLLER
@@ -186,8 +186,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ControlMenuController
 
 DEFINE_INIT_SERVICE                     (   ControlMenuController, {} )
 
-ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
+ControlMenuController::ControlMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
     m_pResPopupMenu( 0 )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
@@ -246,7 +246,6 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
     osl::ResettableMutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
-    m_xServiceManager.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 714332cb5a12..47e35095bde2 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -56,7 +56,7 @@ static bool lcl_I18nCompareString(const OUString& rStr1, const OUString& rStr2)
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   FontMenuController                      ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   FontMenuController                      ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_FONTMENUCONTROLLER
@@ -64,8 +64,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   FontMenuController
 
 DEFINE_INIT_SERVICE                     (   FontMenuController, {} )
 
-FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager )
+FontMenuController::FontMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext )
 {
 }
 
@@ -123,7 +123,6 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xFontListDispatch.clear();
-    m_xServiceManager.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 22ddd7619601..95b8de678900 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -51,7 +51,7 @@ using namespace com::sun::star::view;
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   FontSizeMenuController                      ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   FontSizeMenuController                      ,
                                             OWeakObject                                 ,
                                             SERVICENAME_POPUPMENUCONTROLLER             ,
                                             IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER
@@ -59,8 +59,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   FontSizeMenuController
 
 DEFINE_INIT_SERVICE                     (   FontSizeMenuController, {} )
 
-FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
+FontSizeMenuController::FontSizeMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
     m_pHeightArray( 0 )
 {
 }
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 971eebb26239..04de4a921efd 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -53,14 +53,14 @@ using namespace com::sun::star::container;
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   FooterMenuController                    ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   FooterMenuController                    ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER
                                         )
 
-FooterMenuController::FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    HeaderMenuController( xServiceManager,true )
+FooterMenuController::FooterMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    HeaderMenuController( xContext,true )
 {
 }
 
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index f2076a93dd99..2d8d036b97d4 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -56,7 +56,7 @@ const sal_uInt16 ALL_MENUITEM_ID = 1;
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   HeaderMenuController                    ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   HeaderMenuController                    ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_HEADERMENUCONTROLLER
@@ -64,8 +64,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   HeaderMenuController
 
 DEFINE_INIT_SERVICE                     (   HeaderMenuController, {} )
 
-HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager,bool _bFooter ) :
-    svt::PopupMenuControllerBase( xServiceManager )
+HeaderMenuController::HeaderMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, bool _bFooter ) :
+    svt::PopupMenuControllerBase( xContext )
     ,m_bFooter(_bFooter)
 {
 }
@@ -192,7 +192,6 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt
     osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
-    m_xServiceManager.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 5bcbbf3326af..db94d8f8ea65 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -67,7 +67,7 @@ using namespace com::sun::star::util;
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   LanguageSelectionMenuController         ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   LanguageSelectionMenuController         ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER
@@ -75,10 +75,10 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   LanguageSelectionMenuController
 
 DEFINE_INIT_SERVICE                     (   LanguageSelectionMenuController, {} )
 
-LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
+LanguageSelectionMenuController::LanguageSelectionMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
     m_bShowMenu( sal_True ),
-    m_aLangGuessHelper( comphelper::getComponentContext(xServiceManager) )
+    m_aLangGuessHelper( xContext )
 {
 }
 
@@ -95,7 +95,6 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xLanguageDispatch.clear();
-    m_xServiceManager.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 0450d8646f64..f9dd1f3bf722 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::frame;
 namespace framework
 {
 class
-DEFINE_XSERVICEINFO_MULTISERVICE        (   MacrosMenuController                    ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   MacrosMenuController                    ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_MACROSMENUCONTROLLER
@@ -59,9 +59,9 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   MacrosMenuController
 
 DEFINE_INIT_SERVICE                     (   MacrosMenuController, {} )
 
-MacrosMenuController::MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
-    m_xServiceManager( xServiceManager)
+MacrosMenuController::MacrosMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
+    m_xContext( xContext)
 {
 }
 
@@ -104,7 +104,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt
     OSL_TRACE("disposing");
     m_xFrame.clear();
     m_xDispatch.clear();
-    m_xServiceManager.clear();
+    m_xContext.clear();
 
     if ( m_xPopupMenu.is() )
     {
@@ -160,7 +160,7 @@ IMPL_STATIC_LINK_NOINSTANCE( MacrosMenuController, ExecuteHdl_Impl, ExecuteInfo*
 String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
 {
     sal_Bool bModuleIdentified = !m_aModuleIdentifier.isEmpty();
-    return framework::RetrieveLabelFromCommand(aCmdURL, comphelper::getComponentContext(m_xServiceManager),m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
+    return framework::RetrieveLabelFromCommand(aCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,bModuleIdentified,"Label");
 }
 
 void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
@@ -170,7 +170,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
     const OUString providerKey("com.sun.star.script.provider.ScriptProviderFor");
     const OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider");
     sal_uInt16 itemId = startItemId;
-    Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
+    Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xContext->getServiceManager(), UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
 
     while ( xEnum->hasMoreElements() )
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 29ef5e1efb23..dea64a4a1489 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -62,7 +62,7 @@ static const char SFX_REFERER_USER[] = "private:user";
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   NewMenuController                           ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   NewMenuController                           ,
                                             OWeakObject                                 ,
                                             SERVICENAME_POPUPMENUCONTROLLER             ,
                                             IMPLEMENTATIONNAME_NEWMENUCONTROLLER
@@ -204,7 +204,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
             if ( !xModuleAccelCfg.is() )
             {
                 Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgMgrSupplier =
-                    ModuleUIConfigurationManagerSupplier::create( comphelper::getComponentContext(m_xServiceManager) );
+                    ModuleUIConfigurationManagerSupplier::create( m_xContext );
                 Reference< XUIConfigurationManager > xUICfgMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( m_aModuleIdentifier );
                 if ( xUICfgMgr.is() )
                 {
@@ -215,7 +215,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu )
 
             if ( !xGlobalAccelCfg.is() )
             {
-                xGlobalAccelCfg = GlobalAcceleratorConfiguration::create( comphelper::getComponentContext(m_xServiceManager) );
+                xGlobalAccelCfg = GlobalAcceleratorConfiguration::create( m_xContext );
                 m_xGlobalAcceleratorManager = xGlobalAccelCfg;
             }
         }
@@ -298,13 +298,14 @@ void NewMenuController::retrieveShortcutsFromConfiguration(
     }
 }
 
-NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
+NewMenuController::NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
     m_bShowImages( sal_True ),
     m_bNewMenu( sal_False ),
     m_bModuleIdentified( sal_False ),
     m_bAcceleratorCfg( sal_False ),
-    m_aTargetFrame( "_default" )
+    m_aTargetFrame( "_default" ),
+    m_xContext( xContext )
 {
 }
 
@@ -326,7 +327,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup
 
     if ( pVCLPopupMenu )
     {
-        MenuConfiguration aMenuCfg( comphelper::getComponentContext(m_xServiceManager) );
+        MenuConfiguration aMenuCfg( m_xContext );
         BmkMenu* pSubMenu( 0 );
 
         if ( m_bNewMenu )
@@ -374,7 +375,7 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( Runtime
     osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
-    m_xServiceManager.clear();
+    m_xContext.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
@@ -392,13 +393,13 @@ void SAL_CALL NewMenuController::select( const css::awt::MenuEvent& rEvent ) thr
     Reference< css::awt::XPopupMenu > xPopupMenu;
     Reference< XDispatch >            xDispatch;
     Reference< XDispatchProvider >    xDispatchProvider;
-    Reference< XMultiServiceFactory > xServiceManager;
+    Reference< XComponentContext >    xContext;
     Reference< XURLTransformer >      xURLTransformer;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu          = m_xPopupMenu;
     xDispatchProvider   = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY );
-    xServiceManager     = m_xServiceManager;
+    xContext     = m_xContext;
     xURLTransformer     = m_xURLTransformer;
     aLock.clear();
 
@@ -475,7 +476,7 @@ void NewMenuController::impl_setPopupMenu()
         fillPopupMenu( m_xPopupMenu );
 
     // Identify module that we are attach to. It's our context that we need to know.
-    Reference< XModuleManager2 > xModuleManager = ModuleManager::create( comphelper::getComponentContext(m_xServiceManager) );
+    Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext );
     try
     {
         m_aModuleIdentifier = xModuleManager->identify( m_xFrame );
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 452667a23417..d5447d641f10 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -48,7 +48,7 @@ using namespace com::sun::star::util;
 namespace framework
 {
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   ObjectMenuController                    ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   ObjectMenuController                    ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_OBJECTMENUCONTROLLER
@@ -56,8 +56,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ObjectMenuController
 
 DEFINE_INIT_SERVICE                     (   ObjectMenuController, {} )
 
-ObjectMenuController::ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager )
+ObjectMenuController::ObjectMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext )
 {
 }
 
@@ -106,7 +106,6 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xObjectUpdateDispatch.clear();
-    m_xServiceManager.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 57cf1d258e2b..62197dab0aeb 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -64,7 +64,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star
         }
 };
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   RecentFilesMenuController                   ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   RecentFilesMenuController                   ,
                                             OWeakObject                                 ,
                                             SERVICENAME_POPUPMENUCONTROLLER             ,
                                             IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER
@@ -72,8 +72,8 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   RecentFilesMenuController
 
 DEFINE_INIT_SERVICE                     (   RecentFilesMenuController, {} )
 
-RecentFilesMenuController::RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
+RecentFilesMenuController::RecentFilesMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
     m_bDisabled( sal_False )
 {
 }
@@ -254,7 +254,6 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw (
     osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
-    m_xServiceManager.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index d992c621c181..a93c96591aa9 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -128,7 +128,7 @@ struct ToolBarInfo
     OUString aToolBarUIName;
 };
 
-DEFINE_XSERVICEINFO_MULTISERVICE        (   ToolbarsMenuController                  ,
+DEFINE_XSERVICEINFO_MULTISERVICE_2      (   ToolbarsMenuController                  ,
                                             OWeakObject                             ,
                                             SERVICENAME_POPUPMENUCONTROLLER         ,
                                             IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER
@@ -136,13 +136,14 @@ DEFINE_XSERVICEINFO_MULTISERVICE        (   ToolbarsMenuController
 
 DEFINE_INIT_SERVICE                     (   ToolbarsMenuController, {} )
 
-ToolbarsMenuController::ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) :
-    svt::PopupMenuControllerBase( xServiceManager ),
+ToolbarsMenuController::ToolbarsMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+    svt::PopupMenuControllerBase( xContext ),
+    m_xContext( xContext ),
     m_aPropUIName( "UIName" ),
     m_aPropResourceURL( "ResourceURL" ),
     m_bModuleIdentified( sal_False ),
     m_bResetActive( sal_False ),
-    m_aIntlWrapper( comphelper::getComponentContext(xServiceManager), Application::GetSettings().GetLanguageTag() )
+    m_aIntlWrapper( xContext, Application::GetSettings().GetLanguageTag() )
 {
 }
 
@@ -222,9 +223,9 @@ OUString ToolbarsMenuController::getUINameFromCommand( const OUString& rCommandU
     {
         try
         {
-            Reference< XModuleManager2 > xModuleManager = ModuleManager::create( comphelper::getComponentContext(m_xServiceManager) );
+            Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext );
             m_aModuleIdentifier = xModuleManager->identify( m_xFrame );
-            Reference< XNameAccess > xNameAccess = frame::UICommandDescription::create( comphelper::getComponentContext(m_xServiceManager) );
+            Reference< XNameAccess > xNameAccess = frame::UICommandDescription::create( m_xContext );
             xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandDescription;
         }
         catch ( const Exception& )
@@ -537,7 +538,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru
     m_xDispatch.clear();
     m_xDocCfgMgr.clear();
     m_xModuleCfgMgr.clear();
-    m_xServiceManager.clear();
+    m_xContext.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
@@ -597,14 +598,14 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
 void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
 {
     Reference< css::awt::XPopupMenu >   xPopupMenu;
-    Reference< XMultiServiceFactory >   xServiceManager;
+    Reference< XComponentContext >      xContext;
     Reference< XURLTransformer >        xURLTransformer;
     Reference< XFrame >                 xFrame;
     Reference< XNameAccess >            xPersistentWindowState;
 
     osl::ClearableMutexGuard aLock( m_aMutex );
     xPopupMenu             = m_xPopupMenu;
-    xServiceManager        = m_xServiceManager;
+    xContext               = m_xContext;
     xURLTransformer        = m_xURLTransformer;
     xFrame                 = m_xFrame;
     xPersistentWindowState = m_xPersistentWindowState;
@@ -822,8 +823,8 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
 
         if ( m_bInitialized )
         {
-            Reference< XModuleManager2 > xModuleManager = ModuleManager::create( comphelper::getComponentContext(m_xServiceManager) );
-            Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::WindowStateConfiguration::create( comphelper::getComponentContext(m_xServiceManager) );
+            Reference< XModuleManager2 > xModuleManager = ModuleManager::create( m_xContext );
+            Reference< XNameAccess > xPersistentWindowStateSupplier = ::com::sun::star::ui::WindowStateConfiguration::create( m_xContext );
 
             // Retrieve persistent window state reference for our module
             OUString aModuleIdentifier;
@@ -833,7 +834,7 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume
                 xPersistentWindowStateSupplier->getByName( aModuleIdentifier ) >>= m_xPersistentWindowState;
 
                 Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier =
-                    ModuleUIConfigurationManagerSupplier::create( comphelper::getComponentContext(m_xServiceManager) );
+                    ModuleUIConfigurationManagerSupplier::create( m_xContext );
                 m_xModuleCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
 
                 Reference< XController > xController = m_xFrame->getController();
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index daddbed7e9fd..1bec619259b0 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 
 #include <toolkit/awt/vclxmenu.hxx>
@@ -58,7 +59,7 @@ namespace svt
                                                   public PopupMenuControllerBaseType
     {
         public:
-            PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+            PopupMenuControllerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
             virtual ~PopupMenuControllerBase();
 
             // XServiceInfo
@@ -120,7 +121,6 @@ namespace svt
             OUString                                                                    m_aModuleName;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >           m_xDispatch;
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >              m_xFrame;
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
             ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >      m_xURLTransformer;
             ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >            m_xPopupMenu;
     };
diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx
index c369bf8a2814..41d24b678c7f 100644
--- a/svtools/source/uno/popupmenucontrollerbase.cxx
+++ b/svtools/source/uno/popupmenucontrollerbase.cxx
@@ -60,14 +60,13 @@ struct PopupMenuControllerBaseDispatchInfo
         : mxDispatch( xDispatch ), maURL( rURL ), maArgs( rArgs ) {}
 };
 
-PopupMenuControllerBase::PopupMenuControllerBase( const Reference< XMultiServiceFactory >& xServiceManager ) :
+PopupMenuControllerBase::PopupMenuControllerBase( const Reference< XComponentContext >& xContext ) :
     ::comphelper::OBaseMutex(),
     PopupMenuControllerBaseType(m_aMutex),
-    m_bInitialized( false ),
-    m_xServiceManager( xServiceManager )
+    m_bInitialized( false )
 {
-    if ( m_xServiceManager.is() )
-        m_xURLTransformer.set( util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ) );
+    if ( xContext.is() )
+        m_xURLTransformer.set( util::URLTransformer::create( xContext ) );
 }
 
 PopupMenuControllerBase::~PopupMenuControllerBase()
@@ -104,7 +103,6 @@ void SAL_CALL PopupMenuControllerBase::disposing()
     m_xFrame.clear();
     m_xDispatch.clear();
     m_xPopupMenu.clear();
-    m_xServiceManager.clear();
 }
 
 // XServiceInfo