Kaydet (Commit) d2799676 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Find non-set-elements marked as mandatory

Change-Id: I7f75c835339b61ba9e545c13d7e5bb208c12df4c
Reviewed-on: https://gerrit.libreoffice.org/53069Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst f2df50ab
...@@ -195,12 +195,12 @@ ...@@ -195,12 +195,12 @@
<value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml</value> <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml</value>
</prop> </prop>
</node> </node>
<node oor:name="Pictures" oor:op="fuse" oor:mandatory="true"> <node oor:name="Pictures" oor:op="fuse">
<prop oor:name="Path"> <prop oor:name="Path">
<value>$(work)</value> <value>$(work)</value>
</prop> </prop>
</node> </node>
<node oor:name="Sound" oor:op="fuse" oor:mandatory="true"> <node oor:name="Sound" oor:op="fuse">
<prop oor:name="Path"> <prop oor:name="Path">
<value>$(work)</value> <value>$(work)</value>
</prop> </prop>
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<xsl:apply-templates select="."> <xsl:apply-templates select=".">
<xsl:with-param name="context" select="$component-schema/component/*[@oor:name = current()/@oor:name]"/> <xsl:with-param name="context" select="$component-schema/component/*[@oor:name = current()/@oor:name]"/>
<xsl:with-param name="component-schema" select="$component-schema"/> <xsl:with-param name="component-schema" select="$component-schema"/>
<xsl:with-param name="parent-schema-type" select="local-name($component-schema)"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:for-each> </xsl:for-each>
</xsl:template> </xsl:template>
...@@ -72,9 +73,11 @@ ...@@ -72,9 +73,11 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$schema-type='node-ref'"> <xsl:when test="$schema-type='node-ref'">
<xsl:variable name="context" select="$component-schema/templates/*[@oor:name = $node-type]"/>
<xsl:apply-templates select="."> <xsl:apply-templates select=".">
<xsl:with-param name="context" select="$component-schema/templates/*[@oor:name = $node-type]"/> <xsl:with-param name="context" select="$context"/>
<xsl:with-param name="component-schema" select="$component-schema"/> <xsl:with-param name="component-schema" select="$component-schema"/>
<xsl:with-param name="parent-schema-type" select="local-name($context)"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:when> </xsl:when>
<xsl:when test="$schema-type='set'"> <xsl:when test="$schema-type='set'">
...@@ -82,6 +85,7 @@ ...@@ -82,6 +85,7 @@
<xsl:apply-templates select="."> <xsl:apply-templates select=".">
<xsl:with-param name="context" select="$component-schema/templates/*[@oor:name = $node-type]"/> <xsl:with-param name="context" select="$component-schema/templates/*[@oor:name = $node-type]"/>
<xsl:with-param name="component-schema" select="$component-schema"/> <xsl:with-param name="component-schema" select="$component-schema"/>
<xsl:with-param name="parent-schema-type" select="$schema-type"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:for-each> </xsl:for-each>
</xsl:when> </xsl:when>
...@@ -99,6 +103,7 @@ ...@@ -99,6 +103,7 @@
<xsl:template match="node"> <xsl:template match="node">
<xsl:param name = "context"/> <xsl:param name = "context"/>
<xsl:param name = "component-schema"/> <xsl:param name = "component-schema"/>
<xsl:param name = "parent-schema-type"/>
<xsl:variable name = "path"> <xsl:variable name = "path">
<xsl:call-template name="collectPath"/> <xsl:call-template name="collectPath"/>
</xsl:variable> </xsl:variable>
...@@ -139,6 +144,7 @@ ...@@ -139,6 +144,7 @@
<xsl:apply-templates select="." mode="extensible"> <xsl:apply-templates select="." mode="extensible">
<xsl:with-param name="context" select="$context/*[@oor:name = current()/@oor:name]"/> <xsl:with-param name="context" select="$context/*[@oor:name = current()/@oor:name]"/>
<xsl:with-param name="component-schema" select="$component-schema"/> <xsl:with-param name="component-schema" select="$component-schema"/>
<xsl:with-param name="parent-schema-type" select="local-name($context)"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:for-each> </xsl:for-each>
</xsl:when> </xsl:when>
...@@ -147,10 +153,15 @@ ...@@ -147,10 +153,15 @@
<xsl:apply-templates select="."> <xsl:apply-templates select=".">
<xsl:with-param name="context" select="$context/*[@oor:name = current()/@oor:name]"/> <xsl:with-param name="context" select="$context/*[@oor:name = current()/@oor:name]"/>
<xsl:with-param name="component-schema" select="$component-schema"/> <xsl:with-param name="component-schema" select="$component-schema"/>
<xsl:with-param name="parent-schema-type" select="local-name($context)"/>
</xsl:apply-templates> </xsl:apply-templates>
</xsl:for-each> </xsl:for-each>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:if test="@oor:mandatory='true' and $parent-schema-type!='set'">
<xsl:message terminate="yes">ERROR: Node '<xsl:value-of select="$path"/>' that is not a set element is marked as mandatory!</xsl:message>
</xsl:if>
</xsl:template> </xsl:template>
<!-- ****************************************** --> <!-- ****************************************** -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment