Add prefixes for component_getFactory methods

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

20 files changed, 23 insertions, 21 deletions

diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index e68b525a1..d0b90e172 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/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)
diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx
index 5af5a4b15..51940d9e0 100644
--- a/dbaccess/source/ext/adabas/Aservices.cxx
+++ b/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*/)
diff --git a/dbaccess/source/ext/adabas/adabasui.component b/dbaccess/source/ext/adabas/adabasui.component
index e547a0cff..e9a79b1d5 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 4f567f9b2..000000000
--- a/dbaccess/source/ext/adabas/adabasui.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory
-
diff --git a/dbaccess/source/ext/adabas/exports.dxp b/dbaccess/source/ext/adabas/exports.dxp
deleted file mode 100644
index 700330789..000000000
--- a/dbaccess/source/ext/adabas/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/dbaccess/source/ext/macromigration/dbmm.component b/dbaccess/source/ext/macromigration/dbmm.component
index a74e94510..cb91044f5 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 b93ac5431..3999493ad 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: */
diff --git a/dbaccess/source/filter/xml/dbaxml.component b/dbaccess/source/filter/xml/dbaxml.component
index 23b3a5c1a..86816c9f2 100644
--- a/dbaccess/source/filter/xml/dbaxml.component
+++ b/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"/>
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 83bc7c7fa..d3095514f 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/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*/)
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 9c726f8f9..34d9fa1de 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/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*/)
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index 120b2d890..f9e001a1c 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/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*/)
diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component
index b25768dbf..5b5155a6c 100644
--- a/dbaccess/util/dba.component
+++ b/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"/>
diff --git a/dbaccess/util/dbu.component b/dbaccess/util/dbu.component
index ce0dc45cf..e5260ed16 100644
--- a/dbaccess/util/dbu.component
+++ b/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"/>
diff --git a/dbaccess/util/sdbt.component b/dbaccess/util/sdbt.component
index 0038c0cad..9c0dec304 100644
--- a/dbaccess/util/sdbt.component
+++ b/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"/>
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
index dfceea340..f957b2890 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/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(
diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx
index 5b7163969..ca1996916 100644
--- a/reportdesign/source/filter/xml/xmlservices.cxx
+++ b/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(
diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx
index d005870f9..803d0d436 100644
--- a/reportdesign/source/ui/misc/rptuiservices.cxx
+++ b/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(
diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component
index ef5b2cc4c..20fc9d19c 100644
--- a/reportdesign/util/rpt.component
+++ b/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"/>
diff --git a/reportdesign/util/rptui.component b/reportdesign/util/rptui.component
index 593f06d0b..e4d61aaca 100644
--- a/reportdesign/util/rptui.component
+++ b/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"/>
diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component
index 8a0021ecd..ccc4486b1 100644
--- a/reportdesign/util/rptxml.component
+++ b/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"/>