resyncing to master

6 files changed, 11 insertions, 20 deletions

diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx
index eb83f464b473..dbe21ca8c9f4 100644
--- a/dbaccess/source/ext/adabas/Aservices.cxx
+++ b/dbaccess/source/ext/adabas/Aservices.cxx
@@ -57,22 +57,13 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui()
 }
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment **
-            )
-{
-    createRegistryInfo_adabasui();
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL adabasui_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)
 {
+    createRegistryInfo_adabasui();
+
     Reference< XInterface > xRet;
     if (pServiceManager && pImplementationName)
     {
diff --git a/dbaccess/source/ext/adabas/adabasui.component b/dbaccess/source/ext/adabas/adabasui.component
index e547a0cffd4e..e9a79b1d59c1 100644
--- a/dbaccess/source/ext/adabas/adabasui.component
+++ b/dbaccess/source/ext/adabas/adabasui.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="adabasui"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="org.openoffice.comp.adabasui.AdabasCreateDialog">
     <service name="com.sun.star.sdb.AdabasCreationDialog"/>
diff --git a/dbaccess/source/ext/adabas/adabasui.dxp b/dbaccess/source/ext/adabas/adabasui.dxp
deleted file mode 100644
index 926e49f5f1a5..000000000000
--- a/dbaccess/source/ext/adabas/adabasui.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
-
diff --git a/dbaccess/source/ext/adabas/exports.dxp b/dbaccess/source/ext/adabas/exports.dxp
deleted file mode 100644
index f0e1c69934bc..000000000000
--- a/dbaccess/source/ext/adabas/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/dbaccess/source/ext/macromigration/dbmm.component b/dbaccess/source/ext/macromigration/dbmm.component
index a74e94510aeb..cb91044f5ee6 100644
--- a/dbaccess/source/ext/macromigration/dbmm.component
+++ b/dbaccess/source/ext/macromigration/dbmm.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbmm"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.macromigration.MacroMigrationDialogService">
     <service name="com.sun.star.sdb.application.MacroMigrationWizard"/>
diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index 5d595c63c7bc..c88c6de887d4 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -49,6 +49,11 @@ namespace dbmm
 } // namespace dbmm
 //........................................................................
 
-IMPLEMENT_COMPONENT_LIBRARY_API( ::dbmm::MacroMigrationModule, ::dbmm::initializeModule )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbmm_component_getFactory(
+    const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
+{
+    ::dbmm::initializeModule();
+    return ::dbmm::MacroMigrationModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey );
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */