summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2011-07-13 17:56:47 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2011-07-13 17:56:47 +0200
commitc8d7891600b6920723ee10696cbf43bb7fea3edb (patch)
tree7decb265b72fdb644d63c10700f18cb446520a8e /reportdesign
parent22d4188f575ae5ad3b149e55b3b3131b51393933 (diff)
Add prefixes for component_getFactory methods
Also remove accidentally kept .dxp files from gnumake'd module
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/services.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlservices.cxx2
-rw-r--r--reportdesign/source/ui/misc/rptuiservices.cxx2
-rw-r--r--reportdesign/util/rpt.component2
-rw-r--r--reportdesign/util/rptui.component2
-rw-r--r--reportdesign/util/rptxml.component2
6 files changed, 6 insertions, 6 deletions
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
index e3f1348ae724..20c7ceb3b139 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 e30c82e606b3..ffb09734b46a 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 9cd07bdc2123..920fec4e3087 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 ef5b2cc4c78d..20fc9d19cf98 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 593f06d0b582..e4d61aaca0f9 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 8a0021ecdf9a..ccc4486b100f 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"/>