sd: convert sd.component to constructor usage

Change-Id: I844a7387253960059855346faa62c4ae51b97b18
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

22 files changed, 249 insertions, 710 deletions

diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index d837d87730c8..068df391a48c 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -100,27 +100,6 @@ public:
 };
 
 // - SdHtmlOptionsDialog -
-Reference< XInterface >
-    SAL_CALL SdHtmlOptionsDialog_CreateInstance(
-        SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
-{
-    return static_cast< ::cppu::OWeakObject* > ( new SdHtmlOptionsDialog );
-}
-
-OUString SdHtmlOptionsDialog_getImplementationName()
-    throw( RuntimeException )
-{
-    return OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" );
-}
-
-Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames()
-    throw( RuntimeException )
-{
-    Sequence< OUString > aRet(1);
-    aRet[0] = "com.sun.star.ui.dialog.FilterOptionsDialog";
-    return aRet;
-}
-
 SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
     meDocType   ( DOCUMENT_TYPE_DRAW )
 {
@@ -150,17 +129,21 @@ void SAL_CALL SdHtmlOptionsDialog::initialize( const Sequence< Any > & )
 OUString SAL_CALL SdHtmlOptionsDialog::getImplementationName()
     throw( RuntimeException, std::exception )
 {
-    return SdHtmlOptionsDialog_getImplementationName();
+    return OUString( "com.sun.star.comp.draw.SdHtmlOptionsDialog" );
 }
+
 sal_Bool SAL_CALL SdHtmlOptionsDialog::supportsService( const OUString& rServiceName )
     throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
+
 Sequence< OUString > SAL_CALL SdHtmlOptionsDialog::getSupportedServiceNames()
     throw ( RuntimeException, std::exception )
 {
-    return SdHtmlOptionsDialog_getSupportedServiceNames();
+    Sequence< OUString > aRet(1);
+    aRet[0] = "com.sun.star.ui.dialog.FilterOptionsDialog";
+    return aRet;
 }
 
 // XPropertyAccess
@@ -254,4 +237,14 @@ void SdHtmlOptionsDialog::setSourceDocument( const Reference< XComponent >& xDoc
     throw IllegalArgumentException();
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                                              ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new SdHtmlOptionsDialog());
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 387c40db31fa..c41267c4a8fd 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -324,12 +324,6 @@ Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( Ru
     return aSNS;
 }
 
-Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr )
-{
-    return static_cast< cppu::OWeakObject * >(
-        new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:InsertPage" , true ) );
-}
-
 // class SlideLayoutController
 
 SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentContext >& rxContext, const OUString& sCommandURL, bool bInsertPage )
@@ -379,4 +373,20 @@ Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames(
 
 }
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_sd_SlideLayoutController_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                              ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::SlideLayoutController(context, ".uno:AssignLayout", false));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_sd_InsertSlideController_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                              ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::SlideLayoutController(context, ".uno:InsertPage", true));
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index eb4c353a3746..493834c6e5ab 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -53,27 +53,6 @@ public:
     ResourceContainer (void) {}
 };
 
-//----- Service ---------------------------------------------------------------
-
-Reference<XInterface> SAL_CALL Configuration_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    (void)rxContext;
-    return Reference<XInterface>(static_cast<XWeak*>(new Configuration(NULL,false)));
-}
-
-OUString Configuration_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.configuration.Configuration");
-}
-
-Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.Configuration");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== Configuration =========================================================
 
 Configuration::Configuration (
@@ -337,4 +316,15 @@ bool AreConfigurationsEquivalent (
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation(
+        ::com::sun::star::uno::XComponentContext*,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::Configuration(NULL, false));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index f2ec304e48d3..e0744a417f32 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -44,25 +44,6 @@ using ::sd::framework::FrameworkHelper;
 
 namespace sd { namespace framework {
 
-Reference<XInterface> SAL_CALL ConfigurationController_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    (void)rxContext;
-    return static_cast<XWeak*>(new ConfigurationController());
-}
-
-OUString ConfigurationController_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.configuration.ConfigurationController");
-}
-
-Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.ConfigurationController");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //----- ConfigurationController::Implementation -------------------------------
 
 class ConfigurationController::Implementation
@@ -588,4 +569,14 @@ ConfigurationController::Implementation::~Implementation (void)
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation(
+        ::com::sun::star::uno::XComponentContext*,
+        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::ConfigurationController());
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index d862a53a75f0..623f4a500162 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -43,25 +43,6 @@ using namespace ::com::sun::star::drawing::framework;
 
 namespace sd { namespace framework {
 
-Reference<XInterface> SAL_CALL ResourceId_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    (void)rxContext;
-    return Reference<XInterface>(static_cast<XWeak*>(new ::sd::framework::ResourceId()));
-}
-
-OUString ResourceId_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.ResourceId");
-}
-
-Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.ResourceId");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== ResourceId ============================================================
 
 WeakReference<util::XURLTransformer> ResourceId::mxURLTransformerWeak;
@@ -520,4 +501,14 @@ void ResourceId::ParseResourceURL (void)
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_ResourceID_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                                               ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::ResourceId());
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index cf622b716f37..e0e30c7971ae 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -84,24 +84,6 @@ public:
     PaneContainer (void) {}
 };
 
-Reference<XInterface> SAL_CALL BasicPaneFactory_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new BasicPaneFactory(rxContext)));
-}
-
-OUString BasicPaneFactory_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.BasicPaneFactory");
-}
-
-Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.BasicPaneFactory");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== PaneFactory ===========================================================
 
 BasicPaneFactory::BasicPaneFactory (
@@ -457,4 +439,13 @@ void BasicPaneFactory::ThrowIfDisposed (void) const
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                     ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::BasicPaneFactory(context));
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 692fe6e1c64a..2ac67314ff7a 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -34,24 +34,6 @@ using namespace ::com::sun::star::drawing::framework;
 
 namespace sd { namespace framework {
 
-Reference<XInterface> SAL_CALL BasicToolBarFactory_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return static_cast<XWeak*>(new BasicToolBarFactory(rxContext));
-}
-
-OUString BasicToolBarFactory_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.BasicToolBarFactory");
-}
-
-Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    const OUString sServiceName("com.sun.star.drawing.framework.BasicToolBarFactory");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== BasicToolBarFactory ===================================================
 
 BasicToolBarFactory::BasicToolBarFactory (
@@ -191,4 +173,12 @@ void BasicToolBarFactory::ThrowIfDisposed (void) const
 
 } } // end of namespace sd::framework
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::BasicToolBarFactory(context));
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 2558510e6817..10fe98d14b2d 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -52,24 +52,6 @@ using ::sd::framework::FrameworkHelper;
 
 namespace sd { namespace framework {
 
-Reference<XInterface> SAL_CALL BasicViewFactory_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new BasicViewFactory(rxContext)));
-}
-
-OUString BasicViewFactory_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.BasicViewFactory");
-}
-
-Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.BasicViewFactory");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== ViewDescriptor ========================================================
 
 class BasicViewFactory::ViewDescriptor
@@ -550,4 +532,14 @@ void BasicViewFactory::ActivateCenterView (
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                     ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::BasicViewFactory(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 36269d28adc9..dfe9bf2a0cc0 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -87,26 +87,6 @@ private:
 
 } // end of anonymous namespace.
 
-//===== PresentationFactoryProvider service ===================================
-
-Reference<XInterface> SAL_CALL PresentationFactoryProvider_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new PresentationFactoryProvider(rxContext)));
-}
-
-OUString PresentationFactoryProvider_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.PresentationFactoryProvider");
-}
-
-Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.PresentationFactoryProvider");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== PresentationFactory ===================================================
 
 const OUString PresentationFactory::msPresentationViewURL("private:resource/view/Presentation");
@@ -250,4 +230,14 @@ void SAL_CALL PresentationFactoryProvider::initialize(
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                    ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::framework::PresentationFactoryProvider(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 2275b06b576f..a742fb38f13b 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -58,25 +58,6 @@ public:
     LoadedFactoryContainer (void) {}
 };
 
-Reference<XInterface> SAL_CALL ModuleController_createInstance (
-    const Reference<XComponentContext>& rxContext)
-        throw (css::uno::Exception, std::exception)
-{
-    return Reference<XInterface>(ModuleController::CreateInstance(rxContext), UNO_QUERY);
-}
-
-OUString ModuleController_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.framework.module.ModuleController");
-}
-
-Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.framework.ModuleController");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== ModuleController ======================================================
 Reference<XModuleController> ModuleController::CreateInstance (
     const Reference<XComponentContext>& rxContext)
@@ -281,4 +262,16 @@ void SAL_CALL ModuleController::initialize (const Sequence<Any>& aArguments)
 
 } } // end of namespace sd::framework
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+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) );
+    xModCont->acquire();
+    return xModCont.get();
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/facreg.hxx b/sd/source/ui/inc/facreg.hxx
index 2995e99042aa..2300af29bf2e 100644
--- a/sd/source/ui/inc/facreg.hxx
+++ b/sd/source/ui/inc/facreg.hxx
@@ -35,152 +35,13 @@ 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 );
 
-css::uno::Reference< css::uno::XInterface > SAL_CALL SdHtmlOptionsDialog_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
-OUString SdHtmlOptionsDialog_getImplementationName() throw( css::uno::RuntimeException );
-css::uno::Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames() throw( css::uno::RuntimeException );
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL SdUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
-OUString SdUnoModule_getImplementationName() throw( css::uno::RuntimeException );
-css::uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( css::uno::RuntimeException );
 
 namespace sd
 {
-css::uno::Reference< css::uno::XInterface > SAL_CALL RandomNode_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
-OUString RandomNode__getImplementationName() throw( css::uno::RuntimeException );
-css::uno::Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( css::uno::RuntimeException );
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL SlideLayoutController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
-OUString SlideLayoutController_getImplementationName() throw( css::uno::RuntimeException );
-css::uno::Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( css::uno::RuntimeException );
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL InsertSlideController_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxFactory );
 OUString InsertSlideController_getImplementationName() throw( css::uno::RuntimeException );
 css::uno::Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( css::uno::RuntimeException );
 }
 
-namespace sd { namespace framework {
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL Configuration_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString Configuration_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL Configuration_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ConfigurationController_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString ConfigurationController_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL ConfigurationController_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ModuleController_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception, std::exception);
-OUString ModuleController_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL BasicPaneFactory_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString BasicPaneFactory_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL BasicPaneFactory_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL BasicToolBarFactory_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString BasicToolBarFactory_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL BasicToolBarFactory_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL BasicViewFactory_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString BasicViewFactory_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL BasicViewFactory_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL ResourceId_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString ResourceId_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL ResourceId_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL PresentationFactoryProvider_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString PresentationFactoryProvider_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL PresentationFactoryProvider_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-} }
-
-namespace sd { namespace sidebar {
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL PanelFactory_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString PanelFactory_getImplementationName(void) throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-} }
-
-namespace sd { namespace presenter {
-css::uno::Reference<css::uno::XInterface> SAL_CALL SlideRenderer_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString SlideRenderer_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterCanvas_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString PresenterCanvas_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterTextViewService_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString PresenterTextViewService_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterHelperService_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString PresenterHelperService_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL PresenterPreviewCache_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString PresenterPreviewCache_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-} }
-
-namespace sd { namespace slidesorter {
-css::uno::Reference<css::uno::XInterface> SAL_CALL SlideSorterService_createInstance(
-    const css::uno::Reference<css::uno::XComponentContext>& rxContext)
-    throw(css::uno::Exception);
-OUString SlideSorterService_getImplementationName(void)
-    throw (css::uno::RuntimeException);
-css::uno::Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
-    throw (css::uno::RuntimeException);
-} }
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 7b33475eb6ab..8407ee0de734 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -40,27 +40,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sd { namespace presenter {
 
-//===== Service ===============================================================
-
-Reference<XInterface> SAL_CALL PresenterCanvas_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    (void)rxContext;
-    return Reference<XInterface>(static_cast<XWeak*>(new PresenterCanvas()));
-}
-
-OUString PresenterCanvas_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.PresenterCanvasFactory");
-}
-
-Sequence<OUString> SAL_CALL PresenterCanvas_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.rendering.Canvas");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== PresenterCustomSprite =================================================
 
 /** Wrapper around a sprite that is displayed on a PresenterCanvas.
@@ -985,4 +964,14 @@ void PresenterCustomSprite::ThrowIfDisposed (void)
 
 } } // end of namespace ::sd::presenter
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                                                 ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::presenter::PresenterCanvas());
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 7083b69207ae..fa55eee8f5fa 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -42,27 +42,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sd { namespace presenter {
 
-//===== Service ===============================================================
-
-Reference<XInterface> SAL_CALL PresenterHelperService_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new PresenterHelper(rxContext)));
-}
-
-OUString PresenterHelperService_getImplementationName (void)
-    throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.PresenterHelper");
-}
-
-Sequence<OUString> SAL_CALL PresenterHelperService_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.PresenterHelper");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== PresenterHelper =======================================================
 
 PresenterHelper::PresenterHelper (
@@ -481,4 +460,14 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative (
 
 } } // end of namespace ::sd::presenter
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterHelper_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                          ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::presenter::PresenterHelper(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index da47d90f993f..22bdfa96930e 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -70,26 +70,6 @@ private:
     void CallListeners (const sal_Int32 nSlideIndex);
 };
 
-//===== Service ===============================================================
-
-Reference<XInterface> SAL_CALL PresenterPreviewCache_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new PresenterPreviewCache(rxContext)));
-}
-
-OUString PresenterPreviewCache_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.PresenterPreviewCache");
-}
-
-Sequence<OUString> SAL_CALL PresenterPreviewCache_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.PresenterPreviewCache");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== PresenterPreviewCache =================================================
 
 PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext>& rxContext)
@@ -395,4 +375,14 @@ void PresenterPreviewCache::PresenterCacheContext::CallListeners (
 
 } } // end of namespace ::sd::presenter
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::presenter::PresenterPreviewCache(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 817ad55dc44e..fbcd9cd68313 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -50,25 +50,6 @@ using namespace ::com::sun::star::lang;
 
 namespace sd { namespace presenter {
 
-// Service
-Reference<XInterface> SAL_CALL PresenterTextViewService_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new PresenterTextView(rxContext)));
-}
-
-OUString PresenterTextViewService_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.PresenterTextView");
-}
-
-Sequence<OUString> SAL_CALL PresenterTextViewService_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.PresenterTextView");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 // PresenterTextView::Implementation
 class PresenterTextView::Implementation
 {
@@ -538,4 +519,14 @@ void PresenterTextView::Implementation::CheckTop (void)
 
 } } // end of namespace ::sd::presenter
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_PresenterTextView_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                            ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::presenter::PresenterTextView(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index 1e6da4b1b9b0..eb0b5f8161e5 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -31,26 +31,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sd { namespace presenter {
 
-//===== Service ===============================================================
-
-Reference<XInterface> SAL_CALL SlideRenderer_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new SlideRenderer(rxContext)));
-}
-
-OUString SlideRenderer_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.SlideRenderer");
-}
-
-Sequence<OUString> SAL_CALL SlideRenderer_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.SlideRenderer");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== SlideRenderer ==========================================================
 
 SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext)
@@ -210,4 +190,14 @@ void SlideRenderer::ThrowIfDisposed (void)
 
 } } // end of namespace ::sd::presenter
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_SlideRenderer_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::presenter::SlideRenderer(context));
+}
+
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 3bff21b0b05a..03dbddaa1c49 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -61,26 +61,6 @@ namespace {
 
 Reference<lang::XEventListener> mxControllerDisposeListener;
 
-// ----- Service functions ----------------------------------------------------
-
-Reference<XInterface> SAL_CALL PanelFactory_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<XWeak*>(new PanelFactory(rxContext)));
-}
-
-::rtl::OUString PanelFactory_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("org.openoffice.comp.Draw.framework.PanelFactory");
-}
-
-Sequence<rtl::OUString> SAL_CALL PanelFactory_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const ::rtl::OUString sServiceName("com.sun.star.drawing.framework.PanelFactory");
-    return Sequence<rtl::OUString>(&sServiceName, 1);
-}
-
 //----- PanelFactory --------------------------------------------------------
 
 PanelFactory::PanelFactory(
@@ -176,4 +156,12 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
 
 } } // end of namespace sd::sidebar
 
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+org_openoffice_comp_Draw_framework_PanelFactory_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                                   ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::sidebar::PanelFactory(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index d167e1a3f533..a595bf1c8bcb 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -53,26 +53,6 @@ namespace {
     };
 }
 
-//===== Service ===============================================================
-
-Reference<XInterface> SAL_CALL SlideSorterService_createInstance (
-    const Reference<XComponentContext>& rxContext) throw (css::uno::Exception)
-{
-    return Reference<XInterface>(static_cast<drawing::XDrawView*>(new SlideSorterService(rxContext)));
-}
-
-OUString SlideSorterService_getImplementationName (void) throw(RuntimeException)
-{
-    return OUString("com.sun.star.comp.Draw.SlideSorter");
-}
-
-Sequence<OUString> SAL_CALL SlideSorterService_getSupportedServiceNames (void)
-    throw (RuntimeException)
-{
-    static const OUString sServiceName("com.sun.star.drawing.SlideSorter");
-    return Sequence<OUString>(&sServiceName, 1);
-}
-
 //===== SlideSorterService ==========================================================
 
 SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxContext)
@@ -490,6 +470,15 @@ void SlideSorterService::ThrowIfDisposed (void)
     }
 }
 
-} } // end of namespace ::sd::presenter
+} } // end of namespace ::sd::slidesorter
+
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_SlideSorter_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                      ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::slidesorter::SlideSorterService(context));
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index cae322031701..014ab4c23366 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -34,10 +34,6 @@
 using namespace com::sun::star;
 
 using namespace ::sd;
-using namespace ::sd::framework;
-using namespace ::sd::presenter;
-using namespace ::sd::slidesorter;
-using namespace ::sd::sidebar;
 
 // Declaration and initialization of a map from service names to locally
 // unique factory identifiers.
@@ -46,27 +42,8 @@ enum FactoryId
 {
     SdDrawingDocumentFactoryId,
     SdPresentationDocumentFactoryId,
-    SdHtmlOptionsDialogFactoryId,
-    SdUnoModuleFactoryId,
-    RandomNodeFactoryId,
 
-    ConfigurationFactoryId,
-    ConfigurationControllerFactoryId,
     ModuleControllerFactoryId,
-    BasicPaneFactoryFactoryId,
-    BasicToolBarFactoryFactoryId,
-    BasicViewFactoryFactoryId,
-    PanelFactoryFactoryId,
-    ResourceIdFactoryId,
-    PresentationFactoryProviderFactoryId,
-    SlideRendererFactoryId,
-    PresenterCanvasFactoryId,
-    PresenterTextViewServiceFactoryId,
-    PresenterHelperServiceFactoryId,
-    PresenterPreviewCacheFactoryId,
-    SlideSorterServiceFactoryId,
-    SlideLayoutControllerFactoryId,
-    InsertSlideControllerFactoryId,
 };
 typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap;
 
@@ -79,26 +56,6 @@ static ::boost::shared_ptr<FactoryMap> spFactoryMap;
         spFactoryMap.reset(new FactoryMap);
         (*spFactoryMap)[SdDrawingDocument_getImplementationName()] = SdDrawingDocumentFactoryId;
         (*spFactoryMap)[SdPresentationDocument_getImplementationName()] = SdPresentationDocumentFactoryId;
-        (*spFactoryMap)[SdHtmlOptionsDialog_getImplementationName()] = SdHtmlOptionsDialogFactoryId;
-        (*spFactoryMap)[SdUnoModule_getImplementationName()] = SdUnoModuleFactoryId;
-        (*spFactoryMap)[RandomNode__getImplementationName()] = RandomNodeFactoryId;
-        (*spFactoryMap)[Configuration_getImplementationName()] = ConfigurationFactoryId;
-        (*spFactoryMap)[ConfigurationController_getImplementationName()] = ConfigurationControllerFactoryId;
-        (*spFactoryMap)[ModuleController_getImplementationName()] = ModuleControllerFactoryId;
-        (*spFactoryMap)[BasicPaneFactory_getImplementationName()] = BasicPaneFactoryFactoryId;
-        (*spFactoryMap)[BasicToolBarFactory_getImplementationName()] = BasicToolBarFactoryFactoryId;
-        (*spFactoryMap)[BasicViewFactory_getImplementationName()] = BasicViewFactoryFactoryId;
-        (*spFactoryMap)[sidebar::PanelFactory_getImplementationName()] = PanelFactoryFactoryId;
-        (*spFactoryMap)[ResourceId_getImplementationName()] = ResourceIdFactoryId;
-        (*spFactoryMap)[PresentationFactoryProvider_getImplementationName()] = PresentationFactoryProviderFactoryId;
-        (*spFactoryMap)[SlideRenderer_getImplementationName()] = SlideRendererFactoryId;
-        (*spFactoryMap)[PresenterCanvas_getImplementationName()] = PresenterCanvasFactoryId;
-        (*spFactoryMap)[PresenterTextViewService_getImplementationName()] = PresenterTextViewServiceFactoryId;
-        (*spFactoryMap)[PresenterHelperService_getImplementationName()] = PresenterHelperServiceFactoryId;
-        (*spFactoryMap)[PresenterPreviewCache_getImplementationName()] = PresenterPreviewCacheFactoryId;
-        (*spFactoryMap)[SlideSorterService_getImplementationName()] = SlideSorterServiceFactoryId;
-        (*spFactoryMap)[SlideLayoutController_getImplementationName()] = SlideLayoutControllerFactoryId;
-        (*spFactoryMap)[InsertSlideController_getImplementationName()] = InsertSlideControllerFactoryId;
     }
     return spFactoryMap;
 };
@@ -128,14 +85,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory(
         {
             switch (iFactory->second)
             {
-                case SdHtmlOptionsDialogFactoryId:
-                    xFactory = ::cppu::createSingleFactory(
-                        xMSF,
-                        SdHtmlOptionsDialog_getImplementationName(),
-                        SdHtmlOptionsDialog_CreateInstance,
-                        SdHtmlOptionsDialog_getSupportedServiceNames());
-                    break;
-
                 case SdDrawingDocumentFactoryId:
                     xFactory = ::sfx2::createSfxModelFactory(
                         xMSF,
@@ -152,141 +101,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory(
                         SdPresentationDocument_getSupportedServiceNames());
                     break;
 
-                case SdUnoModuleFactoryId:
-                    xFactory = ::cppu::createSingleFactory(
-                        xMSF,
-                        SdUnoModule_getImplementationName(),
-                        SdUnoModule_createInstance,
-                        SdUnoModule_getSupportedServiceNames());
-                    break;
-
-                case RandomNodeFactoryId:
-                    xFactory = ::cppu::createSingleFactory(
-                        xMSF,
-                        sd::RandomNode__getImplementationName(),
-                        sd::RandomNode_createInstance,
-                        sd::RandomNode_getSupportedServiceNames());
-                    break;
-
-                case ConfigurationFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::Configuration_createInstance,
-                        sd::framework::Configuration_getImplementationName(),
-                        sd::framework::Configuration_getSupportedServiceNames());
-                    break;
-
-                case ConfigurationControllerFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::ConfigurationController_createInstance,
-                        sd::framework::ConfigurationController_getImplementationName(),
-                        sd::framework::ConfigurationController_getSupportedServiceNames());
-                    break;
-
-                case ModuleControllerFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::ModuleController_createInstance,
-                        sd::framework::ModuleController_getImplementationName(),
-                        sd::framework::ModuleController_getSupportedServiceNames());
-                    break;
-
-                case BasicPaneFactoryFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::BasicPaneFactory_createInstance,
-                        sd::framework::BasicPaneFactory_getImplementationName(),
-                        sd::framework::BasicPaneFactory_getSupportedServiceNames());
-                    break;
-
-                case BasicToolBarFactoryFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::BasicToolBarFactory_createInstance,
-                        sd::framework::BasicToolBarFactory_getImplementationName(),
-                        sd::framework::BasicToolBarFactory_getSupportedServiceNames());
-                    break;
-
-                case BasicViewFactoryFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::BasicViewFactory_createInstance,
-                        sd::framework::BasicViewFactory_getImplementationName(),
-                        sd::framework::BasicViewFactory_getSupportedServiceNames());
-                    break;
-
-                case PanelFactoryFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::sidebar::PanelFactory_createInstance,
-                        sd::sidebar::PanelFactory_getImplementationName(),
-                        sd::sidebar::PanelFactory_getSupportedServiceNames());
-                    break;
-
-                case ResourceIdFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::ResourceId_createInstance,
-                        sd::framework::ResourceId_getImplementationName(),
-                        sd::framework::ResourceId_getSupportedServiceNames());
-                    break;
-
-                case PresentationFactoryProviderFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::framework::PresentationFactoryProvider_createInstance,
-                        sd::framework::PresentationFactoryProvider_getImplementationName(),
-                        sd::framework::PresentationFactoryProvider_getSupportedServiceNames());
-                    break;
-
-                case SlideRendererFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::presenter::SlideRenderer_createInstance,
-                        sd::presenter::SlideRenderer_getImplementationName(),
-                        sd::presenter::SlideRenderer_getSupportedServiceNames());
-                    break;
-
-                case PresenterCanvasFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::presenter::PresenterCanvas_createInstance,
-                        sd::presenter::PresenterCanvas_getImplementationName(),
-                        sd::presenter::PresenterCanvas_getSupportedServiceNames());
-                    break;
-
-                case PresenterTextViewServiceFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::presenter::PresenterTextViewService_createInstance,
-                        sd::presenter::PresenterTextViewService_getImplementationName(),
-                        sd::presenter::PresenterTextViewService_getSupportedServiceNames());
-                    break;
-
-                case PresenterHelperServiceFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::presenter::PresenterHelperService_createInstance,
-                        sd::presenter::PresenterHelperService_getImplementationName(),
-                        sd::presenter::PresenterHelperService_getSupportedServiceNames());
-                    break;
-
-                case PresenterPreviewCacheFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::presenter::PresenterPreviewCache_createInstance,
-                        sd::presenter::PresenterPreviewCache_getImplementationName(),
-                        sd::presenter::PresenterPreviewCache_getSupportedServiceNames());
-                    break;
-
-                case SlideSorterServiceFactoryId:
-                    xComponentFactory = ::cppu::createSingleComponentFactory(
-                        sd::slidesorter::SlideSorterService_createInstance,
-                        sd::slidesorter::SlideSorterService_getImplementationName(),
-                        sd::slidesorter::SlideSorterService_getSupportedServiceNames());
-                    break;
-
-                case SlideLayoutControllerFactoryId:
-                    xFactory = ::cppu::createSingleFactory(
-                        xMSF,
-                        sd::SlideLayoutController_getImplementationName(),
-                        sd::SlideLayoutController_createInstance,
-                        sd::SlideLayoutController_getSupportedServiceNames());
-                    break;
-
-                case InsertSlideControllerFactoryId:
-                    xFactory = ::cppu::createSingleFactory(
-                        xMSF,
-                        sd::InsertSlideController_getImplementationName(),
-                        sd::InsertSlideController_createInstance,
-                        sd::InsertSlideController_getSupportedServiceNames());
                 default:
                     break;
             }
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 9c0285e9f2c3..c9647c0408d6 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -159,25 +159,6 @@ Reference< XInterface > RandomAnimationNode_createInstance( sal_Int16 nPresetCla
     return xInt;
 }
 
-Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMultiServiceFactory > &  )
-{
-    Reference< XInterface > xInt( static_cast<XWeak*>( new RandomAnimationNode() ) );
-    return xInt;
-}
-
-OUString RandomNode__getImplementationName() throw( RuntimeException )
-{
-    return OUString( "sd::RandomAnimationNode" ) ;
-}
-
-Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( RuntimeException )
-{
-    Sequence< OUString > aSeq( 2 );
-    aSeq[0] = "com.sun.star.animations.ParallelTimeContainer";
-    aSeq[1] = "com.sun.star.comp.sd.RandomAnimationNode";
-    return aSeq;
-}
-
 RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode )
 :   RandomAnimationNodeBase(),
     mnPresetClass( rNode.mnPresetClass ),
@@ -568,7 +549,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Ref
 // XServiceInfo
 OUString RandomAnimationNode::getImplementationName() throw(std::exception)
 {
-    return RandomNode__getImplementationName();
+    return OUString( "sd::RandomAnimationNode" ) ;
 }
 
 // XServiceInfo
@@ -580,9 +561,20 @@ sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw
 // XServiceInfo
 Sequence< OUString > RandomAnimationNode::getSupportedServiceNames(void) throw(std::exception)
 {
-    return RandomNode_getSupportedServiceNames();
+    Sequence< OUString > aSeq( 2 );
+    aSeq[0] = "com.sun.star.animations.ParallelTimeContainer";
+    aSeq[1] = "com.sun.star.comp.sd.RandomAnimationNode";
+    return aSeq;
+}
+
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_embed_MSOLEObjectSystemCreator_get_implementation(::com::sun::star::uno::XComponentContext*,
+                                                                    ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new sd::RandomAnimationNode());
 }
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index b62456ea3d8c..57c87e9407f8 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -33,25 +33,6 @@
 
 using namespace ::com::sun::star;
 
-OUString SAL_CALL SdUnoModule_getImplementationName() throw( uno::RuntimeException )
-{
-    return OUString( "com.sun.star.comp.Draw.DrawingModule" );
-}
-
-uno::Sequence< OUString > SAL_CALL SdUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
-{
-    uno::Sequence< OUString > aSeq( 1 );
-    aSeq[0] = "com.sun.star.drawing.ModuleDispatcher";
-    return aSeq;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance(
-                const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
-{
-    SolarMutexGuard aGuard;
-    return uno::Reference< uno::XInterface >( static_cast< cppu::OWeakObject* >( new SdUnoModule( rSMgr ) ) );
-}
-
     // XNotifyingDispatch
 void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener )
     throw (uno::RuntimeException, std::exception)
@@ -132,7 +113,7 @@ uno::Reference< frame::XDispatch > SAL_CALL SdUnoModule::queryDispatch( const ut
 // XServiceInfo
 OUString SAL_CALL SdUnoModule::getImplementationName(  ) throw(uno::RuntimeException, std::exception)
 {
-    return SdUnoModule_getImplementationName();
+    return OUString( "com.sun.star.comp.Draw.DrawingModule" );
 }
 
 sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) throw(uno::RuntimeException, std::exception)
@@ -142,7 +123,21 @@ sal_Bool SAL_CALL SdUnoModule::supportsService( const OUString& sServiceName ) t
 
 uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames(  ) throw(uno::RuntimeException, std::exception)
 {
-    return SdUnoModule_getSupportedServiceNames();
+    uno::Sequence< OUString > aSeq( 1 );
+    aSeq[0] = "com.sun.star.drawing.ModuleDispatcher";
+    return aSeq;
+}
+
+
+extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
+com_sun_star_comp_Draw_DrawingModule_get_implementation(::com::sun::star::uno::XComponentContext* context,
+                                                        ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+{
+    SolarMutexGuard aGuard;
+
+    uno::Reference< lang::XMultiServiceFactory> xSM(context->getServiceManager(), uno::UNO_QUERY_THROW);
+    return cppu::acquire(new SdUnoModule(xSM));
 }
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/util/sd.component b/sd/util/sd.component
index 6b9987b594e3..ab85d55ccce9 100644
--- a/sd/util/sd.component
+++ b/sd/util/sd.component
@@ -23,68 +23,88 @@
     <service name="com.sun.star.drawing.DrawingDocument"/>
     <service name="com.sun.star.drawing.DrawingDocumentFactory"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.DrawingModule">
+  <implementation name="com.sun.star.comp.Draw.DrawingModule"
+      constructor="com_sun_star_comp_Draw_DrawingModule_get_implementation">
     <service name="com.sun.star.drawing.ModuleDispatcher"/>
   </implementation>
   <implementation name="com.sun.star.comp.Draw.PresentationDocument">
     <service name="com.sun.star.drawing.DrawingDocumentFactory"/>
     <service name="com.sun.star.presentation.PresentationDocument"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.PresenterCanvasFactory">
+  <implementation name="com.sun.star.comp.Draw.PresenterCanvasFactory"
+      constructor="com_sun_star_comp_Draw_PresenterCanvasFactory_get_implementation">
     <service name="com.sun.star.rendering.Canvas"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.PresenterHelper">
+  <implementation name="com.sun.star.comp.Draw.PresenterHelper"
+      constructor="com_sun_star_comp_Draw_PresenterHelper_get_implementation">
     <service name="com.sun.star.drawing.PresenterHelper"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.PresenterPreviewCache">
+  <implementation name="com.sun.star.comp.Draw.PresenterPreviewCache"
+      constructor="com_sun_star_comp_Draw_PresenterPreviewCache_get_implementation">
     <service name="com.sun.star.drawing.PresenterPreviewCache"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.PresenterTextView">
+  <implementation name="com.sun.star.comp.Draw.PresenterTextView"
+      constructor="com_sun_star_comp_Draw_PresenterTextView_get_implementation">
     <service name="com.sun.star.drawing.PresenterTextView"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.SlideRenderer">
+  <implementation name="com.sun.star.comp.Draw.SlideRenderer"
+      constructor="com_sun_star_comp_Draw_SlideRenderer_get_implementation">
     <service name="com.sun.star.drawing.SlideRenderer"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.SlideSorter">
+  <implementation name="com.sun.star.comp.Draw.SlideSorter"
+      constructor="com_sun_star_comp_Draw_SlideSorter_get_implementation">
     <service name="com.sun.star.drawing.SlideSorter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.BasicPaneFactory">
+  <implementation name="com.sun.star.comp.Draw.framework.BasicPaneFactory"
+      constructor="com_sun_star_comp_Draw_framework_BasicPaneFactory_get_implementation">
     <service name="com.sun.star.drawing.framework.BasicPaneFactory"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.BasicToolBarFactory">
+  <implementation name="com.sun.star.comp.Draw.framework.BasicToolBarFactory"
+      constructor="com_sun_star_comp_Draw_framework_BasicToolBarFactory_get_implementation">
     <service name="com.sun.star.drawing.framework.BasicToolBarFactory"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.BasicViewFactory">
+  <implementation name="com.sun.star.comp.Draw.framework.BasicViewFactory"
+      constructor="com_sun_star_comp_Draw_framework_BasicViewFactory_get_implementation">
     <service name="com.sun.star.drawing.framework.BasicViewFactory"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.PresentationFactoryProvider">
+  <implementation name="com.sun.star.comp.Draw.framework.PresentationFactoryProvider"
+      constructor="com_sun_star_comp_Draw_framework_PresentationFactoryProvider_get_implementation">
     <service name="com.sun.star.drawing.framework.PresentationFactoryProvider"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.ResourceId">
+  <implementation name="com.sun.star.comp.Draw.framework.ResourceId"
+      constructor="com_sun_star_comp_Draw_framework_ResourceID_get_implementation">
     <service name="com.sun.star.drawing.framework.ResourceId"/>
   </implementation>
-  <implementation name="org.openoffice.comp.Draw.framework.PanelFactory">
+  <implementation name="org.openoffice.comp.Draw.framework.PanelFactory"
+      constructor="org_openoffice_comp_Draw_framework_PanelFactory_get_implementation">
     <service name="com.sun.star.drawing.framework.PanelFactory"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.configuration.Configuration">
+  <implementation name="com.sun.star.comp.Draw.framework.configuration.Configuration"
+      constructor="com_sun_star_comp_Draw_framework_configuration_Configuration_get_implementation">
     <service name="com.sun.star.drawing.framework.Configuration"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.configuration.ConfigurationController">
+  <implementation name="com.sun.star.comp.Draw.framework.configuration.ConfigurationController"
+      constructor="com_sun_star_comp_Draw_framework_configuration_ConfigurationController_get_implementation">
     <service name="com.sun.star.drawing.framework.ConfigurationController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.Draw.framework.module.ModuleController">
+  <implementation name="com.sun.star.comp.Draw.framework.module.ModuleController"
+      constructor="com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation">
     <service name="com.sun.star.drawing.framework.ModuleController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.draw.SdHtmlOptionsDialog">
+  <implementation name="com.sun.star.comp.draw.SdHtmlOptionsDialog"
+      constructor="com_sun_star_comp_draw_SdHtmlOptionsDialog_get_implementation">
     <service name="com.sun.star.ui.dialog.FilterOptionsDialog"/>
   </implementation>
-  <implementation name="com.sun.star.comp.sd.InsertSlideController">
+  <implementation name="com.sun.star.comp.sd.InsertSlideController"
+      constructor="com_sun_star_comp_sd_InsertSlideController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.sd.SlideLayoutController">
+  <implementation name="com.sun.star.comp.sd.SlideLayoutController"
+      constructor="com_sun_star_comp_sd_SlideLayoutController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
   </implementation>
-  <implementation name="sd::RandomAnimationNode">
+  <implementation name="sd::RandomAnimationNode"
+      constructor="RandomAnimationNode_get_implementation">
     <service name="com.sun.star.comp.sd.RandomAnimationNode"/>
   </implementation>
 </component>