Rebased ref, commits from common ancestor:
commit 9d93cdd32cf037de6cb34172c0eeb4f43adf81ad
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu May 27 12:15:53 2021 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu May 27 13:19:08 2021 +0200
catchall
Change-Id: If8dcf7646ee57669fec3ab0c222d09782a79ca2c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5e2310e57487..e7f9e08e4f29 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1498,7 +1498,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
)
else
$(call gb_LinkTarget_add_libs,$(1),\
+ $(if $(DISABLE_DYNLOADING), \
+ $(call
gb_UnpackedTarball_get_dir,icu)/source/lib/libicudata$(gb_ICU_suffix)$(gb_StaticLibrary_PLAINEXT),
\
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib
-licudata$(gb_ICU_suffix) \
+ ) \
)
endif
@@ -1513,7 +1516,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
)
else
$(call gb_LinkTarget_add_libs,$(1),\
+ $(if $(DISABLE_DYNLOADING), \
+ $(call
gb_UnpackedTarball_get_dir,icu)/source/lib/libicui18n$(gb_ICU_suffix)$(gb_StaticLibrary_PLAINEXT),
\
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib
-licui18n$(gb_ICU_suffix) \
+ ) \
)
endif
@@ -1528,7 +1534,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
)
else
$(call gb_LinkTarget_add_libs,$(1),\
+ $(if $(DISABLE_DYNLOADING), \
+ $(call
gb_UnpackedTarball_get_dir,icu)/source/lib/libicuuc$(gb_ICU_suffix)$(gb_StaticLibrary_PLAINEXT),
\
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib
-licuuc$(gb_ICU_suffix) \
+ ) \
)
endif
@@ -3102,7 +3111,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call
gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT)
\
$(call
gb_UnpackedTarball_get_dir,postgresql)/src/common/libpgcommon$(gb_StaticLibrary_PLAINEXT)
\
$(call
gb_UnpackedTarball_get_dir,postgresql)/src/port/libpgport$(gb_StaticLibrary_PLAINEXT)
\
- $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
+ $(if $(and $(DISABLE_DYNLOADING),$(WITH_GSSAPI)),$(GSSAPI_LIBS)) \
)
endif # !WNT
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index d9ca2aaf93c3..9aaedfd66ee8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -50,7 +50,9 @@ endif
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
android \
+ $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
animations \
+ ) \
apple_remote \
avmedia \
$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index db85a2844328..6eeb13ec7e87 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_Library_set_include,avmedia,\
-I$(SRCDIR)/avmedia/source/inc \
))
+$(eval $(call gb_Library_use_externals,avmedia,\
+ boost_headers \
+))
+
$(eval $(call gb_Library_use_libraries,avmedia,\
sal \
svl \
@@ -39,7 +43,6 @@ $(eval $(call gb_Library_add_defs,avmedia,\
$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
$(eval $(call gb_Library_use_externals,avmedia,\
- boost_headers \
epoxy \
))
diff --git a/configure.ac b/configure.ac
index 77d4b20696ce..dbf7a0238745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1118,6 +1118,7 @@ haiku*)
emscripten)
build_gstreamer_1_0=no
+ enable_compiler_plugins=no
enable_lpsolve=no
enable_report_builder=no
enable_xmlhelp=no
@@ -2495,6 +2496,7 @@ AC_ARG_WITH(locales,
Very experimental and might well break stuff.
Just a desperate measure to shrink code and data size.
By default all the locales available is included.
+ Just works with --disable-dynloading. Defaults to "all".
This option is completely unrelated to --with-lang.])
[
Affects also our character encoding conversion
@@ -2911,10 +2913,12 @@ dnl "desktop" one but a "mobile" one, we are always
cross-compiling.
dnl Note the direction of the implication; there is no assumption that
dnl cross-compiling would imply a non-desktop OS.
-if test $_os != iOS -a $_os != Android -a $_os != Emscripten -a
"$enable_fuzzers" != "yes"; then
+if test $_os != iOS -a $_os != Android -a "$enable_fuzzers" != "yes"; then
BUILD_TYPE="$BUILD_TYPE DESKTOP"
AC_DEFINE(HAVE_FEATURE_DESKTOP)
- AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
+ if test "$_os" = Emscripten; then
+ AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
+ fi
fi
# explicitly doesn't include enable_gtk3=no and enable_qt5=yes, so it should
@@ -2934,7 +2938,6 @@ if test "$enable_wasm_strip" = "yes"; then
enable_extension_update=no
enable_gio=no
enable_gpgmepp=no
- enable_gstreamer_1_0=no
enable_ldap=no
enable_lpsolve=no
enable_nss=no
@@ -2948,9 +2951,15 @@ if test "$enable_wasm_strip" = "yes"; then
enable_sdremote_bluetooth=no
enable_skia=no
enable_xmlhelp=no
+ enable_zxing=no
+ test_libepubgen=no
+# with_system_libxml=no
+ with_galleries=no
+ with_webdav=no
with_x=no
test "${with_fonts+set}" = set || with_fonts=yes
+ test "${with_locales+set}" = set || with_locales=en
AC_DEFINE(HAVE_FEATURE_WASM_STRIP)
fi
@@ -2958,6 +2967,9 @@ fi
ENABLE_SERVICES_RDB_FROM_BUILD=
if test "$enable_services_rdb_from_build" = yes; then
ENABLE_SERVICES_RDB_FROM_BUILD=TRUE
+ if test -n "$with_locales" -a "$with_locales" != en -a "$with_locales" !=
all; then
+ AC_MSG_ERROR([Currently just --with-locales=all or en is supported
with --enable-services-rdb-from-build])
+ fi
fi
AC_SUBST(ENABLE_SERVICES_RDB_FROM_BUILD)
@@ -2972,16 +2984,7 @@ fi
# Decide whether to build database connectivity stuff (including
# Base) or not. We probably don't want to on non-desktop OSes.
-if test -z "$enable_database_connectivity"; then
- # --disable-database-connectivity is unfinished work in progress
- # and the iOS test app doesn't link if we actually try to use it.
- # if test $_os != iOS -a $_os != Android; then
- if test $_os != iOS; then
- enable_database_connectivity=yes
- fi
-fi
-
-if test "$enable_database_connectivity" = yes; then
+if test "$enable_database_connectivity" != no; then
BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY"
AC_DEFINE(HAVE_FEATURE_DBCONNECTIVITY)
else
@@ -5525,6 +5528,7 @@ if test "$cross_compiling" = "yes"; then
--enable-icecream="$enable_icecream" \
--without-doxygen \
--without-webdav \
+ --without-x \
--with-parallelism="$with_parallelism" \
--with-theme="$with_theme" \
--with-tls=openssl \
@@ -9495,10 +9499,11 @@ else
SYSTEM_LIBXSLT=
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
fi
-AC_SUBST(SYSTEM_LIBXSLT)
if test -z "$SYSTEM_LIBXSLT_FOR_BUILD"; then
SYSTEM_LIBXSLT_FOR_BUILD="$SYSTEM_LIBXSLT"
fi
+
+AC_SUBST(SYSTEM_LIBXSLT)
AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD)
AC_SUBST(LIBEXSLT_CFLAGS)
@@ -13706,7 +13711,7 @@ if test -d "$SRC_ROOT/translations/source"; then
fi
AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
-if test -n "$with_locales"; then
+if test -n "$with_locales" -a "$with_locales" != all; then
WITH_LOCALES="$with_locales"
just_langs="`echo $WITH_LOCALES | sed -e 's/_[A-Z]*//g'`"
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 9e4d1df1d96d..c7a60027533d 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -98,11 +98,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix)
sb.append("\"/>\n</svg>");
return sb.toString();
}
-#endif
OString GenerateQRCode(const OUString& aQRText, tools::Long aQRECC, int
aQRBorder)
{
-#if ENABLE_ZXING
// Associated ZXing error correction levels (0-8) to our constants
arbitrarily.
int bqrEcc = 1;
@@ -137,14 +135,10 @@ OString GenerateQRCode(const OUString& aQRText,
tools::Long aQRECC, int aQRBorde
writer.setEncoding(ZXing::CharacterSet::UTF8);
ZXing::BitMatrix bitmatrix =
writer.encode(ZXing::TextUtfEncoding::FromUtf8(QRText), 0, 0);
return ConvertToSVGFormat(bitmatrix);
-#else
- (void)aQRText;
- (void)aQRECC;
- (void)aQRBorder;
- return OString();
-#endif
-}
}
+#endif
+
+} // anonymous namespace
QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, Reference<XModel>
xModel,
bool bEditExisting)
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 854b920bd9a4..09293b0856f0 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -9,7 +9,11 @@
$(eval $(call gb_Library_Library,i18npool))
+ifeq ($(WITH_LOCALES),en)
+$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool.en))
+else
$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool))
+endif
$(eval $(call gb_Library_set_include,i18npool,\
$$(INCLUDE) \
diff --git a/i18npool/util/i18npool.en.component
b/i18npool/util/i18npool.en.component
new file mode 100644
index 000000000000..edf2d0a63727
--- /dev/null
+++ b/i18npool/util/i18npool.en.component
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ prefix="i18npool" xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.i18n.BreakIterator"
+ constructor="com_sun_star_i18n_BreakIterator_get_implementation">
+ <service name="com.sun.star.i18n.BreakIterator"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.BreakIterator_Unicode"
+ constructor="com_sun_star_i18n_BreakIterator_Unicode_get_implementation">
+ <service name="com.sun.star.i18n.BreakIterator_Unicode"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.CalendarImpl"
+ constructor="i18npool_CalendarImpl_get_implementation">
+ <service name="com.sun.star.i18n.LocaleCalendar"/>
+ <service name="com.sun.star.i18n.LocaleCalendar2"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_ROC"
+ constructor="i18npool_Calendar_ROC_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_ROC"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_dangi"
+ constructor="i18npool_Calendar_dangi_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_dangi"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_buddhist"
+ constructor="i18npool_Calendar_buddhist_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_buddhist"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_gengou"
+ constructor="i18npool_Calendar_gengou_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_gengou"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_gregorian"
+ constructor="i18npool_Calendar_gregorian_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_gregorian"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_hanja"
+ constructor="i18npool_Calendar_hanja_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_hanja"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_hanja_yoil"
+ constructor="i18npool_Calendar_hanja_yoil_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_hanja_yoil"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_hijri"
+ constructor="i18npool_Calendar_hijri_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_hijri"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Calendar_jewish"
+ constructor="i18npool_Calendar_jewish_get_implementation">
+ <service name="com.sun.star.i18n.Calendar_jewish"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.ChapterCollator"
+ constructor="i18npool_ChapterCollator_get_implementation">
+ <service name="com.sun.star.i18n.ChapterCollator"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.CharacterClassification"
+
constructor="com_sun_star_i18n_CharacterClassification_get_implementation">
+ <service name="com.sun.star.i18n.CharacterClassification"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.CharacterClassification_Unicode"
+
constructor="com_sun_star_i18n_CharacterClassification_Unicode_get_implementation">
+ <service name="com.sun.star.i18n.CharacterClassification_Unicode"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Collator"
+ constructor="com_sun_star_i18n_Collator_get_implementation">
+ <service name="com.sun.star.i18n.Collator"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Collator_Unicode"
+ constructor="i18npool_Collator_Unicode_get_implementation">
+ <service name="com.sun.star.i18n.Collator_Unicode"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.IndexEntrySupplier"
+ constructor="i18npool_IndexEntrySupplier_get_implementation">
+ <service name="com.sun.star.i18n.IndexEntrySupplier"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.IndexEntrySupplier_Unicode"
+ constructor="i18npool_IndexEntrySupplier_Unicode_get_implementation">
+ <service name="com.sun.star.i18n.IndexEntrySupplier_Unicode"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.IndexEntrySupplier_asian"
+ constructor="i18npool_IndexEntrySupplier_asian_get_implementation">
+ <service name="com.sun.star.i18n.IndexEntrySupplier_asian"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.InputSequenceChecker"
+ constructor="com_sun_star_i18n_InputSequenceChecker_get_implementation">
+ <service name="com.sun.star.i18n.InputSequenceChecker"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.LocaleDataImpl"
+ constructor="com_sun_star_i18n_LocaleDataImpl_get_implementation">
+ <service name="com.sun.star.i18n.LocaleData"/>
+ <service name="com.sun.star.i18n.LocaleData2"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.NativeNumberSupplier"
+ constructor="com_sun_star_i18n_NativeNumberSupplier_get_implementation">
+ <service name="com.sun.star.i18n.NativeNumberSupplier"/>
+ <service name="com.sun.star.i18n.NativeNumberSupplier2"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.NumberFormatCodeMapper"
+
constructor="com_sun_star_i18n_NumberFormatCodeMapper_get_implementation">
+ <service name="com.sun.star.i18n.NumberFormatMapper"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.OrdinalSuffix"
+ constructor="com_sun_star_i18n_OrdinalSuffix_get_implementation">
+ <service name="com.sun.star.i18n.OrdinalSuffix"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.ScriptTypeDetector"
+ constructor="com_sun_star_i18n_ScriptTypeDetector_get_implementation">
+ <service name="com.sun.star.i18n.ScriptTypeDetector"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.TextConversion"
+ constructor="com_sun_star_i18n_TextConversion_get_implementation">
+ <service name="com.sun.star.i18n.TextConversion"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration"
+ constructor="com_sun_star_i18n_Transliteration_get_implementation">
+ <service name="com.sun.star.i18n.Transliteration"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration.NumToCharFullwidth">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration.NumToCharHalfwidth">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation
name="com.sun.star.i18n.Transliteration.NumToTextCircledNumber">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration.SENTENCE_CASE">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration.TITLE_CASE">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration.TOGGLE_CASE">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation name="com.sun.star.i18n.Transliteration.UPPERCASE_LOWERCASE">
+ <service name="com.sun.star.i18n.Transliteration.l10n"/>
+ </implementation>
+ <implementation name="com.sun.star.text.DefaultNumberingProvider"
+
constructor="com_sun_star_text_DefaultNumberingProvider_get_implementation">
+ <service name="com.sun.star.text.DefaultNumberingProvider"/>
+ </implementation>
+</component>
diff --git a/postprocess/CustomTarget_components.mk
b/postprocess/CustomTarget_components.mk
index a53e23b86525..c6bea411f7f9 100644
--- a/postprocess/CustomTarget_components.mk
+++ b/postprocess/CustomTarget_components.mk
@@ -35,6 +35,8 @@ $(postprocess_WORKDIR)/services_constructors.list: \
$(call gb_Helper_abbreviate_dirs,$(call
gb_ExternalExecutable_get_command,python) $^) > $$TEMPFILE && \
$(call gb_Helper_replace_if_different_and_touch,$${TEMPFILE},$@)
+.PHONY: $(postprocess_WORKDIR)/services_componentfiles.list
+
endif
# vim: set noet sw=4:
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 6abc03354911..f0f348580d2d 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1344,9 +1344,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const
SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
rBind.Invalidate( SID_EDITDOC );
- const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
-
#ifndef ENABLE_WASM_STRIP_PINGUSER
+ const auto t0 =
std::chrono::system_clock::now().time_since_epoch();
bool bIsUITest = false; //uitest.uicheck fails when the dialog
is open
for( sal_uInt16 i = 0; i <
Application::GetCommandLineParamCount(); i++ )
{
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 65e3625e18be..3e9de22a6fa1 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -19,7 +19,10 @@
$(eval $(call gb_Library_Library,svxcore))
-$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
+$(eval $(call gb_Library_set_componentfiles,svxcore, \
+ svx/util/svxcore \
+ $(if
$(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),,svx/util/svxcore.draw) \
+))
$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index b36a8d71bcb4..f30bd2c41b4b 100644
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -18,10 +18,6 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.Draw.GraphicExporter"
- constructor="com_sun_star_comp_Draw_GraphicExporter_get_implementation">
- <service name="com.sun.star.drawing.GraphicExportFilter"/>
- </implementation>
<implementation name="com.sun.star.comp.svx.ExtrusionDepthController"
constructor="com_sun_star_comp_svx_ExtrusionDepthController_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>
diff --git a/svx/util/svxcore.draw.component b/svx/util/svxcore.draw.component
new file mode 100644
index 000000000000..2225141b3bd4
--- /dev/null
+++ b/svx/util/svxcore.draw.component
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.comp.Draw.GraphicExporter"
+ constructor="com_sun_star_comp_Draw_GraphicExporter_get_implementation">
+ <service name="com.sun.star.drawing.GraphicExportFilter"/>
+ </implementation>
+</component>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ca00813c5af5..658688383daf 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -548,6 +548,32 @@ vcl_headless_freetype_code=\
vcl/unx/generic/print/prtsetup \
vcl/unx/generic/print/text_gfx \
+gb_vcl_extended_cups_check = $(if $(and $(USING_X11),$(ENABLE_CUPS)),$(1),$(2))
+
+define gb_vcl_use_headless_and_freetype_code_direct
+
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+ $(call gb_vcl_extended_cups_check, \
+ vcl/unx/generic/printer/cupsmgr \
+ vcl/unx/generic/printer/printerinfomanager \
+ , \
+ vcl/null/printerinfomanager \
+ ) \
+ $(vcl_headless_code) \
+ $(vcl_headless_freetype_code) \
+ ) \
+))
+
+$(eval $(call gb_Library_use_externals,vcl,\
+ cairo \
+ $(call gb_vcl_extended_cups_check,cups) \
+ $(if $(SYSTEM_FONTCONFIG),,expat) \
+ fontconfig \
+ freetype \
+))
+
+endef
+
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/unx/generic/window/screensaverinhibitor \
@@ -604,8 +630,8 @@ endif # !DISABLE_GUI
# * select headless code and corresponding libraries
#
gb_vcl_use_headless_and_freetype_code = \
- $(if $(or $(filter ANDROID
HAIKU,$(OS)),$(USING_X11),$(DISABLE_GUI)),$(1),$(2))
-gb_vcl_extended_cups_check = $(if $(and $(USING_X11),$(ENABLE_CUPS)),$(1),$(2))
+ $(if $(or $(filter ANDROID HAIKU,$(OS)),$(USING_X11),$(DISABLE_GUI), \
+ $(and $(DISABLE_DYNLOADING),$(call gb_not,$(DISABLE_GUI)))),$(1),$(2))
$(eval $(call gb_Library_add_exception_objects,vcl,\
$(if $(filter-out iOS ANDROID,$(OS)), \
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 700c6b87f645..3534a3925150 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -27,7 +27,11 @@
#include <fcntl.h>
#include <pthread.h>
#include <sys/time.h>
+#ifdef EMSCRIPTEN
+#include <poll.h>
+#else
#include <sys/poll.h>
+#endif
#include <sal/types.h>
#include <sal/log.hxx>
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index 06dbaf6c5f32..5464754bab56 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -19,10 +19,6 @@
#include <impglyphitem.hxx>
-#if (defined UNX && !defined MACOSX && !defined IOS)
-#include <unx/freetype_glyphcache.hxx>
-#endif
-
SalLayoutGlyphs::SalLayoutGlyphs() {}
SalLayoutGlyphs::~SalLayoutGlyphs() {}
diff --git a/writerperfect/Module_writerperfect.mk
b/writerperfect/Module_writerperfect.mk
index c24b0dd5bcc6..c09dc27b1bde 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -20,9 +20,11 @@
$(eval $(call gb_Module_Module,writerperfect))
$(eval $(call gb_Module_add_targets,writerperfect,\
+ $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
Library_wpftcalc \
Library_wpftdraw \
Library_wpftimpress \
+ ) \
Library_wpftwriter \
Library_writerperfect \
UIConfig_writerperfect \
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index f6b53023d42a..7486996d194b 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -19,12 +19,15 @@
$(eval $(call gb_Library_Library,xo))
-$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
-
-# WASM_CHART change
-ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
-$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo.extended))
-endif
+$(eval $(call gb_Library_set_componentfiles,xo, \
+ xmloff/util/xo \
+ $(if $(ENABLE_WASM_STRIP_CHART),,xmloff/util/xo.chart) \
+ $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+ xmloff/util/xo.draw \
+ xmloff/util/xo.impress \
+ xmloff/util/xo.writer \
+ ) \
+))
$(eval $(call
gb_Library_set_precompiled_header,xo,xmloff/inc/pch/precompiled_xo))
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 64381044efdd..9006332b9ec3 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -19,102 +19,6 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="XMLDrawContentExportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/>
- </implementation>
- <implementation name="XMLDrawExportOOO"
- constructor="com_sun_star_comp_Draw_XMLExporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLExporter"/>
- </implementation>
- <implementation name="XMLDrawExportOasis"
- constructor="com_sun_star_comp_Draw_XMLOasisExporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisExporter"/>
- </implementation>
- <implementation name="XMLDrawImportOasis"
- constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisImporter"/>
- </implementation>
- <implementation name="XMLDrawMetaExportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/>
- </implementation>
- <implementation name="XMLDrawSettingsExportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
- </implementation>
- <implementation name="XMLDrawStylesExportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisStylesExporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/>
- </implementation>
- <implementation name="XMLDrawingLayerExport"
-
constructor="com_sun_star_comp_DrawingLayer_XMLExporter_get_implementation">
- <service name="com.sun.star.comp.DrawingLayer.XMLExporter"/>
- </implementation>
- <implementation name="XMLImpressClipboardExport"
-
constructor="com_sun_star_comp_Impress_XMLClipboardExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLClipboardExporter"/>
- </implementation>
- <implementation name="XMLImpressContentExportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisContentExporter"/>
- </implementation>
- <implementation name="XMLDrawContentImportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisContentImporter"/>
- </implementation>
- <implementation name="XMLImpressContentImportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisContentImporter"/>
- </implementation>
- <implementation name="XMLImpressExportOOO"
- constructor="com_sun_star_comp_Impress_XMLExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLExporter"/>
- </implementation>
- <implementation name="XMLImpressExportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisExporter"/>
- </implementation>
- <implementation name="XMLImpressImportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisImporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisImporter"/>
- </implementation>
- <implementation name="XMLImpressMetaExportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/>
- </implementation>
- <implementation name="XMLDrawMetaImportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisMetaImporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisMetaImporter"/>
- </implementation>
- <implementation name="XMLImpressMetaImportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/>
- </implementation>
- <implementation name="XMLImpressSettingsExportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/>
- </implementation>
- <implementation name="XMLDrawSettingsImportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/>
- </implementation>
- <implementation name="XMLImpressSettingsImportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/>
- </implementation>
- <implementation name="XMLImpressStylesExportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/>
- </implementation>
- <implementation name="XMLImpressStylesImportOasis"
-
constructor="com_sun_star_comp_Impress_XMLOasisStylesImporter_get_implementation">
- <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/>
- </implementation>
- <implementation name="XMLDrawStylesImportOasis"
-
constructor="com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation">
- <service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/>
- </implementation>
<implementation name="XMLMetaExportComponent"
constructor="XMLMetaExportComponent_get_implementation">
<service name="com.sun.star.document.XMLOasisMetaExporter"/>
@@ -131,20 +35,6 @@
constructor="XMLVersionListPersistence_get_implementation">
<service name="com.sun.star.document.DocumentRevisionListPersistence"/>
</implementation>
- <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"
-
constructor="com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation">
- <service name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"/>
- </implementation>
- <implementation
- name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"
-
constructor="com_sun_star_comp_Writer_XMLOasisAutotextEventsExporter_get_implementation">
- <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"/>
- </implementation>
- <implementation
- name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"
-
constructor="com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation">
- <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"/>
- </implementation>
<implementation name="xmloff::AnimationsImport"
constructor="com_sun_star_comp_Xmloff_AnimationsImport">
<service name="com.sun.star.comp.Xmloff.AnimationsImport"/>
diff --git a/xmloff/util/xo.draw.component b/xmloff/util/xo.draw.component
new file mode 100644
index 000000000000..676dfd35286b
--- /dev/null
+++ b/xmloff/util/xo.draw.component
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="XMLDrawContentExportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisContentExporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisContentExporter"/>
+ </implementation>
+ <implementation name="XMLDrawExportOOO"
+ constructor="com_sun_star_comp_Draw_XMLExporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLExporter"/>
+ </implementation>
+ <implementation name="XMLDrawExportOasis"
+ constructor="com_sun_star_comp_Draw_XMLOasisExporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisExporter"/>
+ </implementation>
+ <implementation name="XMLDrawImportOasis"
+ constructor="com_sun_star_comp_Draw_XMLOasisImporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisImporter"/>
+ </implementation>
+ <implementation name="XMLDrawMetaExportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisMetaExporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisMetaExporter"/>
+ </implementation>
+ <implementation name="XMLDrawSettingsExportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisSettingsExporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisSettingsExporter"/>
+ </implementation>
+ <implementation name="XMLDrawStylesExportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisStylesExporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisStylesExporter"/>
+ </implementation>
+ <implementation name="XMLDrawingLayerExport"
+
constructor="com_sun_star_comp_DrawingLayer_XMLExporter_get_implementation">
+ <service name="com.sun.star.comp.DrawingLayer.XMLExporter"/>
+ </implementation>
+ <implementation name="XMLDrawContentImportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisContentImporter"/>
+ </implementation>
+ <implementation name="XMLDrawMetaImportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisMetaImporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisMetaImporter"/>
+ </implementation>
+ <implementation name="XMLDrawSettingsImportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisSettingsImporter"/>
+ </implementation>
+ <implementation name="XMLDrawStylesImportOasis"
+
constructor="com_sun_star_comp_Draw_XMLOasisStylesImporter_get_implementation">
+ <service name="com.sun.star.comp.Draw.XMLOasisStylesImporter"/>
+ </implementation>
+</component>
diff --git a/xmloff/util/xo.impress.component b/xmloff/util/xo.impress.component
new file mode 100644
index 000000000000..b33b88e3c5e3
--- /dev/null
+++ b/xmloff/util/xo.impress.component
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="XMLImpressClipboardExport"
+
constructor="com_sun_star_comp_Impress_XMLClipboardExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLClipboardExporter"/>
+ </implementation>
+ <implementation name="XMLImpressContentExportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisContentExporter"/>
+ </implementation>
+ <implementation name="XMLImpressContentImportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisContentImporter"/>
+ </implementation>
+ <implementation name="XMLImpressExportOOO"
+ constructor="com_sun_star_comp_Impress_XMLExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLExporter"/>
+ </implementation>
+ <implementation name="XMLImpressExportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisExporter"/>
+ </implementation>
+ <implementation name="XMLImpressImportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisImporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisImporter"/>
+ </implementation>
+ <implementation name="XMLImpressMetaExportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisMetaExporter"/>
+ </implementation>
+ <implementation name="XMLImpressMetaImportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisMetaImporter"/>
+ </implementation>
+ <implementation name="XMLImpressSettingsExportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisSettingsExporter"/>
+ </implementation>
+ <implementation name="XMLImpressSettingsImportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisSettingsImporter"/>
+ </implementation>
+ <implementation name="XMLImpressStylesExportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisStylesExporter"/>
+ </implementation>
+ <implementation name="XMLImpressStylesImportOasis"
+
constructor="com_sun_star_comp_Impress_XMLOasisStylesImporter_get_implementation">
+ <service name="com.sun.star.comp.Impress.XMLOasisStylesImporter"/>
+ </implementation>
+</component>
diff --git a/xmloff/util/xo.writer.component b/xmloff/util/xo.writer.component
new file mode 100644
index 000000000000..536df27d86fc
--- /dev/null
+++ b/xmloff/util/xo.writer.component
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"
+
constructor="com_sun_star_comp_Writer_XMLAutotextEventsExporter_get_implementation">
+ <service name="com.sun.star.comp.Writer.XMLAutotextEventsExporter"/>
+ </implementation>
+ <implementation
+ name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"
+
constructor="com_sun_star_comp_Writer_XMLOasisAutotextEventsExporter_get_implementation">
+ <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsExporter"/>
+ </implementation>
+ <implementation
+ name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"
+
constructor="com_sun_star_comp_Writer_XMLOasisAutotextEventsImporter_get_implementation">
+ <service name="com.sun.star.comp.Writer.XMLOasisAutotextEventsImporter"/>
+ </implementation>
+</component>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
