[Libreoffice-commits] .: dbaccess/source dbaccess/util reportdesign/source reportdesign/util
Matus Kukan
mkukan at kemper.freedesktop.org
Wed Jul 13 09:05:28 PDT 2011
dbaccess/source/core/misc/services.cxx | 2 +-
dbaccess/source/ext/adabas/Aservices.cxx | 2 +-
dbaccess/source/ext/adabas/adabasui.component | 2 +-
dbaccess/source/ext/adabas/adabasui.dxp | 2 --
dbaccess/source/ext/adabas/exports.dxp | 1 -
dbaccess/source/ext/macromigration/dbmm.component | 2 +-
dbaccess/source/ext/macromigration/dbmm_services.cxx | 7 ++++++-
dbaccess/source/filter/xml/dbaxml.component | 2 +-
dbaccess/source/filter/xml/xmlservices.cxx | 2 +-
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 2 +-
dbaccess/source/ui/misc/uiservices.cxx | 2 +-
dbaccess/util/dba.component | 2 +-
dbaccess/util/dbu.component | 2 +-
dbaccess/util/sdbt.component | 2 +-
reportdesign/source/core/api/services.cxx | 2 +-
reportdesign/source/filter/xml/xmlservices.cxx | 2 +-
reportdesign/source/ui/misc/rptuiservices.cxx | 2 +-
reportdesign/util/rpt.component | 2 +-
reportdesign/util/rptui.component | 2 +-
reportdesign/util/rptxml.component | 2 +-
20 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit d5012632cc0f5a53dcd4788ea58871100d8218aa
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Jul 13 17:56:47 2011 +0200
Add prefixes for component_getFactory methods
Also remove accidentally kept .dxp files from gnumake'd module
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index e68b525..d0b90e1 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 5af5a4b..51940d9 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 e547a0c..e9a79b1 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 4f567f9..0000000
--- 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 7003307..0000000
--- 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 a74e945..cb91044 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 b93ac54..3999493 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 23b3a5c..86816c9 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 83bc7c7..d309551 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 9c726f8..34d9fa1 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 120b2d8..f9e001a 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 b25768d..5b5155a 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 ce0dc45..e5260ed 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 0038c0c..9c0dec3 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 dfceea3..f957b28 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 5b71639..ca19969 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 d005870..803d0d4 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 ef5b2cc..20fc9d1 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 593f06d..e4d61aa 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 8a0021e..ccc4486 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"/>
More information about the Libreoffice-commits
mailing list