summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Library_merged.mk12
-rw-r--r--android/experimental/DocumentLoader/Makefile5
-rw-r--r--android/experimental/LibreOffice4Android/Makefile5
-rw-r--r--android/qa/desktop/Makefile5
-rw-r--r--android/qa/sc/Makefile4
-rw-r--r--android/qa/simple/Makefile4
-rw-r--r--shell/source/backends/desktopbe/desktopbackend.cxx2
-rw-r--r--shell/source/backends/desktopbe/desktopbe1.component2
-rw-r--r--shell/source/backends/localebe/localebe1.component2
-rw-r--r--shell/source/backends/localebe/localebecdef.cxx3
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk6
11 files changed, 22 insertions, 28 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index b7935444c249..1a5b6c39c917 100644
--- a/Library_merged.mk
+++ b/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:
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 063bef237de8..9a8fb4413f64 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/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 \
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index baeabdfabf7f..a784f12728d8 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/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 \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 734cb56bab91..5e74d68626df 100644
--- a/android/qa/desktop/Makefile
+++ b/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 \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a455939407bd..3cc0a6404f83 100644
--- a/android/qa/sc/Makefile
+++ b/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 \
diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index fa97425c1104..2ce7bd3bc736 100644
--- a/android/qa/simple/Makefile
+++ b/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
#
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index e84e09639edd..8f05182c1b7f 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/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(
diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component
index 9ef142107698..9b1df73141db 100644
--- a/shell/source/backends/desktopbe/desktopbe1.component
+++ b/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"/>
diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component
index 7236a6198281..83913822a022 100644
--- a/shell/source/backends/localebe/localebe1.component
+++ b/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"/>
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index ee7b1edd73af..b10d7919d811 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/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) {
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 1c4519c0c85b..3fe296b609a6 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/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 \
generated by cgit (git 2.34.1) at 2025-02-01 15:56:11 +0000