From 62b2d8ff356e7ac74dc0a66f1630e704af270356 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 28 Sep 2016 08:22:58 +0200 Subject: 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 --- offapi/com/sun/star/util/PathSubstitution.idl | 5 +- officecfg/files.mk | 1 - .../schema/org/openoffice/Office/Substitution.xcs | 78 ---------------------- postprocess/CustomTarget_registry.mk | 1 - 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 officecfg/registry/schema/org/openoffice/Office/Substitution.xcs diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl index da827002c247..4d719712d7c7 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.
- 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.
- There is also a set of variables that have pre-defined values: + There is a set of variables that have pre-defined values:

\$(inst)
diff --git a/officecfg/files.mk b/officecfg/files.mk index adbce6b1d7d8..4e34aefc8aad 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 82333e47e561..000000000000 --- a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - 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. - - - - - Maps a share point to an existing path or to another share point defined in the Directory property. - - - - Specifies a physical directory location that is stored as a valid encoded file URL or with other path variables. - - - - - Specifies the operating system required for this share point mapping. As a result, system dependent settings can be defined. - - - - Specifies the operating system required for this share point mapping. As a result, system dependent settings can be defined. - - - - - Specifies the name of the host for which the Directory property setting is valid. You can use the '*' wildcard for the name. - - - - - Specifies the dns domain for which the Directory property variable is valid. You can use the '*' wildcard for the domain. - - - - - Specifies the yellow pages or NIS domain for which the Directory property variable is valid. You can use the '*' wildcard for the name. - - - - - Specifies the NT domain for which the Directory property variable is valid. You can use the '*' wildcard for the domain. - - - - - - - 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. - - - - - - - Specifies a table of SharePoints that are used as path variables (placeholder) within path settings. - - - - diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index b472323cf243..5fa06e63c484 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 \ -- cgit