summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2024-11-26 14:07:23 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2024-11-28 14:28:49 +0100
commitfdaa4119632b1aa0caa9a5de5e9c43f42d27062a (patch)
tree4a1155dcc76e40eabd4590b7856e846159004e0c
parentb54ecbdca64c469e25e46a4c047ee36d355da7c7 (diff)
show extension link on startcenter for macosxsandbox case
the ShowDonation has already a default value of true via the schema, so it is enough to override it to false for the macosxsandbox case similar to how it is done with the Infobar / using the install:module method Change-Id: I8f1ea6d3530e66806f66f9f2d2fb16ef0276e460 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177333 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit fd2c9abe5229f98e062b7b32994e9e015975ca90) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177358 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
-rw-r--r--officecfg/Configuration_officecfg.mk1
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu2
-rw-r--r--postprocess/CustomTarget_registry.mk1
3 files changed, 3 insertions, 1 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 57ac28bbed51..868a6626755b 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Common-unx.xcu \
org/openoffice/Office/Common-unixdesktop.xcu \
org/openoffice/Office/Common-macosx.xcu \
+ org/openoffice/Office/Common-macosxsandbox.xcu \
org/openoffice/Office/Common-wnt.xcu \
org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
org/openoffice/Office/Common-32bit.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f146d5a82769..002aafc8fac9 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -458,7 +458,7 @@
<value install:module="wnt">true</value>
</prop>
<prop oor:name="ShowDonation">
- <value>true</value>
+ <value install:module="macosxsandbox">false</value>
</prop>
</node>
<node oor:name="Save">
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 20d68d3bc7aa..4be442c49ae4 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -309,6 +309,7 @@ endif
ifneq ($(ENABLE_MACOSX_SANDBOX),)
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/UI/Infobar-macosxsandbox.xcu
+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Common-macosxsandbox.xcu
endif
ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))