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