[Libreoffice-commits] core.git: offapi/com officecfg/files.mk officecfg/registry postprocess/CustomTarget_registry.mk
Stephan Bergmann
sbergman at redhat.com
Wed Sep 28 06:27:14 UTC 2016
offapi/com/sun/star/util/PathSubstitution.idl | 5
officecfg/files.mk | 1
officecfg/registry/schema/org/openoffice/Office/Substitution.xcs | 78 ----------
postprocess/CustomTarget_registry.mk | 1
4 files changed, 1 insertion(+), 84 deletions(-)
New commits:
commit 62b2d8ff356e7ac74dc0a66f1630e704af270356
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 28 08:22:58 2016 +0200
tdf#102630: [API CHANGE] Remove /org.openoffice.Office/Substitution tree
...from configuration (see issue for details). Also, remove mention of that
configuration tree from the documentation of the css.util.PathSubstitution UNO
service.
Change-Id: Ia0373bc7d19e650b7954b7dbb934a578c96fcab5
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index da82700..4d71971 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -35,10 +35,7 @@ module com { module sun { module star { module util {
Path variables are not case sensitive and are always provided as a UCB-compliant URLs
(for example: "file:///c:/temp" or "file:///usr/install"). This is mandatory to support an
optional remote file system.<br>
- A user defined list of path variables is supported. This list is stored in the Office
- configuration file (org/openoffice/Office/Substitution.xml). Please have a look at the
- schema definition file which configuration structure this file uses.<br>
- There is also a set of variables that have pre-defined values:
+ There is a set of variables that have pre-defined values:
</p>
<dl>
<dt>\$(inst)</dt>
diff --git a/officecfg/files.mk b/officecfg/files.mk
index adbce6b..4e34aef 100644
--- a/officecfg/files.mk
+++ b/officecfg/files.mk
@@ -47,7 +47,6 @@ officecfg_XCSFILES := \
Office/ReportDesign \
Office/Scripting \
Office/Security \
- Office/Substitution \
Office/TabBrowse \
Office/TableWizard \
Office/TypeDetection \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
deleted file mode 100644
index 82333e4..0000000
--- a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs
+++ /dev/null
@@ -1,78 +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-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="Substitution" oor:package="org.openoffice.Office" xml:lang="en-US">
- <info>
- <desc>Stores rules for user-defined path variables called SharePoint. These rules are evaluated when a user-defined path variable must be substituted with a real path.</desc>
- </info>
- <templates>
- <group oor:name="SharePointMapping">
- <info>
- <desc>Maps a share point to an existing path or to another share point defined in the Directory property.</desc>
- </info>
- <prop oor:name="Directory" oor:type="xs:string" oor:nillable="false">
- <info>
- <desc>Specifies a physical directory location that is stored as a valid encoded file URL or with other path variables.</desc>
- </info>
- </prop>
- <group oor:name="Environment">
- <info>
- <desc>Specifies the operating system required for this share point mapping. As a result, system dependent settings can be defined.</desc>
- </info>
- <prop oor:name="OS" oor:type="xs:string">
- <info>
- <desc>Specifies the operating system required for this share point mapping. As a result, system dependent settings can be defined.</desc>
- </info>
- </prop>
- <prop oor:name="Host" oor:type="xs:string">
- <info>
- <desc>Specifies the name of the host for which the Directory property setting is valid. You can use the '*' wildcard for the name.</desc>
- </info>
- </prop>
- <prop oor:name="DNSDomain" oor:type="xs:string">
- <info>
- <desc>Specifies the dns domain for which the Directory property variable is valid. You can use the '*' wildcard for the domain.</desc>
- </info>
- </prop>
- <prop oor:name="YPDomain" oor:type="xs:string">
- <info>
- <desc>Specifies the yellow pages or NIS domain for which the Directory property variable is valid. You can use the '*' wildcard for the name.</desc>
- </info>
- </prop>
- <prop oor:name="NTDomain" oor:type="xs:string">
- <info>
- <desc>Specifies the NT domain for which the Directory property variable is valid. You can use the '*' wildcard for the domain.</desc>
- </info>
- </prop>
- </group>
- </group>
- <set oor:name="SharePoint" oor:node-type="SharePointMapping">
- <info>
- <desc>Specifies the path variable name. The name is case-sensitive and must be defined with ASCII characters. The name is used as a placeholder within path settings and can be substituted during runtime with a path defined in one of the defined mappings.</desc>
- </info>
- </set>
- </templates>
- <component>
- <set oor:name="SharePoints" oor:node-type="SharePoint">
- <info>
- <desc>Specifies a table of SharePoints that are used as path variables (placeholder) within path settings.</desc>
- </info>
- </set>
- </component>
-</oor:component-schema>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b472323..5fa06e6 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -159,7 +159,6 @@ postprocess_FILES_main := \
$(postprocess_XCS)/Office/Recovery.xcs \
$(postprocess_XCS)/Office/Scripting.xcs \
$(postprocess_XCS)/Office/Security.xcs \
- $(postprocess_XCS)/Office/Substitution.xcs \
$(postprocess_XCS)/Office/TabBrowse.xcs \
$(postprocess_XCS)/Office/TableWizard.xcs \
$(postprocess_XCS)/Office/TypeDetection.xcs \
More information about the Libreoffice-commits
mailing list