config_host.mk.in | 1 + i18npool/source/breakiterator/breakiteratorImpl.cxx | 4 ++++ i18npool/source/collator/collator_unicode.cxx | 4 ++++ i18npool/source/registerservices/registerservices.cxx | 4 ++++ sal/textenc/tables.cxx | 4 ++++ solenv/bin/native-code.py | 4 ++++ solenv/gbuild/gbuild.mk | 1 + 7 files changed, 22 insertions(+)
New commits: commit 10963e79ac7d4b4e622ad2c12e041252d66b07c5 Author: Armin Le Grand (Allotropia) <armin.le.gr...@me.com> AuthorDate: Tue May 18 21:46:11 2021 +0200 Commit: Armin Le Grand (Allotropia) <armin.le.gr...@me.com> CommitDate: Tue May 18 21:46:11 2021 +0200 Wasm optional reduce created locales Change-Id: I00fdea6af81aff0d03d2f7106c99d9a745151588 diff --git a/config_host.mk.in b/config_host.mk.in index 0312597f6757..59acfac79a55 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -213,6 +213,7 @@ export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_EPUB=@ENABLE_WASM_STRIP@ +export ENABLE_WASM_STRIP_LOCALES=@ENABLE_WASM_STRIP@ export ENABLE_WERROR=@ENABLE_WERROR@ export ENDIANNESS=@ENDIANNESS@ export EPM=@EPM@ diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index a449be4d17fe..075f6fb023fe 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -33,6 +33,10 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; +#ifdef ENABLE_WASM_STRIP_LOCALES +#define WITH_LOCALE_ALL 0 +#endif + namespace i18npool { BreakIteratorImpl::BreakIteratorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext ) diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 8c8255a18229..4cefd5c37fbf 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -36,6 +36,10 @@ using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; +#ifdef ENABLE_WASM_STRIP_LOCALES +#define WITH_LOCALE_ALL 0 +#endif + namespace i18npool { constexpr OUStringLiteral implementationName = u"com.sun.star.i18n.Collator_Unicode"; diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx index 878fc3c3de50..d6ace3624c69 100644 --- a/i18npool/source/registerservices/registerservices.cxx +++ b/i18npool/source/registerservices/registerservices.cxx @@ -60,6 +60,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace i18npool; +#ifdef ENABLE_WASM_STRIP_LOCALES +#define WITH_LOCALE_ALL 0 +#endif + #define IMPL_CREATEINSTANCE( ImplName ) \ static uno::Reference< uno::XInterface > \ ImplName##_CreateInstance( \ diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index 075f1d56f902..11db1dbf5eed 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -27,6 +27,10 @@ #include <rtl/textenc.h> #include <sal/types.h> +#ifdef ENABLE_WASM_STRIP_LOCALES +#define WITH_LOCALE_ALL 0 +#endif + #define NOTABUNI_START 0xFF #define NOTABUNI_END 0x00 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index e8ef67571c7a..47354e4361cb 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -999,6 +999,10 @@ print ("""/* #include <osl/detail/component-mapping.h> #include <string.h> +#ifdef ENABLE_WASM_STRIP_LOCALES +#define WITH_LOCALE_ALL 0 +#endif + """) if not options.pure_c: print ("""extern "C" {""") diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index beccae4cbbf5..c2aae611630c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -234,6 +234,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_DBACCESS gb_GLOBALDEFS += -DENABLE_WASM_STRIP_ACCESSIBILITY gb_GLOBALDEFS += -DENABLE_WASM_STRIP_UCPHELP gb_GLOBALDEFS += -DENABLE_WASM_STRIP_EPUB +gb_GLOBALDEFS += -DENABLE_WASM_STRIP_LOCALES endif ifeq ($(gb_ENABLE_DBGUTIL),$(true)) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits