[Libreoffice-commits] .: unoxml/source

[Michael Meeks]

 unoxml/source/rdf/librdf_services.cxx  |    4 ++--
 unoxml/source/rdf/unordf.component     |    2 +-
 unoxml/source/service/services.cxx     |    4 ++--
 unoxml/source/service/unoxml.component |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 219388c356f855b023d3b765eb0561650aa56c91
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Fri Jun 24 14:55:37 2011 +0100

    update component factory methods to use new prefixes, to add lib merging

diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx
index b005b27..95571a3 100644
--- a/unoxml/source/rdf/librdf_services.cxx
+++ b/unoxml/source/rdf/librdf_services.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName,
+SAL_DLLPUBLIC_EXPORT void SAL_CALL unordf_component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName,
     uno_Environment ** /* ppEnvironment */)
 {
     *o_ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -65,7 +65,7 @@ static ::cppu::ImplementationEntry const entries[] = {
     { 0, 0, 0, 0, 0, 0 }
 };
 
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL unordf_component_getFactory(
     const char * implName, void * serviceManager, void * registryKey)
 {
     return ::cppu::component_getFactoryHelper(
diff --git a/unoxml/source/rdf/unordf.component b/unoxml/source/rdf/unordf.component
index a828e7b..12a01ca 100644
--- a/unoxml/source/rdf/unordf.component
+++ b/unoxml/source/rdf/unordf.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="unordf"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="CBlankNode">
     <service name="com.sun.star.rdf.BlankNode"/>
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index 14560e1..29e95a5 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -55,12 +55,12 @@ using namespace ::com::sun::star::registry;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */)
+SAL_DLLPUBLIC_EXPORT void SAL_CALL unoxml_component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */)
 {
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL unoxml_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
 {
     void* pReturn = NULL ;
     if  ( pImplementationName && pServiceManager )
diff --git a/unoxml/source/service/unoxml.component b/unoxml/source/service/unoxml.component
index d8c907e..889a755 100644
--- a/unoxml/source/service/unoxml.component
+++ b/unoxml/source/service/unoxml.component
@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="unoxml"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.xml.dom.DocumentBuilder">
     <service name="com.sun.star.xml.dom.DocumentBuilder"/>