Add prefixes for component_getFactory methods

Also remove accidentally kept .dxp files from gnumake'd module

dbaccess/source/core/misc/services.cxx

@@ -96,7 +96,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBA()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* pRegistryKey)

dbaccess/source/ext/adabas/Aservices.cxx

@@ -57,7 +57,7 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui()
 }
 
 //---------------------------------------------------------------------------------------
-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*/)

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"/>

dbaccess/source/ext/adabas/adabasui.dxp

-component_getFactory
-

dbaccess/source/ext/adabas/exports.dxp

-component_getFactory

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"/>

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: */

dbaccess/source/filter/xml/dbaxml.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbaxml"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.sdb.DBExportFilter">
     <service name="com.sun.star.document.ExportFilter"/>

dbaccess/source/filter/xml/xmlservices.cxx

@@ -68,7 +68,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbaxml_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)

dbaccess/source/sdbtools/misc/sdbt_services.cxx

@@ -54,7 +54,7 @@ extern "C" void SAL_CALL sdbt_initializeModule()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbt_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)

dbaccess/source/ui/misc/uiservices.cxx

@@ -107,7 +107,7 @@ extern "C" void SAL_CALL createRegistryInfo_DBU()
 }
 
 //---------------------------------------------------------------------------------------
-extern "C"  SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
+extern "C"  SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbu_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
                     void* /*pRegistryKey*/)

dbaccess/util/dba.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dba"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.chart2.data.DatabaseDataProvider">
     <service name="com.sun.star.chart2.data.DatabaseDataProvider"/>

dbaccess/util/dbu.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="dbu"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.DatabaseInteractionHandler">
     <service name="com.sun.star.sdb.DatabaseInteractionHandler"/>

dbaccess/util/sdbt.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sdbt"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.dbaccess.ConnectionTools">
     <service name="com.sun.star.sdb.tools.ConnectionTools"/>

reportdesign/source/core/api/services.cxx

@@ -78,7 +78,7 @@ cppu::ImplementationEntry entries[] = {
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL rpt_component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(

reportdesign/source/filter/xml/xmlservices.cxx

@@ -81,7 +81,7 @@ cppu::ImplementationEntry entries[] = {
 };
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL rptxml_component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(

reportdesign/source/ui/misc/rptuiservices.cxx

@@ -69,7 +69,7 @@ cppu::ImplementationEntry entries[] = {
 };
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL rptui_component_getFactory(
     char const * implName, void * serviceManager, void * registryKey)
 {
     return cppu::component_getFactoryHelper(

reportdesign/util/rpt.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="rpt"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.report.OFixedLine">
     <service name="com.sun.star.report.FixedLine"/>

reportdesign/util/rptui.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="rptui"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.report.DataProviderHandler">
     <service name="com.sun.star.report.inspection.DataProviderHandler"/>

reportdesign/util/rptxml.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="rptxml"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter">
     <service name="com.sun.star.comp.document.ImportFilter"/>