diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-20 09:29:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-04-08 13:53:03 +0200 |
| commit | 86fdce60115014ddfae05993ef43686c9dbd6004 (patch) | |
| tree | d50705d5f93fec079e4d676cd2a5a9c50783c6f3 | |
| parent | 34da7fbcc643ad209290c6da456dbfb17aeb9ac0 (diff) | |
fdo#46808, Convert svt::ToolboxController to XComponentContext
.. and all of it's friends
Change-Id: I408d9308d1d1a4f8ed0055ac5f4042d729c44d1e
50 files changed, 244 insertions, 211 deletions
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index 4c5d70df90c8..7713fbe9045f 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -68,16 +68,16 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (u Reference< uno::XInterface > ShapeToolbarController::create( const Reference< uno::XComponentContext >& xContext ) { - return *( new ShapeToolbarController( Reference< lang::XMultiServiceFactory >( xContext->getServiceManager(), uno::UNO_QUERY ) ) ); + return * new ShapeToolbarController( xContext ); } -ShapeToolbarController::ShapeToolbarController( const Reference< lang::XMultiServiceFactory >& rxFact ) +ShapeToolbarController::ShapeToolbarController( const Reference< uno::XComponentContext >& xContext ) :m_pToolbarController( NULL ) ,m_nToolBoxId( 1 ) ,m_nSlotId( 0 ) { osl_atomic_increment( &m_refCount ); - m_xServiceManager = rxFact; + m_xContext = xContext; osl_atomic_decrement( &m_refCount ); } diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index c8c7d83e1fd8..d84155ba0c7a 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -52,7 +52,7 @@ class ShapeToolbarController : public ::svt::ToolboxController void operator =( const ShapeToolbarController& ); public: - ShapeToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxFact ); + ShapeToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~ShapeToolbarController(); // ::com::sun::star::uno::XInterface diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 0bbae366ef9f..57e3b0054ab8 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -68,16 +68,26 @@ namespace dbaui } } - OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB) + OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB) : m_nToolBoxId(1) { osl_atomic_increment(&m_refCount); - m_xServiceManager = _rxORB; + m_xContext = _rxORB; osl_atomic_decrement(&m_refCount); } // ----------------------------------------------------------------------------- - IMPLEMENT_SERVICE_INFO1_STATIC(OToolboxController,"com.sun.star.sdb.ApplicationToolboxController","com.sun.star.frame.ToolboxController") + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OToolboxController, "com.sun.star.sdb.ApplicationToolboxController") + IMPLEMENT_SERVICE_INFO_SUPPORTS(OToolboxController) + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(OToolboxController, "com.sun.star.frame.ToolboxController") + + Reference< XInterface > + SAL_CALL OToolboxController::Create(const Reference< XMultiServiceFactory >& _rxORB) + { + return static_cast< XServiceInfo* >(new OToolboxController( comphelper::getComponentContext(_rxORB) )); + } + + // ----------------------------------------------------------------------------- // XInterface Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException) @@ -186,11 +196,10 @@ namespace dbaui try { - Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier(ModuleUIConfigurationManagerSupplier::create(comphelper::getComponentContext(getServiceManager()))); - Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager(OUString("com.sun.star.sdb.OfficeDatabaseDocument")); + Reference<XModuleUIConfigurationManagerSupplier> xModuleCfgMgrSupplier = ModuleUIConfigurationManagerSupplier::create( getContext() ); + Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( OUString("com.sun.star.sdb.OfficeDatabaseDocument") ); Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY); - short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT; Sequence< OUString> aSeq(1); diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index c0673ad4d5fe..f360731da0c7 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -42,7 +42,7 @@ namespace dbaui ::std::auto_ptr<PopupMenu> getMenu(); public: - OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 3804f864ed9f..04451593383a 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -16,6 +16,7 @@ #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <osl/mutex.hxx> +#include <comphelper/processfactory.hxx> #include "LimitBox.hxx" #include "dbu_reghelper.hxx" @@ -91,8 +92,8 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt ) LimitBoxController::LimitBoxController( - const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) : - svt::ToolboxController( rServiceManager, + const uno::Reference< uno::XComponentContext >& rxContext ) : + svt::ToolboxController( rxContext, uno::Reference< frame::XFrame >(), OUString( ".uno:DBLimit" ) ), m_pLimitBox( NULL ) @@ -126,7 +127,15 @@ void SAL_CALL LimitBoxController::release() throw () /// XServiceInfo -IMPLEMENT_SERVICE_INFO1_STATIC(LimitBoxController,"org.libreoffice.comp.dbu.LimitBoxController","com.sun.star.frame.ToolboxController") +IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(LimitBoxController, "org.libreoffice.comp.dbu.LimitBoxController") +IMPLEMENT_SERVICE_INFO_SUPPORTS(LimitBoxController) +IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(LimitBoxController, "com.sun.star.frame.ToolboxController") + +uno::Reference< uno::XInterface > + SAL_CALL LimitBoxController::Create(const uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) +{ + return static_cast< XServiceInfo* >(new LimitBoxController( comphelper::getComponentContext(_rxORB) )); +} /// XComponent void SAL_CALL LimitBoxController::dispose() diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index 64bab94a870c..701b5070f8e3 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -31,7 +31,7 @@ class LimitBoxController: public svt::ToolboxController, { public: LimitBoxController( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); ~LimitBoxController(); /// XInterface diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 3c285506d077..328b3c3949fa 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -20,7 +20,6 @@ #ifndef __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX_ #define __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -49,7 +48,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, public ::cppu::OWeakObject { public: - ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, ToolBox* pToolBar, const OUString& aCommand ); virtual ~ButtonToolbarController(); @@ -88,7 +87,7 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, m_bDisposed : 1; OUString m_aCommandURL; ::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::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; ToolBox* m_pToolbar; }; diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index 3288916ef4e3..8fa205f86742 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -52,7 +52,7 @@ class ComboboxToolbarController : public IComboBoxListener, { public: - ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ComboboxToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index f792c6466228..3d28cf6688a5 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -54,7 +54,7 @@ class ComplexToolbarController : public svt::ToolboxController { public: - ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ComplexToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index 0bc9c3874695..6757d11b90ca 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -51,7 +51,7 @@ class DropdownToolbarController : public IListBoxListener, { public: - DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + DropdownToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index ac06db819a66..590581920ab2 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -52,7 +52,7 @@ class EditToolbarController : public IEditListener, { public: - EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + EditToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index f2c2b03efad2..2eb1697971f9 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -34,7 +34,7 @@ class ToolBar; class GenericToolbarController : public svt::ToolboxController { public: - GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + GenericToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, @@ -67,7 +67,7 @@ class MenuToolbarController : public GenericToolbarController com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xMenuManager; OUString m_aModuleIdentifier; public: - MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + MenuToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index e30d1cecdfe1..c5066d8d4034 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -36,7 +36,7 @@ class ImageButtonToolbarController : public ComplexToolbarController { public: - ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ImageButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/popupmenucontroller.hxx b/framework/inc/uielement/popupmenucontroller.hxx index 92a50e4fa30a..7511af004611 100644 --- a/framework/inc/uielement/popupmenucontroller.hxx +++ b/framework/inc/uielement/popupmenucontroller.hxx @@ -37,7 +37,7 @@ class PopupMenuControllerImpl; class PopupMenuController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo { public: - PopupMenuController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); + PopupMenuController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); ~PopupMenuController(); // XInterface diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index e2a3b8cca16a..ca30f4f17f50 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -58,7 +58,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, { public: - SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + SpinfieldToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index afa924555271..a33e226aad5b 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -43,7 +43,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController STYLE_TOGGLE_DROPDOWNBUTTON }; - ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ToggleButtonToolbarController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index f174e66758bb..bf3280d04ba5 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -128,8 +128,8 @@ class ToolBarMerger const OUString& rMergeCommandParameter ); static ::cppu::OWeakObject* CreateController( - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame, ToolBox* pToolbar, const OUString& rCommandURL, sal_uInt16 nId, diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 216f31a66b9b..d15e58e6393d 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -322,7 +322,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue { ::cppu::OWeakObject* pController = 0; - pController = ToolBarMerger::CreateController( m_xServiceManager, m_xFrame, m_pToolBar, aURL, nId, nWidth, aControlType ); + pController = ToolBarMerger::CreateController( xComponentContext, m_xFrame, m_pToolBar, aURL, nId, nWidth, aControlType ); xController = Reference< XStatusListener >( pController, UNO_QUERY ); } diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 6c1c8c145b33..cd827d7eebcb 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "com/sun/star/util/XMacroExpander.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/beans/XPropertySet.hpp" @@ -55,14 +56,14 @@ namespace framework { ButtonToolbarController::ButtonToolbarController( - const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, + const uno::Reference< uno::XComponentContext >& rxContext, ToolBox* pToolBar, const OUString& aCommand ) : cppu::OWeakObject(), m_bInitialized( sal_False ), m_bDisposed( sal_False ), m_aCommandURL( aCommand ), - m_xServiceManager( rServiceManager ), + m_xContext( rxContext ), m_pToolbar( pToolBar ) { } @@ -130,7 +131,10 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException else if ( aPropValue.Name == "CommandURL" ) aPropValue.Value >>= m_aCommandURL; else if ( aPropValue.Name == "ServiceManager" ) - m_xServiceManager.set(aPropValue.Value,UNO_QUERY); + { + Reference<XMultiServiceFactory> xServiceManager(aPropValue.Value,UNO_QUERY); + m_xContext = comphelper::getComponentContext(xServiceManager); + } } } } @@ -146,7 +150,7 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R if ( m_bDisposed ) throw DisposedException(); - m_xServiceManager.clear(); + m_xContext.clear(); m_xURLTransformer.clear(); m_xFrame.clear(); m_pToolbar = 0; @@ -220,12 +224,12 @@ throw (::com::sun::star::uno::RuntimeException) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && + m_xContext.is() && !m_aCommandURL.isEmpty() ) { if ( !m_xURLTransformer.is() ) { - m_xURLTransformer = util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ); + m_xURLTransformer = util::URLTransformer::create( m_xContext ); } xFrame = m_xFrame; diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 3757f7adc977..ceb614c0ed2f 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -140,13 +140,13 @@ long ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ ComboboxToolbarController::ComboboxToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, - const Reference< XFrame >& rFrame, - ToolBox* pToolbar, - sal_uInt16 nID, - sal_Int32 nWidth, - const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolbar, + sal_uInt16 nID, + sal_Int32 nWidth, + const OUString& aCommand ) : + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_pComboBox( 0 ) { m_pComboBox = new ComboBoxControl( m_pToolbar, WB_DROPDOWN, this ); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 499e1b47e146..d5960f8f9b68 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -53,17 +53,17 @@ namespace framework // ------------------------------------------------------------------ ComplexToolbarController::ComplexToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, - const Reference< XFrame >& rFrame, - ToolBox* pToolbar, - sal_uInt16 nID, - const OUString& aCommand ) : - svt::ToolboxController( rServiceManager, rFrame, aCommand ) + const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolbar, + sal_uInt16 nID, + const OUString& aCommand ) : + svt::ToolboxController( rxContext, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) , m_bMadeInvisible( sal_False ) { - m_xURLTransformer.set( URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)) ); + m_xURLTransformer.set( URLTransformer::create(m_xContext) ); } // ------------------------------------------------------------------ @@ -115,7 +115,6 @@ throw ( RuntimeException ) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && !m_aCommandURL.isEmpty() ) { xURLTransformer = m_xURLTransformer; @@ -301,7 +300,7 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm { uno::Reference< frame::XDispatch > xDispatch; - if ( m_bInitialized && m_xFrame.is() && m_xServiceManager.is() && !aCommand.isEmpty() ) + if ( m_bInitialized && m_xFrame.is() && !aCommand.isEmpty() ) { URLToDispatchMap::const_iterator pIter = m_aListenerMap.find( aCommand ); if ( pIter != m_aListenerMap.end() ) diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index ac746a76924c..69b52f2f2516 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -122,13 +122,13 @@ long ListBoxControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ DropdownToolbarController::DropdownToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_pListBoxControl( 0 ) { m_pListBoxControl = new ListBoxControl( m_pToolbar, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER, this ); diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index ba3ae7eb871d..53afe0f28674 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -121,13 +121,13 @@ long EditControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ EditToolbarController::EditToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_pEditControl( 0 ) { m_pEditControl = new EditControl( m_pToolbar, WB_BORDER, this ); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index a021b33471fe..6d44e91b4cae 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -101,12 +101,12 @@ struct ExecuteInfo ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; -GenericToolbarController::GenericToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, +GenericToolbarController::GenericToolbarController( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, - sal_uInt16 nID, + sal_uInt16 nID, const OUString& aCommand ) : - svt::ToolboxController( rServiceManager, rFrame, aCommand ) + svt::ToolboxController( rxContext, rFrame, aCommand ) , m_pToolbar( pToolbar ) , m_nID( nID ) , m_bEnumCommand( isEnumCommand( aCommand )) @@ -147,10 +147,9 @@ throw ( RuntimeException ) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && !m_aCommandURL.isEmpty() ) { - xURLTransformer = URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)); + xURLTransformer = URLTransformer::create(m_xContext); aCommandURL = m_aCommandURL; URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL ); @@ -297,7 +296,17 @@ IMPL_STATIC_LINK_NOINSTANCE( GenericToolbarController, ExecuteHdl_Impl, ExecuteI return 0; } -MenuToolbarController::MenuToolbarController( const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& rFrame, ToolBox* pToolBar, sal_uInt16 nID, const OUString& aCommand, const OUString& aModuleIdentifier, const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rServiceManager, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), pMenu( NULL ), m_aModuleIdentifier( aModuleIdentifier ) +MenuToolbarController::MenuToolbarController( const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolBar, + sal_uInt16 nID, + const OUString& aCommand, + const OUString& aModuleIdentifier, + const Reference< XIndexAccess >& xMenuDesc ) + : GenericToolbarController( rxContext, rFrame, pToolBar, nID, aCommand ), + m_xMenuDesc( xMenuDesc ), + pMenu( NULL ), + m_aModuleIdentifier( aModuleIdentifier ) { } @@ -345,9 +354,9 @@ MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::Runtime if ( !pMenu ) { Reference< XDispatchProvider > xDispatch; - Reference< XURLTransformer > xURLTransformer = URLTransformer::create(::comphelper::getComponentContext(m_xServiceManager)); + Reference< XURLTransformer > xURLTransformer = URLTransformer::create( m_xContext ); pMenu = new Toolbarmenu(); - m_xMenuManager.set( new MenuBarManager( m_xServiceManager, m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) ); + m_xMenuManager.set( new MenuBarManager( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), m_xFrame, xURLTransformer, xDispatch, m_aModuleIdentifier, pMenu, sal_True, sal_True ) ); if ( m_xMenuManager.is() ) { MenuBarManager* pMgr = dynamic_cast< MenuBarManager* >( m_xMenuManager.get() ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index e790afda932d..2b01e9297ecd 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -99,12 +99,12 @@ static void SubstituteVariables( OUString& aURL ) // ------------------------------------------------------------------ ImageButtonToolbarController::ImageButtonToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) { sal_Bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() ); diff --git a/framework/source/uielement/popupmenucontroller.cxx b/framework/source/uielement/popupmenucontroller.cxx index e22e79f44625..80fbdc3a845e 100644 --- a/framework/source/uielement/popupmenucontroller.cxx +++ b/framework/source/uielement/popupmenucontroller.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::beans; namespace framework { -DEFINE_XSERVICEINFO_MULTISERVICE ( PopupMenuController , +DEFINE_XSERVICEINFO_MULTISERVICE_2 ( PopupMenuController , OWeakObject , OUString( "com.sun.star.frame.ToolbarController" ) , OUString( "com.sun.star.comp.framework.PopupMenuController" ) @@ -62,8 +62,8 @@ class PopupMenuControllerImpl // class PopupMenuController //======================================================================== -PopupMenuController::PopupMenuController( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::ToolboxController( rServiceManager, Reference< frame::XFrame >(), OUString() ) +PopupMenuController::PopupMenuController( const Reference< uno::XComponentContext >& rxContext ) +: svt::ToolboxController( rxContext, Reference< frame::XFrame >(), OUString() ) { } @@ -156,10 +156,7 @@ void SAL_CALL PopupMenuController::doubleClick() throw (RuntimeException) bool PopupMenuController::CreatePopupMenuController() throw (Exception) { - Reference< XComponentContext > xComponentContext( - comphelper::getComponentContext( getServiceManager() ) ); - - Reference< XToolbarControllerFactory > xPopupMenuControllerRegistration = PopupMenuControllerFactory::create( xComponentContext ); + Reference< XToolbarControllerFactory > xPopupMenuControllerRegistration = PopupMenuControllerFactory::create( m_xContext ); Sequence< Any > aSeq( 2 ); PropertyValue aPropValue; @@ -171,7 +168,7 @@ bool PopupMenuController::CreatePopupMenuController() throw (Exception) aPropValue.Value <<= m_xFrame; aSeq[1] <<= aPropValue; - Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, xComponentContext ), UNO_QUERY ); + Reference< XPopupMenuController > xPopupMenuController( xPopupMenuControllerRegistration->createInstanceWithArgumentsAndContext( getCommandURL(), aSeq, m_xContext ), UNO_QUERY ); if ( xPopupMenuController.is() ) { mxPopupMenuController = xPopupMenuController; @@ -204,7 +201,8 @@ Reference< awt::XWindow > SAL_CALL PopupMenuController::createPopupWindow() thro if( !mxPopupMenu.is() ) { - mxPopupMenu = Reference< awt::XPopupMenu >( getServiceManager()->createInstance( DECLARE_ASCII( "stardiv.Toolkit.VCLXPopupMenu" ) ), UNO_QUERY_THROW ); + mxPopupMenu = Reference< awt::XPopupMenu >( + m_xContext->getServiceManager()->createInstanceWithContext("stardiv.Toolkit.VCLXPopupMenu", m_xContext), UNO_QUERY_THROW ); mxPopupMenuController->setPopupMenu( mxPopupMenu ); } else diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 4b295bf6458b..9da2523b2743 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -175,13 +175,13 @@ long SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) // ------------------------------------------------------------------ SpinfieldToolbarController::SpinfieldToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, sal_Int32 nWidth, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ) + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) , m_bFloat( false ) , m_bMaxSet( false ) , m_bMinSet( false ) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 619e37aa30f1..dfa24230d05b 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -57,13 +57,13 @@ namespace framework // ------------------------------------------------------------------ ToggleButtonToolbarController::ToggleButtonToolbarController( - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rFrame, ToolBox* pToolbar, sal_uInt16 nID, Style eStyle, const OUString& aCommand ) : - ComplexToolbarController( rServiceManager, rFrame, pToolbar, nID, aCommand ), + ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ), m_eStyle( eStyle ) { if ( eStyle == STYLE_DROPDOWNBUTTON ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 58cc63824790..d2cb76972e97 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -970,7 +970,7 @@ void ToolBarManager::CreateControllers() OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; Reference< XStatusListener > xStatusListener( - ToolBarMerger::CreateController( m_xServiceManager, + ToolBarMerger::CreateController( comphelper::getComponentContext(m_xServiceManager), m_xFrame, m_pToolBar, aCommandURL, @@ -986,7 +986,7 @@ void ToolBarManager::CreateControllers() if ( it == m_aMenuMap.end() ) { xController = Reference< XStatusListener >( - new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL )); + new GenericToolbarController( comphelper::getComponentContext(m_xServiceManager), m_xFrame, m_pToolBar, nId, aCommandURL )); // Accessibility support: Set toggle button role for specific commands sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL ); @@ -995,7 +995,7 @@ void ToolBarManager::CreateControllers() } else xController = Reference< XStatusListener >( - new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] )); + new MenuToolbarController( comphelper::getComponentContext(m_xServiceManager), m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] )); } } else if ( pController ) diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 9d714711d421..f11155addbbc 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -23,6 +23,7 @@ #include <framework/imageproducer.hxx> #include <svtools/miscopt.hxx> +#include <comphelper/processfactory.hxx> namespace framework { @@ -649,8 +650,8 @@ bool ToolBarMerger::RemoveItems( false. */ ::cppu::OWeakObject* ToolBarMerger::CreateController( - uno::Reference< lang::XMultiServiceFactory > xSMGR, - uno::Reference< frame::XFrame > xFrame, + const uno::Reference< uno::XComponentContext >& rxContext, + const uno::Reference< frame::XFrame > & xFrame, ToolBox* pToolbar, const OUString& rCommandURL, sal_uInt16 nId, @@ -660,25 +661,25 @@ bool ToolBarMerger::RemoveItems( ::cppu::OWeakObject* pResult( 0 ); if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_BUTTON, TOOLBARCONTROLLER_BUTTON_LEN )) - pResult = new ButtonToolbarController( xSMGR, pToolbar, rCommandURL ); + pResult = new ButtonToolbarController( rxContext, pToolbar, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_COMBOBOX, TOOLBARCONTROLLER_COMBOBOX_LEN )) - pResult = new ComboboxToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new ComboboxToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_EDIT, TOOLBARCONTROLLER_EDIT_LEN )) - pResult = new EditToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new EditToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_SPINFIELD, TOOLBARCONTROLLER_SPINFIELD_LEN )) - pResult = new SpinfieldToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new SpinfieldToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_IMGBUTTON, TOOLBARCONTROLLER_IMGBUTTON_LEN )) - pResult = new ImageButtonToolbarController( xSMGR, xFrame, pToolbar, nId, rCommandURL ); + pResult = new ImageButtonToolbarController( rxContext, xFrame, pToolbar, nId, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_DROPDOWNBOX, TOOLBARCONTROLLER_DROPDOWNBOX_LEN )) - pResult = new DropdownToolbarController( xSMGR, xFrame, pToolbar, nId, nWidth, rCommandURL ); + pResult = new DropdownToolbarController( rxContext, xFrame, pToolbar, nId, nWidth, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_DROPDOWNBTN, TOOLBARCONTROLLER_DROPDOWNBTN_LEN )) - pResult = new ToggleButtonToolbarController( xSMGR, xFrame, pToolbar, nId, + pResult = new ToggleButtonToolbarController( rxContext, xFrame, pToolbar, nId, ToggleButtonToolbarController::STYLE_DROPDOWNBUTTON, rCommandURL ); else if ( rControlType.equalsAsciiL( TOOLBARCONTROLLER_TOGGLEDDBTN, TOOLBARCONTROLLER_TOGGLEDDBTN_LEN )) - pResult = new ToggleButtonToolbarController( xSMGR, xFrame, pToolbar, nId, + pResult = new ToggleButtonToolbarController( rxContext, xFrame, pToolbar, nId, ToggleButtonToolbarController::STYLE_TOGGLE_DROPDOWNBUTTON, rCommandURL ); else - pResult = new GenericToolbarController( xSMGR, xFrame, pToolbar, nId, rCommandURL ); + pResult = new GenericToolbarController( rxContext, xFrame, pToolbar, nId, rCommandURL ); return pResult; } diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 41c0a5fd33b7..b58aea237dec 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -45,7 +45,7 @@ namespace rptui OToolboxController(const OToolboxController&); void operator =(const OToolboxController&); public: - OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + OToolboxController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); virtual ~OToolboxController(); // XInterface diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index f05b07f995a6..ebfea204bb05 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -86,18 +86,18 @@ Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() thro // ------------------------------------------------------------------------- Reference< XInterface > OToolboxController::create(Reference< XComponentContext > const & xContext) { - return *(new OToolboxController(Reference< XMultiServiceFactory >(xContext->getServiceManager(),UNO_QUERY))); + return * new OToolboxController(xContext); } // ----------------------------------------------------------------------------- DBG_NAME(rpt_OToolboxController) -OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB) +OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB) : m_pToolbarController(NULL) ,m_nToolBoxId(1) ,m_nSlotId(0) { DBG_CTOR(rpt_OToolboxController,NULL); osl_atomic_increment(&m_refCount); - m_xServiceManager = _rxORB; + m_xContext = _rxORB; osl_atomic_decrement(&m_refCount); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 115f7eb581ef..922b17fe9fdd 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -42,6 +42,7 @@ #include <svtools/valueset.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <comphelper/processfactory.hxx> #include <sfx2/imagemgr.hxx> @@ -331,7 +332,7 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return static_cast< cppu::OWeakObject * >( - new SlideLayoutController( rSMgr, ".uno:AssignLayout", false )); + new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false )); } // -------------------------------------------------------------------- @@ -355,15 +356,15 @@ Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( Ru Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException ) { return static_cast< cppu::OWeakObject * >( - new SlideLayoutController( rSMgr, ".uno:InsertPage" , true ) ); + new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) ); } //======================================================================== // class SlideLayoutController //======================================================================== -SlideLayoutController::SlideLayoutController( const Reference< lang::XMultiServiceFactory >& rServiceManager, const OUString& sCommandURL, bool bInsertPage ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), sCommandURL ) +SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage ) +: svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), sCommandURL ) , mbInsertPage( bInsertPage ) { } diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 785cba0fb9ac..9ba7b7e2d78d 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -28,7 +28,9 @@ namespace sd class SlideLayoutController : public svt::PopupWindowController { public: - SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const OUString& sCommandURL, bool bInsertPage ); + SlideLayoutController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, + const OUString& sCommandURL, + bool bInsertPage ); virtual ::Window* createPopupWindow( ::Window* pParent ); diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 27cb93c50cea..ad081894866a 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -182,7 +182,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( // create a generic toolbox controller for our internal toolbox svt::GenericToolboxController* pController = new svt::GenericToolboxController( - ::comphelper::getProcessServiceFactory(), + ::comphelper::getProcessComponentContext(), xFrame, &aTbx, SID_STOP_RECORDING, diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index b882ff0b8dd8..cb9145699994 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -101,7 +101,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ return; Reference< XDispatchProvider > xDispatchProvider( getFrameInterface(), UNO_QUERY ); - if ( xDispatchProvider.is() && m_xServiceManager.is() ) + if ( xDispatchProvider.is() ) { URL aTargetURL; OUString aTarget( OUString("_default")); @@ -181,18 +181,15 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl) SvtURLBox* pURLBox = GetURLBox(); OpenURL( pURLBox->GetURL(), pURLBox->IsCtrlOpen() ); - if ( m_xServiceManager.is() ) + Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext ); + Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY ); + if ( xFrame.is() ) { - Reference< XDesktop2 > xDesktop = Desktop::create( comphelper::getComponentContext(m_xServiceManager) ); - Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY ); - if ( xFrame.is() ) + Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + if ( pWin ) { - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); - if ( pWin ) - { - pWin->GrabFocus(); - pWin->ToTop( TOTOP_RESTOREWHENMIN ); - } + pWin->GrabFocus(); + pWin->ToTop( TOTOP_RESTOREWHENMIN ); } } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 8ed58cab5eba..a9e786f30644 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -783,7 +783,6 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar return; // create element with factory - Reference< XMultiServiceFactory > xServiceManager = getServiceManager(); Reference< XFrame > xFrame = getFrameInterface(); Reference< XUIElement > xUIElement; Reference< XUIElementFactoryManager > xUIElementFactory; @@ -791,7 +790,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar xUIElementFactory = xWeakUIElementFactory; if ( !xUIElementFactory.is() ) { - xUIElementFactory = UIElementFactoryManager::create( comphelper::getComponentContext(xServiceManager) ); + xUIElementFactory = UIElementFactoryManager::create( m_xContext ); xWeakUIElementFactory = xUIElementFactory; } @@ -1484,7 +1483,7 @@ SfxPopupWindow* SfxAppToolBoxControl_Impl::CreatePopupWindow() if ( !pMenu ) { - ::framework::MenuConfiguration aConf( comphelper::getComponentContext(m_xServiceManager) ); + ::framework::MenuConfiguration aConf( m_xContext ); if ( m_aCommandURL == ".uno:AddDirect" ) pMenu = aConf.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU ); else @@ -1551,7 +1550,7 @@ void SfxAppToolBoxControl_Impl::StateChanged // to check for supported URLs ... if ( !pMenu ) { - ::framework::MenuConfiguration aConf( comphelper::getComponentContext(m_xServiceManager) ); + ::framework::MenuConfiguration aConf( m_xContext ); // This toolbox controller is used for two popup menus (new documents and wizards!). Create the correct // popup menu according to the slot ID our controller has been initialized with. if ( nSlotId == SID_NEWDOCDIRECT ) diff --git a/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx index 50a374729b73..f01d5428a44f 100644 --- a/svtools/inc/svtools/generictoolboxcontroller.hxx +++ b/svtools/inc/svtools/generictoolboxcontroller.hxx @@ -31,7 +31,7 @@ struct ExecuteInfo; class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController { public: - GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + GenericToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolBox, sal_uInt16 nID, diff --git a/svtools/inc/svtools/popupwindowcontroller.hxx b/svtools/inc/svtools/popupwindowcontroller.hxx index a02281e17d4a..ec2719cebd5c 100644 --- a/svtools/inc/svtools/popupwindowcontroller.hxx +++ b/svtools/inc/svtools/popupwindowcontroller.hxx @@ -36,7 +36,7 @@ class PopupWindowControllerImpl; class SVT_DLLPUBLIC PopupWindowController : public svt::ToolboxController, public ::com::sun::star::lang::XServiceInfo { public: - PopupWindowController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + PopupWindowController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& aCommandURL ); ~PopupWindowController(); diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx index 4cc240729df7..6bccf935be9c 100644 --- a/svtools/inc/svtools/toolboxcontroller.hxx +++ b/svtools/inc/svtools/toolboxcontroller.hxx @@ -21,15 +21,15 @@ #define _SVTOOLS_TOOLBOXCONTROLLER_HXX #include "svtools/svtdllapi.h" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XToolbarController.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/util/XUpdatable.hpp> +#include <com/sun/star/util/XURLTransformer.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> @@ -59,14 +59,14 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL private: sal_Bool m_bSupportVisible; //shizhoubo public: - ToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + ToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& aCommandURL ); ToolboxController(); virtual ~ToolboxController(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getContext() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; void updateStatus( const OUString aCommandURL ); @@ -149,8 +149,8 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL m_bDisposed : 1; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ToolboxController_Impl* m_pImpl; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - OUString m_aCommandURL; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + OUString m_aCommandURL; URLToDispatchMap m_aListenerMap; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener }; diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 73bbeb0f2083..1f43c1b918fb 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -49,12 +49,12 @@ struct ExecuteInfo ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs; }; -GenericToolboxController::GenericToolboxController( const Reference< XMultiServiceFactory >& rServiceManager, - const Reference< XFrame >& rFrame, - ToolBox* pToolbox, - sal_uInt16 nID, - const OUString& aCommand ) : - svt::ToolboxController( rServiceManager, rFrame, aCommand ) +GenericToolboxController::GenericToolboxController( const Reference< XComponentContext >& rxContext, + const Reference< XFrame >& rFrame, + ToolBox* pToolbox, + sal_uInt16 nID, + const OUString& aCommand ) : + svt::ToolboxController( rxContext, rFrame, aCommand ) , m_pToolbox( pToolbox ) , m_nID( nID ) { @@ -96,10 +96,10 @@ throw ( RuntimeException ) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && + m_xContext.is() && !m_aCommandURL.isEmpty() ) { - xURLTransformer = com::sun::star::util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ); + xURLTransformer = URLTransformer::create( m_xContext ); aCommandURL = m_aCommandURL; URLToDispatchMap::iterator pIter = m_aListenerMap.find( m_aCommandURL ); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index c5ae27a27b40..87846819092a 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -133,10 +133,10 @@ IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window*, pWin // class PopupWindowController //======================================================================== -PopupWindowController::PopupWindowController( const Reference< lang::XMultiServiceFactory >& rServiceManager, +PopupWindowController::PopupWindowController( const Reference< uno::XComponentContext >& rxContext, const Reference< frame::XFrame >& xFrame, const OUString& aCommandURL ) -: svt::ToolboxController( rServiceManager, xFrame, aCommandURL ) +: svt::ToolboxController( rxContext, xFrame, aCommandURL ) , mpImpl( new PopupWindowControllerImpl() ) { } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 4992c16c8c1e..25e519b7e8d5 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <osl/mutex.hxx> @@ -73,8 +74,7 @@ struct ToolboxController_Impl }; ToolboxController::ToolboxController( - - const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XComponentContext >& rxContext, const Reference< XFrame >& xFrame, const OUString& aCommandURL ) : OPropertyContainer(GetBroadcastHelper()) @@ -83,20 +83,21 @@ ToolboxController::ToolboxController( , m_bInitialized( sal_False ) , m_bDisposed( sal_False ) , m_xFrame(xFrame) - , m_xServiceManager( rServiceManager ) + , m_xContext( rxContext ) , m_aCommandURL( aCommandURL ) , m_aListenerContainer( m_aMutex ) { - registerProperty(OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + OSL_ASSERT( m_xContext.is() ); + registerProperty( OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), + TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, + css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; try { - m_pImpl->m_xUrlTransformer.set( - ::com::sun::star::util::URLTransformer::create( - ::comphelper::getComponentContext(m_xServiceManager) ) ); + m_pImpl->m_xUrlTransformer = URLTransformer::create( rxContext ); } catch(const Exception&) { @@ -111,7 +112,9 @@ ToolboxController::ToolboxController() : , m_bDisposed( sal_False ) , m_aListenerContainer( m_aMutex ) { - registerProperty(OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + registerProperty( OUString(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE), + TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, + css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY, &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; @@ -128,10 +131,10 @@ Reference< XFrame > ToolboxController::getFrameInterface() const return m_xFrame; } -Reference< XMultiServiceFactory > ToolboxController::getServiceManager() const +const Reference< XComponentContext > & ToolboxController::getContext() const { SolarMutexGuard aSolarMutexGuard; - return m_xServiceManager; + return m_xContext; } Reference< XLayoutManager > ToolboxController::getLayoutManager() const @@ -221,7 +224,11 @@ throw ( Exception, RuntimeException ) else if ( aPropValue.Name == "CommandURL" ) aPropValue.Value >>= m_aCommandURL; else if ( aPropValue.Name == "ServiceManager" ) - m_xServiceManager.set(aPropValue.Value,UNO_QUERY); + { + Reference<XMultiServiceFactory> xMSF(aPropValue.Value, UNO_QUERY); + if (xMSF.is()) + m_xContext = comphelper::getComponentContext(xMSF); + } else if ( aPropValue.Name == "ParentWindow" ) m_pImpl->m_xParentWindow.set(aPropValue.Value,UNO_QUERY); else if ( aPropValue.Name == "ModuleName" ) @@ -231,10 +238,8 @@ throw ( Exception, RuntimeException ) try { - if ( !m_pImpl->m_xUrlTransformer.is() && m_xServiceManager.is() ) - m_pImpl->m_xUrlTransformer.set( - ::com::sun::star::util::URLTransformer::create( - ::comphelper::getComponentContext(m_xServiceManager) ) ); + if ( !m_pImpl->m_xUrlTransformer.is() && m_xContext.is() ) + m_pImpl->m_xUrlTransformer = URLTransformer::create( m_xContext ); } catch(const Exception&) { @@ -360,7 +365,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( m_bInitialized && m_xFrame.is() && - m_xServiceManager.is() && + m_xContext.is() && !m_aCommandURL.isEmpty() ) { @@ -441,7 +446,7 @@ void ToolboxController::addStatusListener( const OUString& aCommandURL ) { // Add status listener directly as intialize has already been called. Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - if ( m_xServiceManager.is() && xDispatchProvider.is() ) + if ( m_xContext.is() && xDispatchProvider.is() ) { aTargetURL.Complete = aCommandURL; if ( m_pImpl->m_xUrlTransformer.is() ) @@ -521,7 +526,7 @@ void ToolboxController::bindListener() // Collect all registered command URL's and store them temporary Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - if ( m_xServiceManager.is() && xDispatchProvider.is() ) + if ( m_xContext.is() && xDispatchProvider.is() ) { xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); @@ -610,7 +615,7 @@ void ToolboxController::unbindListener() // Collect all registered command URL's and store them temporary Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - if ( m_xServiceManager.is() && xDispatchProvider.is() ) + if ( m_xContext.is() && xDispatchProvider.is() ) { Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); @@ -679,7 +684,7 @@ void ToolboxController::updateStatus( const OUString aCommandURL ) // Try to find a dispatch object for the requested command URL Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); - if ( m_xServiceManager.is() && xDispatchProvider.is() ) + if ( m_xContext.is() && xDispatchProvider.is() ) { aTargetURL.Complete = aCommandURL; if ( m_pImpl->m_xUrlTransformer.is() ) diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index 58f17418fd53..71bfaa7f5f08 100644 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx @@ -23,6 +23,7 @@ #include <svtools/toolboxcontroller.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace svx { @@ -33,7 +34,7 @@ class FontHeightToolBoxControl : public svt::ToolboxController, { public: FontHeightToolBoxControl( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rServiceManager ); ~FontHeightToolBoxControl(); // XInterface diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 720d6232ed95..b15c2c5d0804 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -47,7 +47,7 @@ class FindTextFieldControl : public ComboBox public: 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 ); virtual ~FindTextFieldControl(); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -91,7 +91,7 @@ class FindTextToolbarController : public svt::ToolboxController, { public: - FindTextToolbarController( const css::uno::Reference< css::lang::XMultiServiceFactory > & rServiceManager ); + FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext > & rxContext ); ~FindTextToolbarController(); // XInterface @@ -139,7 +139,7 @@ class ExitSearchToolboxController : public svt::ToolboxController, public css::lang::XServiceInfo { public: - ExitSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager ); + ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ~ExitSearchToolboxController(); // XInterface @@ -178,7 +178,7 @@ class UpDownSearchToolboxController : public svt::ToolboxController, public: enum Type { UP, DOWN }; - UpDownSearchToolboxController( const css::uno::Reference< css::lang::XMultiServiceFactory >& rServiceManager, Type eType ); + UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, Type eType ); ~UpDownSearchToolboxController(); // XInterface 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( |