ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Add unique accelerators config file for wasm builds

Browse Source 
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 <balazs.varga.extern@allotropia.de>
This commit is contained in:
Balazs Varga
2025-03-28 16:56:29 +01:00
parent ef2fc674d2
commit 557941fda4
3 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
postprocess/CustomTarget_registry.mk
+9
View File
@@ -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 := \
static/CustomTarget_emscripten_fs_image.mk
+1
View File
@@ -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 \
static/config/wasm-accelerators.xcu
+95
View File
@@ -0,0 +1,95 @@
<?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 .
-->
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:install="http://openoffice.org/2004/installation"
oor:name="Accelerators" oor:package="org.openoffice.Office">
<node oor:name="PrimaryKeys">
<node oor:name="Modules">
<node oor:name="com.sun.star.sheet.SpreadsheetDocument">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F5_MOD1" oor:op="remove"/>
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
<node oor:name="1_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.drawing.DrawingDocument">
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F5_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.text.GlobalDocument">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.presentation.PresentationDocument">
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F5_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.text.WebDocument">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.sdb.FormDesign">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.sdb.TextReportDesign">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.text.TextDocument">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F5_MOD1" oor:op="remove"/>
<node oor:name="P_SHIFT_MOD2" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.xforms.XMLFormDocument">
<node oor:name="F2_MOD1" oor:op="remove"/>
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
<node oor:name="F5" oor:op="remove"/>
<node oor:name="F3_MOD1" oor:op="remove"/>
</node>
</node>
</node>
<node oor:name="SecondaryKeys">
<node oor:name="Modules">
<node oor:name="com.sun.star.drawing.DrawingDocument">
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
</node>
<node oor:name="com.sun.star.presentation.PresentationDocument">
<node oor:name="K_MOD1_MOD2" oor:op="remove"/>
</node>
</node>
</node>
</oor:component-data>