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 /reportdesign/source | |
| parent | 34da7fbcc643ad209290c6da456dbfb17aeb9ac0 (diff) | |
fdo#46808, Convert svt::ToolboxController to XComponentContext
.. and all of it's friends
Change-Id: I408d9308d1d1a4f8ed0055ac5f4042d729c44d1e
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/inc/toolboxcontroller.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/toolboxcontroller.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
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); } |