summaryrefslogtreecommitdiffstats
path: root/officecfg/util/data_val.xsl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-05 12:48:15 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-05 12:48:15 +0000
commitf65a0428809efee050fe692e7cf214fabd203696 (patch)
treee322d1231ab5e269448456ae339c7141b64952cc /officecfg/util/data_val.xsl
parentINTEGRATION: CWS scp2officecfg (1.7.212); FILE MERGED (diff)
downloadcore-f65a0428809efee050fe692e7cf214fabd203696.tar.gz
core-f65a0428809efee050fe692e7cf214fabd203696.zip
INTEGRATION: CWS scp2officecfg (1.3.212); FILE MERGED
2004/06/10 13:29:47 jb 1.3.212.2: RESYNC: (1.3-1.4); FILE MERGED 2004/05/18 16:05:09 jb 1.3.212.1: #i25937# Add support for installation modules to source format
Diffstat (limited to 'officecfg/util/data_val.xsl')
-rw-r--r--officecfg/util/data_val.xsl24
1 files changed, 22 insertions, 2 deletions
diff --git a/officecfg/util/data_val.xsl b/officecfg/util/data_val.xsl
index 1f5c7eb94045..0f1ae5c5032e 100644
--- a/officecfg/util/data_val.xsl
+++ b/officecfg/util/data_val.xsl
@@ -3,9 +3,9 @@
*
* $RCSfile: data_val.xsl,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: kz $ $Date: 2004-05-19 13:49:40 $
+ * last change: $Author: obo $ $Date: 2004-07-05 13:48:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -67,6 +67,7 @@
xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:oor="http://openoffice.org/2001/registry"
+ xmlns:install="http://openoffice.org/2004/installation"
xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"
extension-element-prefixes="filehelper">
@@ -147,6 +148,8 @@
<xsl:message terminate="yes">ERROR: Node '<xsl:value-of select="$path"/>' does not exist in schema!</xsl:message>
</xsl:if>
+ <xsl:call-template name="checkModule"/>
+
<xsl:choose>
<!-- look for matching templates in other components -->
<xsl:when test="$context/@oor:node-type and $context/@oor:component">
@@ -203,9 +206,12 @@
<xsl:if test="not ($context)">
<xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' does not exist in schema !</xsl:message>
</xsl:if>
+
<xsl:if test="@oor:op">
<xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has unexpected operation '<xsl:value-of select="@oor:op"/>' !</xsl:message>
</xsl:if>
+
+ <xsl:call-template name="checkModule"/>
</xsl:template>
@@ -243,10 +249,24 @@
<xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has unexpected operation '<xsl:value-of select="@oor:op"/>'!</xsl:message>
</xsl:otherwise>
</xsl:choose>
+
+ <xsl:call-template name="checkModule"/>
</xsl:template>
<!-- ************************************* -->
+<!-- * checkModule *** -->
+<!-- ************************************* -->
+ <xsl:template name="checkModule">
+ <xsl:if test="@install:module">
+ <xsl:if test="ancestor::*[@install:module]">
+ <xsl:message terminate="yes">ERROR: Nested modules are not supported. Found module '<xsl:value-of select="@install:module"/>' within module '<xsl:value-of select="ancestor::*/@install:module"/>'!
+ </xsl:message>
+ </xsl:if>
+ </xsl:if>
+ </xsl:template>
+
+<!-- ************************************* -->
<!-- * collectPath *** -->
<!-- ************************************* -->
<xsl:template name="collectPath">