add configmgr, ucb1, ucpfile1, xcr to libmerged

Library_merged.mk

@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	ucbhelper \
 	utl \
 	vcl \
-	xcr \
+	xmlreader \
 	$(gb_STDLIBS) \
 ))
 

android/qa/desktop/Makefile

@@ -111,7 +111,6 @@ copy-stuff: buildrcs
 		  bootstrap.uno \
 		  canvastoolslo \
 		  comphelpgcc3 \
-		  configmgr.uno \
 		  cppcanvaslo \
 		  drawinglayerlo \
 		  expwrap.uno \
@@ -152,9 +151,7 @@ copy-stuff: buildrcs
 		  svllo \
 		  test \
 		  tllo \
-		  ucb1 \
 		  ucbhelper4gcc3 \
-		  ucpfile1 \
 		  uno_cppu \
 		  uno_cppuhelpergcc3 \
 		  uno_sal \

android/qa/sc/Makefile

@@ -58,7 +58,6 @@ copy-stuff:
 		  basegfxlo \
 		  bootstrap.uno \
 		  comphelpgcc3 \
-		  configmgr.uno \
 		  datelo \
 		  expwrap.uno \
 		  fastsax.uno \
@@ -98,9 +97,7 @@ copy-stuff:
 		  textinstream.uno \
 		  test \
 		  tllo \
-		  ucb1 \
 		  ucbhelper4gcc3 \
-		  ucpfile1 \
 		  uno_cppu \
 		  uno_cppuhelpergcc3 \
 		  uno_sal \

configmgr/source/configmgr.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="configmgr"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.configuration.ConfigurationProvider">
     <service name="com.sun.star.configuration.ConfigurationProvider"/>

configmgr/source/services.cxx

@@ -87,7 +87,7 @@ static cppu::ImplementationEntry const services[] = {
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL configmgr_component_getFactory(
     char const * pImplName, void * pServiceManager, void * pRegistryKey)
 {
     return cppu::component_getFactoryHelper(

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -31,6 +31,7 @@ ifeq ($(MERGELIBS),TRUE)
 gb_MERGEDLIBS := \
 	avmedia \
 	canvastools \
+	configmgr \
 	cppcanvas \
 	deploymentmisc \
 	drawinglayer \
@@ -51,7 +52,10 @@ gb_MERGEDLIBS := \
 	svx \
 	svxcore \
 	tk \
+	ucb1 \
+	ucpfile1 \
 	uui \
+	xcr \
 	xo \
 
 endif

ucb/source/core/ucb1.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucb"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.CommandEnvironment">
     <service name="com.sun.star.ucb.CommandEnvironment"/>

ucb/source/core/ucbserv.cxx

@@ -40,7 +40,7 @@ using ::rtl::OUString;
 
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
     void * pRet = 0;

ucb/source/ucp/file/prov.cxx

@@ -49,7 +49,7 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::container;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
     void * pRet = 0;

ucb/source/ucp/file/ucpfile1.component

@@ -26,7 +26,7 @@
 *
 **********************************************************************-->
 
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpfile"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.ucb.FileProvider">
     <service name="com.sun.star.ucb.FileContentProvider"/>