diff options
| author | Matus Kukan <matus.kukan@gmail.com> | 2011-06-24 14:55:37 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-06-24 14:55:37 +0100 |
| commit | 1ef868489e324c66ef54549a12d91ebd39dd7488 (patch) | |
| tree | 82e5264071d3b43170f0222badb88f5573f97caf /unoxml | |
| parent | eddbb9c7d6ee5caa3302145cedf81df044d85ef4 (diff) | |
update component factory methods to use new prefixes, to add lib merging
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/rdf/librdf_services.cxx | 4 | ||||
| -rw-r--r-- | unoxml/source/rdf/unordf.component | 2 | ||||
| -rw-r--r-- | unoxml/source/service/services.cxx | 4 | ||||
| -rw-r--r-- | unoxml/source/service/unoxml.component | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx index 03b2b1e39eec..5ef77122e749 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 a828e7b05d47..12a01ca6cf8c 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 b81c363931fa..8801e8044e87 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 d8c907e6475b..889a755e22c5 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"/> |