officecfg/Configuration_officecfg.mk | 2
officecfg/registry/data/org/openoffice/Office/Scripting.xcu | 38 ----------
officecfg/registry/schema/org/openoffice/Office/Scripting.xcs | 17 ----
postprocess/CustomTarget_registry.mk | 3
4 files changed, 60 deletions(-)
New commits:
commit 80798b426bf7d5fa4616db1af608640cfbcd79fe
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Fri Nov 17 22:15:46 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Nov 24 15:58:06 2023 +0100
[API CHANGE] Drop unused ScriptRuntimes config set
last mention of it was removed in 2014 by:
commit a1552a0ec3fcddd968db274ef41bc2452c50bed9
Change-Id: I8457220be43e2fdf42edcfef587b4346cdf9f2e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159633
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/officecfg/Configuration_officecfg.mk
b/officecfg/Configuration_officecfg.mk
index 89a8a57504e9..fc5a4ed6ebe7 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -43,7 +43,6 @@ $(eval $(call
gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Math.xcu \
org/openoffice/Office/ProtocolHandler.xcu \
org/openoffice/Office/Security.xcu \
- org/openoffice/Office/Scripting.xcu \
org/openoffice/Office/Views.xcu \
org/openoffice/Office/Paths.xcu \
org/openoffice/Office/Histories.xcu \
@@ -90,7 +89,6 @@ $(eval $(call
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Jobs-impress.xcu \
org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
org/openoffice/Office/ProtocolHandler-impress.xcu \
- org/openoffice/Office/Scripting-python.xcu \
org/openoffice/Office/Common-cjk.xcu \
org/openoffice/Office/Common-ctl.xcu \
org/openoffice/Office/Common-ctlseqcheck.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
b/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
deleted file mode 100644
index 88201ff4658f..000000000000
--- a/officecfg/registry/data/org/openoffice/Office/Scripting.xcu
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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 .
- -->
-<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry";
xmlns:install="http://openoffice.org/2004/installation";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="Scripting"
oor:package="org.openoffice.Office">
- <node oor:name="ScriptRuntimes">
- <node oor:name="BeanShell" oor:op="replace">
- <prop oor:name="SupportedFileExtensions">
- <value>bsh</value>
- </prop>
- </node>
- <node oor:name="JavaScript" oor:op="replace">
- <prop oor:name="SupportedFileExtensions">
- <value>js</value>
- </prop>
- </node>
- <node oor:name="Python" oor:op="replace" install:module="python">
- <prop oor:name="SupportedFileExtensions">
- <value>py</value>
- </prop>
- </node>
- </node>
-</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
index ca8374fa3cb8..e6bee915b207 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs
@@ -21,24 +21,7 @@
<info>
<desc>Contains the various settings needed by the Scripting Framework and
its runtimes.</desc>
</info>
- <templates>
- <group oor:name="RuntimeNode">
- <info>
- <desc>Specifies the runtimes available to the Scripting
Framework.</desc>
- </info>
- <prop oor:name="SupportedFileExtensions" oor:type="oor:string-list">
- <info>
- <desc>Lists the file extensions that are recognized by this
runtime.</desc>
- </info>
- </prop>
- </group>
- </templates>
<component>
- <set oor:name="ScriptRuntimes" oor:node-type="RuntimeNode">
- <info>
- <desc>Lists the registered Scripting Framework runtimes.</desc>
- </info>
- </set>
<group oor:name="Basic">
<info>
<desc>Contains settings for the Basic interpreter.</desc>
diff --git a/postprocess/CustomTarget_registry.mk
b/postprocess/CustomTarget_registry.mk
index d4d54bf31d74..034d7b7c36e0 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -223,7 +223,6 @@ postprocess_FILES_main := \
$(postprocess_XCU)/Office/Math.xcu \
$(postprocess_XCU)/Office/Paths.xcu \
$(postprocess_XCU)/Office/ProtocolHandler.xcu \
- $(postprocess_XCU)/Office/Scripting.xcu \
$(postprocess_XCU)/Office/Security.xcu \
$(postprocess_XCU)/Office/TableWizard.xcu \
$(postprocess_XCU)/Office/UI/BaseWindowState.xcu \
@@ -340,8 +339,6 @@ postprocess_FILES_math := \
$(postprocess_MOD)/org/openoffice/Setup-math.xcu
postprocess_DEPS_pyuno := main
-postprocess_FILES_pyuno := \
- $(postprocess_MOD)/org/openoffice/Office/Scripting-python.xcu
ifeq ($(ENABLE_REPORTBUILDER),TRUE)
postprocess_XCDS += reportbuilder.xcd
