resyncing to master

7 files changed, 17 insertions, 18 deletions

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 0e1fe61e816a..f716cf2afa59 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -31,7 +31,11 @@ $(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))
 
 $(eval $(call gb_Library_set_include,unordf,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,unordf,\
+	udkapi \
+	offapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,unordf,\
@@ -54,5 +58,7 @@ $(eval $(call gb_Library_add_exception_objects,unordf,\
     unoxml/source/rdf/librdf_services \
 ))
 
+    $$(REDLAND_CFLAGS) \
+    $$(LIBXML_CFLAGS) \
 # vim: set noet sw=4 ts=4:
 
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 3303e5df6cf7..b51253a44036 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -31,9 +31,13 @@ $(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml))
 
 $(eval $(call gb_Library_set_include,unoxml,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
+))
+
+$(eval $(call gb_Library_add_api,unoxml,\
+	udkapi \
+	offapi \
 $(eval $(call gb_Library_add_linked_libs,unoxml,\
     ucbhelper \
     sax \
diff --git a/unoxml/prj/build.lst b/unoxml/prj/build.lst
index 02f0482d76f8..97aed0f47b94 100644
--- a/unoxml/prj/build.lst
+++ b/unoxml/prj/build.lst
@@ -1,2 +1,2 @@
-ux	unoxml	:	offuh cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
+ux	unoxml	:	offapi cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
 ux	unoxml\prj    nmake	-	all ux_prj NULL
diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx
index 03b2b1e39eec..d1ff568a2369 100644
--- a/unoxml/source/rdf/librdf_services.cxx
+++ b/unoxml/source/rdf/librdf_services.cxx
@@ -39,12 +39,6 @@ using namespace ::com::sun::star;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName,
-    uno_Environment ** /* ppEnvironment */)
-{
-    *o_ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 static ::cppu::ImplementationEntry const entries[] = {
     { &comp_CBlankNode::_create,
       &comp_CBlankNode::_getImplementationName,
@@ -65,7 +59,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..f9c024f7392a 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -55,12 +55,7 @@ using namespace ::com::sun::star::registry;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL 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"/>