fdo#46808, Convert svt::ToolboxController to XComponentContext

.. and all of it's friends

Change-Id: I408d9308d1d1a4f8ed0055ac5f4042d729c44d1e

5 files changed, 47 insertions, 47 deletions

diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 20c18fae4886..3ede27ad2ff5 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -242,9 +242,9 @@ IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
 // =======================================================================
 
 ExtrusionDirectionControl::ExtrusionDirectionControl(
-    const Reference< lang::XMultiServiceFactory >& rServiceManager
+    const Reference< XComponentContext >& rxContext
 )   : svt::PopupWindowController(
-        rServiceManager,
+        rxContext,
         Reference< frame::XFrame >(),
         OUString( ".uno:ExtrusionDirectionFloater" )
     )
@@ -282,7 +282,7 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstan
     const Reference< XMultiServiceFactory >& rSMgr
 )   throw( RuntimeException )
 {
-    return *new ExtrusionDirectionControl( rSMgr );
+    return *new ExtrusionDirectionControl( comphelper::getComponentContext(rSMgr) );
 }
 
 // --------------------------------------------------------------------
@@ -507,9 +507,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl)
 // =======================================================================
 
 ExtrusionDepthController::ExtrusionDepthController(
-    const Reference< lang::XMultiServiceFactory >& rServiceManager
+    const Reference< XComponentContext >& rxContext
 )   : svt::PopupWindowController(
-        rServiceManager,
+        rxContext,
         Reference< frame::XFrame >(),
         OUString( ".uno:ExtrusionDepthFloater" )
     )
@@ -546,7 +546,7 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames(
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    return *new ExtrusionDepthController( rSMgr );
+    return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) );
 }
 
 // --------------------------------------------------------------------
@@ -770,8 +770,8 @@ IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
 // ========================================================================
 
 ExtrusionLightingControl::ExtrusionLightingControl(
-    const Reference< lang::XMultiServiceFactory >& rServiceManager
-)   : svt::PopupWindowController( rServiceManager,
+    const Reference< XComponentContext >& rxContext
+)   : svt::PopupWindowController( rxContext,
                 Reference< frame::XFrame >(),
                 OUString( ".uno:ExtrusionDirectionFloater" )
     )
@@ -809,7 +809,7 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstanc
     const Reference< XMultiServiceFactory >& rSMgr
 )   throw( RuntimeException )
 {
-    return *new ExtrusionLightingControl( rSMgr );
+    return *new ExtrusionLightingControl( comphelper::getComponentContext(rSMgr) );
 }
 
 // --------------------------------------------------------------------
@@ -913,10 +913,10 @@ IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl)
 // ========================================================================
 
 ExtrusionSurfaceControl::ExtrusionSurfaceControl(
-    const Reference< lang::XMultiServiceFactory >& rServiceManager
+    const Reference< XComponentContext >& rxContext
 )
 :   svt::PopupWindowController(
-        rServiceManager,
+        rxContext,
         Reference< frame::XFrame >(),
         OUString( ".uno:ExtrusionSurfaceFloater" )
     )
@@ -954,7 +954,7 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance
     const Reference< XMultiServiceFactory >& rSMgr
 )   throw( RuntimeException )
 {
-    return *new ExtrusionSurfaceControl( rSMgr );
+    return *new ExtrusionSurfaceControl( comphelper::getComponentContext(rSMgr) );
 }
 
 // --------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 37d58e120dbc..9f5f5ff02c7b 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -69,7 +69,7 @@ private:
 class ExtrusionDirectionControl : public svt::PopupWindowController
 {
 public:
-    ExtrusionDirectionControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    ExtrusionDirectionControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -117,7 +117,7 @@ public:
 class ExtrusionDepthController : public svt::PopupWindowController
 {
 public:
-    ExtrusionDepthController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    ExtrusionDepthController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -168,7 +168,7 @@ public:
 class ExtrusionLightingControl : public svt::PopupWindowController
 {
 public:
-    ExtrusionLightingControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    ExtrusionLightingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -208,7 +208,7 @@ public:
 class ExtrusionSurfaceControl : public svt::PopupWindowController
 {
 public:
-    ExtrusionSurfaceControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    ExtrusionSurfaceControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     virtual ::Window* createPopupWindow( ::Window* pParent );
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 588483df8695..bf04524fda8e 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -404,7 +404,7 @@ IMPL_LINK_NOARG(FontWorkAlignmentWindow, SelectHdl)
 class FontWorkAlignmentControl : public svt::PopupWindowController
 {
 public:
-    FontWorkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    FontWorkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -418,8 +418,8 @@ public:
 
 // -----------------------------------------------------------------------
 
-FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) )
+FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< XComponentContext >& rxContext )
+: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) )
 {
 }
 
@@ -452,7 +452,7 @@ Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames(
 
 Reference< XInterface > SAL_CALL SAL_CALL FontWorkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    return *new FontWorkAlignmentControl( rSMgr );
+    return *new FontWorkAlignmentControl( comphelper::getComponentContext(rSMgr) );
 }
 
 // --------------------------------------------------------------------
@@ -642,7 +642,7 @@ IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl)
 class FontWorkCharacterSpacingControl : public svt::PopupWindowController
 {
 public:
-    FontWorkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
+    FontWorkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
 
     virtual ::Window* createPopupWindow( ::Window* pParent );
 
@@ -654,8 +654,8 @@ public:
 };
 
 
-FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager )
-: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) )
+FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< XComponentContext >& rxContext )
+: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) )
 {
 }
 
@@ -688,7 +688,7 @@ Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServic
 
 Reference< XInterface > SAL_CALL SAL_CALL FontWorkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
-    return *new FontWorkCharacterSpacingControl( rSMgr );
+    return *new FontWorkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) );
 }
 
 // --------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 9f5145818d0f..740a2acb7574 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -30,6 +30,7 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <osl/mutex.hxx>
+#include <comphelper/processfactory.hxx>
 
 #include <memory>
 
@@ -238,12 +239,11 @@ void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 // class FontHeightToolBoxControl
 //========================================================================
 
-FontHeightToolBoxControl::FontHeightToolBoxControl(
-    const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) :
-    svt::ToolboxController( rServiceManager,
-                            uno::Reference< frame::XFrame >(),
-                            OUString( ".uno:FontHeight" ) ),
-    m_pBox( NULL )
+FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::XComponentContext >& rxContext )
+ : svt::ToolboxController( rxContext,
+                           uno::Reference< frame::XFrame >(),
+                           OUString( ".uno:FontHeight" ) ),
+   m_pBox( NULL )
 {
     addStatusListener( OUString( ".uno:CharFontName" ));
 }
@@ -413,7 +413,7 @@ void FontHeightToolBoxControl::dispatchCommand(
 uno::Reference< uno::XInterface > SAL_CALL FontHeightToolBoxControl_createInstance(
     const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
 {
-    return *new FontHeightToolBoxControl( rSMgr );
+    return *new FontHeightToolBoxControl( comphelper::getComponentContext(rSMgr) );
 }
 
 }
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 8bfd0c02054d..cac328b34bbd 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -52,9 +52,9 @@ static const char COMMAND_APPENDSEARCHHISTORY[] = "AppendSearchHistory";
 
 static const sal_Int32       REMEMBER_SIZE = 10;
 
-void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
+void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
 {
-    css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create(::comphelper::getComponentContext(rSMgr)) );
+    css::uno::Reference< css::util::XURLTransformer > xURLTransformer( css::util::URLTransformer::create( rxContext ) );
     css::util::URL aURL;
     aURL.Complete = OUString(COMMAND_EXECUTESEARCH);
     xURLTransformer->parseStrict(aURL);
@@ -70,7 +70,7 @@ void impl_executeSearch( const css::uno::Reference< css::lang::XMultiServiceFact
 
 FindTextFieldControl::FindTextFieldControl( Window* pParent, WinBits nStyle,
     css::uno::Reference< css::frame::XFrame >& xFrame,
-    css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager) :
+    const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager) :
     ComboBox( pParent, nStyle ),
     m_xFrame(xFrame),
     m_xServiceManager(xServiceManager)
@@ -178,7 +178,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
                 lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS);
                 lArgs[2].Value <<= (sal_Int32)0;
 
-                impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
+                impl_executeSearch( comphelper::getComponentContext(m_xServiceManager), m_xFrame, lArgs);
                 nRet = 1;
             }
             break;
@@ -303,8 +303,8 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag
 //-----------------------------------------------------------------------------------------------------------
 // FindTextToolbarController
 
-FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager )
-    :svt::ToolboxController( rServiceManager,
+FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+    :svt::ToolboxController( rxContext,
     css::uno::Reference< css::frame::XFrame >(),
     OUString(COMMAND_FINDTEXT) )
 {
@@ -420,7 +420,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre
     if ( pParent )
     {
         ToolBox* pToolbar =  ( ToolBox* )pParent;
-        m_pFindTextFieldControl = new FindTextFieldControl( pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, m_xServiceManager );
+        m_pFindTextFieldControl = new FindTextFieldControl( pToolbar, WinBits( WB_DROPDOWN | WB_VSCROLL), m_xFrame, css::uno::Reference<css::lang::XMultiServiceFactory>(m_xContext->getServiceManager(), css::uno::UNO_QUERY_THROW)  );
 
         Size aSize(250, m_pFindTextFieldControl->GetTextHeight() + 200);
         m_pFindTextFieldControl->SetSizePixel( aSize );
@@ -475,8 +475,8 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl)
 //-----------------------------------------------------------------------------------------------------------
 // class UpDownSearchToolboxController
 
-UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager, Type eType )
-    : svt::ToolboxController( rServiceManager,
+UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, Type eType )
+    : svt::ToolboxController( rxContext,
             css::uno::Reference< css::frame::XFrame >(),
             (eType == UP) ? OUString( COMMAND_UPSEARCH ):  OUString( COMMAND_DOWNSEARCH ) ),
       meType( eType )
@@ -587,7 +587,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/
     lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS);
     lArgs[2].Value <<= (sal_Int32)0;
 
-    impl_executeSearch(m_xServiceManager, m_xFrame, lArgs);
+    impl_executeSearch(m_xContext, m_xFrame, lArgs);
 
     css::frame::FeatureStateEvent aEvent;
     aEvent.FeatureURL.Complete = OUString(COMMAND_APPENDSEARCHHISTORY);
@@ -606,8 +606,8 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe
 //-----------------------------------------------------------------------------------------------------------
 // class ExitSearchToolboxController
 
-ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager )
-    : svt::ToolboxController( rServiceManager,
+ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
+    : svt::ToolboxController( rxContext,
             css::uno::Reference< css::frame::XFrame >(),
             OUString( COMMAND_EXITSEARCH ) )
 {
@@ -881,7 +881,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FindTextToolbarController_c
     const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
 {
     return static_cast< cppu::OWeakObject * >(
-        new FindTextToolbarController( rSMgr ) );
+        new FindTextToolbarController( comphelper::getComponentContext(rSMgr) ) );
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL DownSearchToolboxController_createInstance(
@@ -889,7 +889,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL DownSearchToolboxController
 {
     return static_cast< cppu::OWeakObject * >(
         new UpDownSearchToolboxController(
-            rSMgr, UpDownSearchToolboxController::DOWN ) );
+            comphelper::getComponentContext(rSMgr), UpDownSearchToolboxController::DOWN ) );
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL UpSearchToolboxController_createInstance(
@@ -897,13 +897,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL UpSearchToolboxController_c
 {
     return static_cast< cppu::OWeakObject * >(
         new UpDownSearchToolboxController(
-            rSMgr, UpDownSearchToolboxController::UP ) );
+            comphelper::getComponentContext(rSMgr), UpDownSearchToolboxController::UP ) );
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL ExitFindbarToolboxController_createInstance(
     const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr )
 {
-    return *new ExitSearchToolboxController( rSMgr );
+    return *new ExitSearchToolboxController( comphelper::getComponentContext(rSMgr) );
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createInstance(