officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu | 31
----------
officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs | 9 ++
2 files changed, 8 insertions(+), 32 deletions(-)
New commits:
commit 4bce8705cb40f8c75c0a943b1572d3347d7b4fd3
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Mon Oct 2 12:54:00 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Oct 2 21:33:05 2023 +0200
Remove unused/deprecated TypeDetection.xcu
Change-Id: I75b8e7b2ab14d46dc4ca966c9995c6f8e69eead1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157487
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
deleted file mode 100644
index 5f009f1d1b7b..000000000000
--- a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu
+++ /dev/null
@@ -1,31 +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:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:install="http://openoffice.org/2004/installation";
oor:name="TypeDetection" oor:package="org.openoffice.Office">
- <!--
- Attention: Please don't merge any changes into this file! Its
deprecated for further versions.
- Use the new configuration schema
org.openoffice.TypeDetection/ and its related sub
- structures. Contact as96863 to get further information
about this fact.
- -->
- <node oor:name="Types"/>
- <node oor:name="Filters"/>
- <node oor:name="ContentHandlers"/>
- <node oor:name="DetectServices"/>
- <node oor:name="FrameLoaders"/>
-</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
index 46688a2218e4..7fd9dddccf73 100644
--- a/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/TypeDetection.xcs
@@ -19,7 +19,14 @@
<!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd">
<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="TypeDetection"
oor:package="org.openoffice.Office" xml:lang="en-US">
<info>
- <desc>Contains common content types, filters, deep detection services, as
well as the frame loader and the content handler for Office.</desc>
+ <desc>
+ Deprecated.
+ Use the new configuration schema org.openoffice.TypeDetection/ and its
related sub structures.
+ This schema is only kept for compatibility.
+
+ Old description:
+ Contains common content types, filters, deep detection services, as
well as the frame loader and the content handler for Office.
+ </desc>
</info>
<templates>
<group oor:name="Type">
