Repository.mk | 1
extras/Module_extras.mk | 1
extras/Package_autotext.mk | 14 +++++++++++++
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 1
5 files changed, 18 insertions(+)
New commits:
commit 2870bf6cacc4cde2c69e51d429c2a1dc6de57543
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Nov 12 19:35:55 2024 +0000
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Nov 14 16:58:53 2024 +0100
add an autotext 'common' directory like templates/common
for language neutral autotexts
Change-Id: Id3202981c28071a8100a6ce730274788c80a2867
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176504
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/Repository.mk b/Repository.mk
index c148cf315d6c..5a3cec7c266a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -943,6 +943,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extensions_OOoSpotlightImporter \
) \
extras_autocorr \
+ extras_autotext \
extras_autotextuser \
extras_cfgsrvnolang \
extras_cfgusr \
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 497a188cc142..07055820e9fc 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_tplpresnt \
CustomTarget_tplwizard \
Package_autocorr \
+ Package_autotext \
Package_autotextuser \
Package_cfgsrvnolang \
Package_cfgusr \
diff --git a/extras/Package_autotext.mk b/extras/Package_autotext.mk
new file mode 100644
index 000000000000..ca62ff65623e
--- /dev/null
+++ b/extras/Package_autotext.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,extras_autotext,$(call
gb_CustomTarget_get_workdir,extras/source/autotext)))
+
+$(eval $(call
gb_Package_add_empty_directory,extras_autotext,$(LIBO_SHARE_FOLDER)/autotext/common))
+
+# vim: set noet sw=4 ts=4:
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index b5b304b8f362..fa25191be2a4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -34,6 +34,7 @@
</node>
<node oor:name="AutoText" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
+ <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/common"
oor:op="fuse"/>
<node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)"
oor:op="fuse"/>
</node>
<prop oor:name="WritePath">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 14d538e1026d..b4bd480f4152 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1389,6 +1389,7 @@
</info>
<value>
<it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
+ <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/common</it>
<it>$(userurl)/autotext</it>
</value>
</prop>
