libmerged: add more libraries

Change-Id: Ia35e93b9632cb2bbfce0d40f8491044d56f2bb05

Library_merged.mk

@@ -34,19 +34,17 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	cppu \
 	cppuhelper \
 	i18nisolang1 \
-    i18nutil \
     jvmfwk \
 	sal \
 	salhelper \
-	sax \
 	tl \
 	ucbhelper \
-	utl \
 	xmlreader \
 	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,merged,\
+	icui18n \
 	icule \
 	icuuc \
 	jpeg \
@@ -118,6 +116,7 @@ $(eval $(call gb_Library_use_externals,merged,\
 	carbon \
 	cocoa \
 	corefoundation \
+	coreservices \
 	quicktime \
 ))
 endif
@@ -164,4 +163,11 @@ $(eval $(call gb_Library_use_externals,merged,\
 ))
 endif
 
+ifeq ($(ENABLE_LIBLANGTAG),YES)
+$(eval $(call gb_Library_use_externals,merged,\
+	glib \
+	liblangtag \
+))
+endif
+
 # vim: set noet sw=4 ts=4:

android/experimental/DocumentLoader/Makefile

@@ -68,8 +68,6 @@ copy-stuff:
 		   gcc3_uno \
 		   hwplo \
 		   i18nisolang1gcc3 \
-		   i18npool.uno \
-		   i18nutilgcc3 \
 		   icudatalo \
 		   icui18nlo \
 		   iculelo \
@@ -82,7 +80,6 @@ copy-stuff:
 		   jvmfwk \
 		   libotouchlo \
 		   lo-bootstrap \
-		   localebe1.uno \
 		   localedata_en \
 		   localedata_others \
 		   lwpftlo \
@@ -92,7 +89,6 @@ copy-stuff:
 		   ooxlo \
 		   reflection.uno \
 		   reg \
-		   saxlo \
 		   sclo \
 		   scdlo \
 		   scfiltlo \
@@ -115,7 +111,6 @@ copy-stuff:
 		   uno_cppuhelpergcc3 \
 		   unordflo \
 		   unoxmllo \
-		   utllo \
 		   vbahelperlo \
 		   vbaswobj.uno \
 		   wpftdrawlo \

android/experimental/LibreOffice4Android/Makefile

@@ -42,8 +42,6 @@ copy-stuff:
 		   hwplo \
 		   hyphenlo \
 		   i18nisolang1gcc3 \
-		   i18npool.uno \
-		   i18nutilgcc3 \
 		   icudatalo \
 		   icui18nlo \
 		   iculelo \
@@ -57,7 +55,6 @@ copy-stuff:
 		   libotouchlo \
 		   lnthlo \
 		   lo-bootstrap \
-		   localebe1.uno \
 		   localedata_en \
 		   localedata_es \
 		   localedata_euro \
@@ -69,7 +66,6 @@ copy-stuff:
 		   ooxlo \
 		   reflection.uno \
 		   reg \
-		   saxlo \
 		   sclo \
 		   sclo \
 		   scdlo \
@@ -96,7 +92,6 @@ copy-stuff:
 		   uno_cppuhelpergcc3 \
 		   unordflo \
 		   unoxmllo \
-		   utllo \
 		   vbahelperlo \
 		   vbaswobj.uno \
 		   wpftdrawlo \

android/qa/desktop/Makefile

@@ -103,8 +103,6 @@ copy-stuff: buildrcs
 		  gcc3_uno \
 		  hyphenlo \
 		  i18nisolang1gcc3 \
-		  i18npool.uno \
-		  i18nutilgcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  iculelo \
@@ -114,7 +112,6 @@ copy-stuff: buildrcs
 		  libotouchlo \
 		  introspection.uno \
 		  lnthlo \
-		  localebe1.uno \
 		  localedata_en \
 		  localedata_es \
 		  localedata_euro \
@@ -124,7 +121,6 @@ copy-stuff: buildrcs
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  saxlo \
 		  spelllo \
 		  stocservices.uno \
 		  store \
@@ -138,7 +134,6 @@ copy-stuff: buildrcs
 		  unordflo \
 		  unotest \
 		  unoxmllo \
-		  utllo \
 		  vbahelperlo \
 		  xml2 \
 		  xmlreader \

android/qa/sc/Makefile

@@ -72,8 +72,6 @@ copy-stuff:
 		  frmlo \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
-		  i18npool.uno \
-		  i18nutilgcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  iculelo \
@@ -90,7 +88,6 @@ copy-stuff:
 		  ooxlo \
 		  reflection.uno \
 		  reg \
-		  saxlo \
 		  sclo \
 		  scfiltlo \
 		  stocservices.uno \
@@ -106,7 +103,6 @@ copy-stuff:
 		  unoexceptionprotector \
 		  unotest \
 		  unoxmllo \
-		  utllo \
 		  vbahelperlo \
 		  xml2 \
 		  xmlreader \

android/qa/simple/Makefile

@@ -66,12 +66,12 @@ copy-stuff:
 		  comphelpgcc3 \
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
-		  i18nutilgcc3 \
 		  icudatalo \
 		  icui18nlo \
 		  icuuclo \
 		  localedata_en \
 		  localedata_others \
+		  mergedlo \
 		  reg \
 		  store \
 		  ucbhelper4gcc3 \
@@ -82,7 +82,7 @@ copy-stuff:
 		  xml2 \
 		  xmlreader \
 		  bootstrap.uno \
-		  i18npool.uno); do \
+		  ); do \
 	    $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \
 	done
 #

shell/source/backends/desktopbe/desktopbackend.cxx

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

shell/source/backends/desktopbe/desktopbe1.component

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

shell/source/backends/localebe/localebe1.component

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

shell/source/backends/localebe/localebecdef.cxx

@@ -59,7 +59,8 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName,
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory(
+    const sal_Char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
 

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -34,6 +34,7 @@ gb_MERGEDLIBS := \
 	configmgr \
 	cppcanvas \
 	deploymentmisc \
+	desktopbe1 \
 	drawinglayer \
 	editeng \
 	filterconfig \
@@ -41,8 +42,12 @@ gb_MERGEDLIBS := \
 	fwe \
 	fwi \
 	fwk \
+	i18npool \
+	i18nutil \
 	lng \
+	localebe1 \
 	package2 \
+	sax \
 	sb \
 	sfx \
 	sofficeapp \
@@ -55,6 +60,7 @@ gb_MERGEDLIBS := \
 	tk \
 	ucb1 \
 	ucpfile1 \
+	utl \
 	uui \
 	vcl \
 	xmlscript \