From 2388501ed81c4873d63f2f26505603ade06642d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Mon, 16 Dec 2024 11:09:15 +0000
Subject: [PATCH] Reapply "add an autotext 'common' directory like
 templates/common"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 331bcad4dbe923f4ce47cfe1de64ea0ffbe5a6ce now
there is a fix for the problem that triggered the revert.

Change-Id: I4acacd51d5799e80dfa42a0433278e684d82a860
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178577
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
---
 Repository.mk                                      |  1 +
 extras/Module_extras.mk                            |  1 +
 extras/Package_autotext.mk                         | 14 ++++++++++++++
 .../registry/data/org/openoffice/Office/Paths.xcu  |  1 +
 .../schema/org/openoffice/Office/Common.xcs        |  1 +
 5 files changed, 18 insertions(+)
 create mode 100644 extras/Package_autotext.mk

diff --git a/Repository.mk b/Repository.mk
index c67abb0e6171..7a5f2eabe0fe 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -959,6 +959,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 f78c226cd401..717436fed25d 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_Module_add_targets,extras,\
 	CustomTarget_gallsystem \
 	CustomTarget_templates \
 	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..d5b5c6471fc8
--- /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,$(gb_CustomTarget_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 4fb3dec7983f..d705bf51aa83 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1377,6 +1377,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>