diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-12 08:16:47 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-12 08:17:10 +0100 |
commit | c1e4a1d3474ec41a9d11a56de7baca6ac344606e (patch) | |
tree | 049a8d0635887c06faa947fb9e90c59fa5c3aa7b /sd | |
parent | 4dafecfe4a72204dd994a3f66c5d886ffcfc965a (diff) |
Clean up previous commit
Change-Id: I94a0aeac85918f2eb91421e46e75283f839e7425
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/framework/module/ModuleController.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/facreg.hxx | 7 | ||||
-rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 2 |
4 files changed, 1 insertions, 16 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index c41267c4a8fd..7c8d02a46819 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -306,12 +306,6 @@ Sequence< OUString > SlideLayoutController_getSupportedServiceNames() throw( Ru return aSNS; } -Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) -{ - return static_cast< cppu::OWeakObject * >( - new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false )); -} - OUString InsertSlideController_getImplementationName() throw (css::uno::RuntimeException) { return OUString( "com.sun.star.comp.sd.InsertSlideController" ); diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index a742fb38f13b..4cce9529c557 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -268,7 +268,7 @@ com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation( ::com::sun::star::uno::XComponentContext* context, ::com::sun::star::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference< css::drawing::framework::XModuleController > xModCont ( sd::framework::ModuleController::CreateInstance(context) ); + css::uno::Reference< css::uno::XInterface > xModCont ( sd::framework::ModuleController::CreateInstance(context) ); xModCont->acquire(); return xModCont.get(); } diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx index 2300af29bf2e..e69f15b403ef 100644 --- a/sd/source/ui/inc/facreg.hxx +++ b/sd/source/ui/inc/facreg.hxx @@ -35,13 +35,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL SdPresentationDocument_crea OUString SdPresentationDocument_getImplementationName() throw( css::uno::RuntimeException ); css::uno::Sequence< OUString > SAL_CALL SdPresentationDocument_getSupportedServiceNames() throw( css::uno::RuntimeException ); - -namespace sd -{ -OUString InsertSlideController_getImplementationName() throw( css::uno::RuntimeException ); -css::uno::Sequence< OUString > InsertSlideController_getSupportedServiceNames() throw( css::uno::RuntimeException ); -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 014ab4c23366..21f63c92e6d2 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -33,8 +33,6 @@ using namespace com::sun::star; -using namespace ::sd; - // Declaration and initialization of a map from service names to locally // unique factory identifiers. |