From 331bcad4dbe923f4ce47cfe1de64ea0ffbe5a6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnamara@collabora.com>
Date: Mon, 18 Nov 2024 20:07:23 +0000
Subject: [PATCH] Revert "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 3b267b65d24616fe49ca1410b123d186a59541d0.

reports of test failures at:
https://gerrit.libreoffice.org/c/core/+/176508

Nothing depends on this right now, so I'll have second go at this later.

Change-Id: I95999f05c69fa9b2459128116927616b1f6a9ca5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176743
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
---
 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 deletions(-)
 delete mode 100644 extras/Package_autotext.mk

diff --git a/Repository.mk b/Repository.mk
index a263a235925a..c90c56880147 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -960,7 +960,6 @@ $(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 ed9a1e33e0ce..0c04202e8a20 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -16,7 +16,6 @@ $(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
deleted file mode 100644
index d5b5c6471fc8..000000000000
--- a/extras/Package_autotext.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- 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 fa25191be2a4..b5b304b8f362 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -34,7 +34,6 @@
     </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 09ca450b00fe..5fa9ec24c2f5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1377,7 +1377,6 @@
           </info>
           <value>
             <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/$(vlang)</it>
-            <it>$(insturl)/@LIBO_SHARE_FOLDER@/autotext/common</it>
             <it>$(userurl)/autotext</it>
           </value>
         </prop>