From 97ee126d69859d01abfbdb55450d27afb71bf9b1 Mon Sep 17 00:00:00 2001
From: Balazs Varga <balazs.varga.extern@allotropia.de>
Date: Mon, 8 Aug 2022 10:49:20 +0200
Subject: [PATCH] WASM add Calc as optional build result, make it build & run

Adding new config option: --with-main-module=<writer/calc>
With this switcher we can build only WASM writer module or
calc module. The default value is 'writer'.

This commit also reverts: 26603bc9ef0116ed31c510dab82b69d3666447b5
(WASM fix orcus native exception handling (NEH))
Because Calc import is using liborcus for loading styles.xml.

Change-Id: I4c330ef8eea7d08214bf357531ee0bf7383ab788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137946
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Tested-by: Jenkins
---
 RepositoryModule_host.mk                      |  18 +-
 android/default-document/example_test.ods     | Bin 0 -> 7697 bytes
 config_host.mk.in                             |   7 +-
 config_host/config_wasm_strip.h.in            |   3 +
 configure.ac                                  |  23 ++
 extensions/Module_extensions.mk               |   4 +-
 external/liborcus/ExternalProject_liborcus.mk |   4 +-
 static/CustomTarget_emscripten_fs_image.mk    | 259 ++++++++++++++++++
 svx/Library_svxcore.mk                        |   2 +-
 writerperfect/Library_wpftcalc.mk             |  13 +-
 writerperfect/Module_writerperfect.mk         |   8 +-
 writerperfect/source/calc/wpftcalc.component  |   1 +
 .../source/calc/wpftcalc.component.extended   |   7 +
 xmloff/Library_xo.mk                          |   2 +-
 14 files changed, 331 insertions(+), 20 deletions(-)
 create mode 100644 android/default-document/example_test.ods
 create mode 100644 writerperfect/source/calc/wpftcalc.component.extended

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 453416203bfb..c0bd27b1c260 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -50,14 +50,14 @@ endif
 
 $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	android \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
 	animations \
     ) \
 	apple_remote \
 	avmedia \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+	$(if $(ENABLE_WASM_STRIP_CALC),, \
 	basctl \
-    ) \
+	) \
 	basegfx \
 	basic \
 	bean \
@@ -129,28 +129,28 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	sal \
 	salhelper \
 	sax \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+	$(if $(ENABLE_WASM_STRIP_CALC),, \
 	sc \
 	scaddins \
 	sccomp \
-    ) \
+	) \
 	$(call gb_Helper_optional,DESKTOP,scp2) \
 	scripting \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
 	sd \
 	sdext \
     ) \
 	$(call gb_Helper_optional,DESKTOP,setup_native) \
 	sfx2 \
 	shell \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
 	slideshow \
     ) \
 	smoketest \
 	solenv \
 	soltools \
 	sot \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
 	starmath \
     ) \
     $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),static) \
@@ -161,8 +161,10 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	svgio \
 	emfio \
 	svx \
+	$(if $(ENABLE_WASM_STRIP_WRITER),, \
 	sw \
 	swext \
+	) \
 	sysui \
 	test \
 	testtools \
diff --git a/android/default-document/example_test.ods b/android/default-document/example_test.ods
new file mode 100644
index 0000000000000000000000000000000000000000..4ee7cb7e60ead886b2f758dc1f85325eda96a9ba
GIT binary patch
literal 7697
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
L1f8gRm%IM~qlR86

literal 0
HcmV?d00001

diff --git a/config_host.mk.in b/config_host.mk.in
index 41f85dfd4d0d..8610ae616db1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -214,8 +214,10 @@ export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@
 export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_WASM_EXCEPTIONS=@ENABLE_WASM_EXCEPTIONS@
-export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@
-export ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP_CALC@
+export ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_WRITER=@ENABLE_WASM_STRIP_WRITER@
+export ENABLE_WASM_STRIP_CALC=@ENABLE_WASM_STRIP_CALC@
 export ENABLE_WASM_STRIP_CANVAS=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_CHART=
 export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@
@@ -230,6 +232,7 @@ export ENABLE_WASM_STRIP_RECENT=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_RECOVERYUI=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_SPLASH=@ENABLE_WASM_STRIP@
 export ENABLE_WASM_STRIP_SWEXPORTS=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_SCEXPORTS=@ENABLE_WASM_STRIP@
 export ENABLE_WERROR=@ENABLE_WERROR@
 export ENABLE_Z7_DEBUG=@ENABLE_Z7_DEBUG@
 export ENDIANNESS=@ENDIANNESS@
diff --git a/config_host/config_wasm_strip.h.in b/config_host/config_wasm_strip.h.in
index 3150a960995c..34cc6d9b01ce 100644
--- a/config_host/config_wasm_strip.h.in
+++ b/config_host/config_wasm_strip.h.in
@@ -2,6 +2,8 @@
 #define CONFIG_FEATURE_WASM_STRIP_H
 
 #define ENABLE_WASM_STRIP_ACCESSIBILITY 0
+#define ENABLE_WASM_STRIP_WRITER 0
+#define ENABLE_WASM_STRIP_CALC 0
 #define ENABLE_WASM_STRIP_CANVAS 0
 #define ENABLE_WASM_STRIP_CHART 0
 #define ENABLE_WASM_STRIP_DBACCESS 0
@@ -15,5 +17,6 @@
 #define ENABLE_WASM_STRIP_RECOVERYUI 0
 #define ENABLE_WASM_STRIP_SPLASH 0
 #define ENABLE_WASM_STRIP_SWEXPORTS 0
+#define ENABLE_WASM_STRIP_SCEXPORTS 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 1f162edaafbf..ad617bee1221 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2026,6 +2026,12 @@ AC_ARG_ENABLE(wasm-strip,
         [Strip the static build like for WASM/emscripten platform.]),
 ,)
 
+AC_ARG_WITH(main-module,
+    AS_HELP_STRING([--with-main-module=<writer/calc>],
+        [Specify which main module to build for wasm.
+        Default value is 'writer'.]),
+,)
+
 AC_ARG_ENABLE(wasm-exceptions,
     AS_HELP_STRING([--enable-wasm-exceptions],
         [Build with native WASM exceptions (AKA -fwasm-exceptions),
@@ -3047,6 +3053,8 @@ if test "$enable_wasm_strip" = "yes"; then
     test "${with_locales+set}" = set || with_locales=en
 
     AC_DEFINE(ENABLE_WASM_STRIP_ACCESSIBILITY)
+    AC_DEFINE(ENABLE_WASM_STRIP_WRITER)
+    AC_DEFINE(ENABLE_WASM_STRIP_CALC)
     AC_DEFINE(ENABLE_WASM_STRIP_CANVAS)
 #    AC_DEFINE(ENABLE_WASM_STRIP_CHART)
     AC_DEFINE(ENABLE_WASM_STRIP_DBACCESS)
@@ -3060,6 +3068,7 @@ if test "$enable_wasm_strip" = "yes"; then
     AC_DEFINE(ENABLE_WASM_STRIP_RECOVERYUI)
     AC_DEFINE(ENABLE_WASM_STRIP_SPLASH)
     AC_DEFINE(ENABLE_WASM_STRIP_SWEXPORTS)
+    AC_DEFINE(ENABLE_WASM_STRIP_SCEXPORTS)
 fi
 
 EMSCRIPTEN_NEH_MAJOR=3
@@ -3955,12 +3964,21 @@ if test "$cross_compiling" = "yes"; then
     if test "$enable_dynamic_loading" != yes -a "$enable_wasm_strip" = yes; then
         ENABLE_WASM_STRIP=TRUE
     fi
+    if test "$_os" = "Emscripten"; then
+        if test "$with_main_module" = "calc"; then
+            ENABLE_WASM_STRIP_WRITER=TRUE
+        else
+            ENABLE_WASM_STRIP_CALC=TRUE
+        fi
+    fi
 else
     CROSS_COMPILING=
     BUILD_TYPE="$BUILD_TYPE NATIVE"
 fi
 AC_SUBST(CROSS_COMPILING)
 AC_SUBST(ENABLE_WASM_STRIP)
+AC_SUBST(ENABLE_WASM_STRIP_WRITER)
+AC_SUBST(ENABLE_WASM_STRIP_CALC)
 
 # Use -isystem (gcc) if possible, to avoid warnings in 3rd party headers.
 # NOTE: must _not_ be used for bundled external libraries!
@@ -5714,6 +5732,11 @@ if test "$cross_compiling" = "yes"; then
     test "${enable_fuzzers}" = yes && sub_conf_opts="$sub_conf_opts --without-system-libxml"
     if test "$_os" = "Emscripten"; then
         sub_conf_opts="$sub_conf_opts --without-system-libxml --without-system-fontconfig --without-system-freetype --without-system-zlib"
+        if test "${with_main_module+set}" = set; then
+            sub_conf_opts="$sub_conf_opts --with-main-module=${with_main_module}"
+        else
+            sub_conf_opts="$sub_conf_opts --with-main-module=writer"
+        fi
     fi
 
     # Don't bother having configure look for stuff not needed for the build platform anyway
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 8b3a20127637..f7bd82978382 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 endif
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-ifeq (,$(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS))
+ifeq (,$(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS))
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_updatefeed \
 ))
@@ -72,7 +72,7 @@ $(eval $(call gb_Module_add_check_targets,extensions,\
     CppunitTest_extensions_test_update \
 ))
 endif
-endif # !ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS
+endif # !ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS
 endif
 
 ifeq ($(OS),WNT)
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index cd86bcf49aa8..342a8b8a0d33 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -85,8 +85,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 	$(call gb_ExternalProject_run,build,\
 		$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
 		$(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \
-		$(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS) $(gb_EMSCRIPTEN_EXCEPT)') \
-		$(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS) $(gb_EMSCRIPTEN_EXCEPT)') \
+		$(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS) $(gb_EMSCRIPTEN_CPPFLAGS)') \
+		$(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \
 		MDDS_CFLAGS='$(MDDS_CFLAGS)' \
 		MDDS_LIBS=' ' \
 		MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk
index 351fc9243b07..dfa088885bcd 100644
--- a/static/CustomTarget_emscripten_fs_image.mk
+++ b/static/CustomTarget_emscripten_fs_image.mk
@@ -274,6 +274,9 @@ gb_emscripten_fs_image_files := \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/fps/ui/explorerfiledialog.ui \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/fps/ui/foldernamedialog.ui \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/fps/ui/remotefilesdialog.ui \
+
+ifneq ($(ENABLE_WASM_STRIP_WRITER),TRUE)
+gb_emscripten_fs_image_files += \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sglobal/menubar/menubar.xml \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sglobal/popupmenu/anchor.xml \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/sglobal/popupmenu/annotation.xml \
@@ -825,6 +828,260 @@ gb_emscripten_fs_image_files := \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swxform/toolbar/textobjectbar.xml \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swxform/toolbar/toolbar.xml \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swxform/toolbar/viewerbar.xml \
+
+endif # !ENABLE_WASM_STRIP_WRITER
+
+ifneq ($(ENABLE_WASM_STRIP_CALC),TRUE)
+gb_emscripten_fs_image_files += \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/menubar/menubar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/anchor.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/audit.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/cell.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/celledit.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/colheader.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/column_operations.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/conditional.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/draw.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/drawtext.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/form.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/formrichtext.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/formulabar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/freezepanes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/graphic.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/media.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/notebookbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/oleobject.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/pagebreak.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/pivot.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/preview.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/row_operations.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/rowheader.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/sheettab.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/popupmenu/sparkline.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/statusbar/statusbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/alignmentbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/arrowsbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/arrowshapes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/basicshapes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/calloutshapes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/classificationbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/colorbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/datastreams.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/drawbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/drawobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/extrusionobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/findbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/flowchartshapes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/fontworkobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/fontworkshapetype.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/formatobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/formcontrols.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/formdesign.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/formsfilterbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/formsnavigationbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/formtextobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/fullscreenbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/graffilterbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/graphicobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/insertbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/insertcellsbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/linesbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/mediaobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/notebookbarshortcuts.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/previewbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/singlemode.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/standardbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/starshapes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/symbolshapes.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/textobjectbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/toolbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/toolbar/viewerbar.xml \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/advancedfilterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/aggregatefunctionentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/allheaderfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/analysisofvariancedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/autoformattable.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/autosum.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/cellprotectionpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/changesourcedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/chardialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/checkwarningdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/chisquaretestdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/colormenu.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/colorrowdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/colwidthdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/condformatmanager.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/conditionalentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/conditionalformatdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/conditionaliconset.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/conflictsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/consolidatedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/correlationdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/covariancedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/createnamesdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/dapiservicedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/databaroptions.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/datafielddialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/datafieldoptionsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/dataform.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/dataformfragment.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/dataproviderdlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/datastreams.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/datetimetransformationentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/definedatabaserangedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/definename.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/deletecells.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/deletecolumnentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/deletecontents.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/deleterowentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/descriptivestatisticsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/doubledialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/dropmenu.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/erroralerttabpage-mobile.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/erroralerttabpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/exponentialsmoothingdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/externaldata.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/filldlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/filterdropdown.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/filterlist.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/filtersubdropdown.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/findreplaceentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/floatingborderstyle.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/floatinglinestyle.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/footerdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/formatcellsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/formulacalculationoptions.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/fourieranalysisdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/functionpanel.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/goalseekdlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/gotosheetdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/groupbydate.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/groupbynumber.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/groupdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/headerdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/headerfootercontent.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/headerfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/imoptdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/inputbar.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/inputstringdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/insertcells.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/insertname.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/insertsheet.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/integerdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/leftfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/leftheaderdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/listmenu.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/managenamesdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/mergecellsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/mergecolumnentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/movecopysheet.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/movingaveragedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/multipleoperationsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/namerangesdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/navigatorpanel.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/nosolutiondialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_compact.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_groupedbar_compact.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_groupedbar_full.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_groups.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/notebookbar_online.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/numberbox.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/numbertransformationentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optcalculatepage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optchangespage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optcompatibilitypage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optdefaultpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optdlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optformula.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optimalcolwidthdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optimalrowheightdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/optsortlists.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/pagelistmenu.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/pagetemplatedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/paradialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/paratemplatedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/passfragment.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/pastespecial.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/pivotfielddialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/pivotfilterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/pivottablelayoutdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/posbox.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/printareasdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/printeroptions.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/protectsheetdlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/queryrunstreamscriptdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/randomnumbergenerator.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/recalcquerydialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/regressiondialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/replacenulltransformationentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/retypepassdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/retypepassworddialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/rightfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/rightheaderdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/rowheightdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/samplingdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/scenariodialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/scenariomenu.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/scgeneralpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/searchresults.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/selectdatasource.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/selectrange.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/selectsource.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedfirstfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedfirstheaderdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedheaderdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedleftfooterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedleftheaderdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedocumentdlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sharedwarningdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sheetprintpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/showchangesdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/showdetaildialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/showsheetdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebaralignment.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebarcellappearance.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sidebarnumberformat.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/simplerefdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/solverdlg.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/solveroptionsdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/solverprogressdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/solversuccessdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sortcriteriapage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sortdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sortkey.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sortoptionspage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sorttransformationentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sortwarning.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sparklinedatarangedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/sparklinedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/splitcolumnentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/standardfilterdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/statisticsinfopage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/subtotaldialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/subtotalgrppage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/subtotaloptionspage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/swaprowsentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/tabcolordialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/textimportcsv.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/textimportoptions.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/texttransformationentry.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/tpviewpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/ttestdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/ungroupdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationcriteriapage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationdialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationhelptabpage-mobile.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/validationhelptabpage.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/warnautocorrect.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/xmlsourcedialog.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/zoombox.ui \
+    $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/ztestdialog.ui \
+
+endif # !ENABLE_WASM_STRIP_CALC
+
+gb_emscripten_fs_image_files += \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/sfx/ui/addtargetdialog.ui \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/sfx/ui/alienwarndialog.ui \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/sfx/ui/autoredactdialog.ui \
@@ -1117,6 +1374,7 @@ gb_emscripten_fs_image_files := \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/res/fcfg_langpack_en-US.xcd \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/res/registry_en-US.xcd \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/writer.xcd \
+	$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/calc.xcd \
     $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/xsltfilter.xcd \
     $(INSTROOT)/$(LIBO_SHARE_PRESETS_FOLDER)/autotext/mytexts.bau \
     $(INSTROOT)/$(LIBO_SHARE_PRESETS_FOLDER)/basic/dialog.xlc \
@@ -1131,6 +1389,7 @@ gb_emscripten_fs_image_files := \
     $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
     $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
     $(SRCDIR)/android/default-document/example.odt \
+	$(SRCDIR)/android/default-document/example_test.ods \
 
 ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
 gb_emscripten_fs_image_files += \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 5cacdf82ebcc..925228c8959d 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Library_Library,svxcore))
 $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore,services))
 
 $(eval $(call gb_Library_add_componentimpls,svxcore, \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),,draw) \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),,draw) \
 ))
 
 $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
diff --git a/writerperfect/Library_wpftcalc.mk b/writerperfect/Library_wpftcalc.mk
index 1ff7398c54da..9f235603017f 100644
--- a/writerperfect/Library_wpftcalc.mk
+++ b/writerperfect/Library_wpftcalc.mk
@@ -26,6 +26,10 @@ $(eval $(call gb_Library_set_include,wpftcalc,\
 
 $(eval $(call gb_Library_set_componentfile,wpftcalc,writerperfect/source/calc/wpftcalc,services))
 
+$(eval $(call gb_Library_add_componentimpls,wpftcalc, \
+    $(if $(ENABLE_WASM_STRIP_SCEXPORTS),,extended) \
+))
+
 $(eval $(call gb_Library_use_sdk_api,wpftcalc))
 
 $(eval $(call gb_Library_use_libraries,wpftcalc,\
@@ -46,7 +50,7 @@ $(eval $(call gb_Library_use_libraries,wpftcalc,\
 
 $(eval $(call gb_Library_use_externals,wpftcalc,\
 	boost_headers \
-	etonyek \
+	$(if $(ENABLE_WASM_STRIP_SCEXPORTS),,etonyek) \
 	odfgen \
 	revenge \
 	mwaw \
@@ -60,10 +64,15 @@ $(eval $(call gb_Library_use_externals,wpftcalc,\
 	icuuc \
 ))
 
+ifneq ($(ENABLE_WASM_STRIP_SCEXPORTS),TRUE)
+$(eval $(call gb_Library_add_exception_objects,wpftcalc,\
+	writerperfect/source/calc/NumbersImportFilter \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,wpftcalc,\
 	writerperfect/source/calc/MSWorksCalcImportFilter \
 	writerperfect/source/calc/MWAWCalcImportFilter \
-	writerperfect/source/calc/NumbersImportFilter \
 	writerperfect/source/calc/StarOfficeCalcImportFilter \
 ))
 
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index c09dc27b1bde..d7ea1b93903a 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -20,12 +20,16 @@
 $(eval $(call gb_Module_Module,writerperfect))
 
 $(eval $(call gb_Module_add_targets,writerperfect,\
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
-	Library_wpftcalc \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
 	Library_wpftdraw \
 	Library_wpftimpress \
     ) \
+	$(if $(ENABLE_WASM_STRIP_CALC),, \
+	Library_wpftcalc \
+	) \
+	$(if $(ENABLE_WASM_STRIP_WRITER),, \
 	Library_wpftwriter \
+    ) \
 	Library_writerperfect \
 	UIConfig_writerperfect \
 ))
diff --git a/writerperfect/source/calc/wpftcalc.component b/writerperfect/source/calc/wpftcalc.component
index 404d09b6ca6a..7054f7699534 100644
--- a/writerperfect/source/calc/wpftcalc.component
+++ b/writerperfect/source/calc/wpftcalc.component
@@ -23,6 +23,7 @@
       constructor="org_libreoffice_comp_Calc_NumbersImportFilter_get_implementation">
     <service name="com.sun.star.document.ImportFilter"/>
     <service name="com.sun.star.document.ExtendedTypeDetection"/>
+    <optional/>
   </implementation>
   <implementation name="org.libreoffice.comp.Calc.StarOfficeCalcImportFilter"
       constructor="org_libreoffice_comp_Calc_StarOfficeCalcImportFilter_get_implementation">
diff --git a/writerperfect/source/calc/wpftcalc.component.extended b/writerperfect/source/calc/wpftcalc.component.extended
new file mode 100644
index 000000000000..81bdc103cc95
--- /dev/null
+++ b/writerperfect/source/calc/wpftcalc.component.extended
@@ -0,0 +1,7 @@
+# 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/.
+
+org.libreoffice.comp.Calc.NumbersImportFilter
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 2c59632c8537..14401f9eea8f 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo,services))
 $(eval $(call gb_Library_add_componentimpls,xo, \
     $(if $(ENABLE_WASM_STRIP_CHART),,chart) \
     draw \
-    $(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \
+    $(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
         impress \
         writer \
     ) \