From 557941fda42d80865c6d5983fddca3a1458f1980 Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Wed, 26 Mar 2025 19:26:04 +0100 Subject: [PATCH] Add unique accelerators config file for wasm builds Remove/disable hotkeys which brings up certain dialogs - and sometimes these dialogs loses the focus and they disappear but still keep the document waiting for them to close - for wasm app with wasm-accelerators.xcu TODO for later: better solution would be to have the props that are removed here rather be install:module="..."-conditional in officecfg/registry/data/org/openoffice/Office/Accelerators.xcu See details: https://gerrit.libreoffice.org/c/core/+/183389/comment/064afee4_47e66b62/ Change-Id: Ia44390fd7682327feb56e944d30a9fd7ff4cbd82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183389 Tested-by: Jenkins Reviewed-by: Balazs Varga --- postprocess/CustomTarget_registry.mk | 9 ++ static/CustomTarget_emscripten_fs_image.mk | 1 + static/config/wasm-accelerators.xcu | 95 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 static/config/wasm-accelerators.xcu diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 4fc1080b6f04..3458e69c8e3a 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -31,6 +31,9 @@ postprocess_XCDS := \ main.xcd \ math.xcd \ writer.xcd \ + $(if $(filter EMSCRIPTEN,$(OS)), \ + static.xcd \ + ) \ xsltfilter.xcd postprocess_DEPS_base := main @@ -392,6 +395,12 @@ postprocess_FILES_writer := \ $(postprocess_MOD)/org/openoffice/Office/Embedding-writer.xcu \ $(postprocess_MOD)/org/openoffice/Setup-writer.xcu +ifeq (EMSCRIPTEN,$(OS)) +postprocess_DEPS_static := main +postprocess_FILES_static := \ + $(SRCDIR)/static/config/wasm-accelerators.xcu +endif + postprocess_DEPS_xsltfilter := main postprocess_OPTDEPS_xsltfilter := calc writer postprocess_FILES_xsltfilter := \ diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index d6c658c7a2ad..bed3256f3005 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -1695,6 +1695,7 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/draw.xcd \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/impress.xcd \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/math.xcd \ + $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/static.xcd \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry/xsltfilter.xcd \ $(INSTROOT)/$(LIBO_SHARE_PRESETS_FOLDER)/autotext/mytexts.bau \ $(INSTROOT)/$(LIBO_SHARE_PRESETS_FOLDER)/basic/dialog.xlc \ diff --git a/static/config/wasm-accelerators.xcu b/static/config/wasm-accelerators.xcu new file mode 100644 index 000000000000..1dc07ced7d86 --- /dev/null +++ b/static/config/wasm-accelerators.xcu @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +