summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2018-05-30 19:40:37 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2018-06-07 17:39:43 +0200
commitb372425faaa181a49305cd0d7487ce72226eff1c (patch)
tree07a74e0c5ffeac17e5b8daab7191d2af2be1e2af
parent228048839b6df667fbe9f78bba5a1f7df5835180 (diff)
Fix default cases in switches
Change-Id: I40f6c8e5a6fd0a0ff1d3e6205de449f14598212b Reviewed-on: https://gerrit.libreoffice.org/55108 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--help3xsl/online_transform.xsl42
1 files changed, 19 insertions, 23 deletions
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 54dd71c0c..d73413a3d 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -989,32 +989,28 @@
<xsl:param name="embedded" />
<xsl:choose>
<xsl:when test="parent::switch[@select='sys'] or parent::switchinline[@select='sys']">
- <xsl:if test="not(../child::case[@select=$System]) and not(../child::caseinline[@select=$System])">
- <xsl:variable name="auxID" select="concat('default',generate-id())"/>
- <xsl:choose>
- <xsl:when test="$embedded = 'yes'">
- <span hidden="true" id="{$auxID}"><xsl:apply-templates mode="embedded"/></span>
- </xsl:when>
- <xsl:otherwise>
- <span hidden="true" id="{$auxID}"><xsl:apply-templates /></span>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
+ <xsl:variable name="auxID" select="concat('default',generate-id())"/>
+ <xsl:choose>
+ <xsl:when test="$embedded = 'yes'">
+ <span hidden="true" id="{$auxID}"><xsl:apply-templates mode="embedded"/></span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span hidden="true" id="{$auxID}"><xsl:apply-templates /></span>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:when>
<xsl:when test="parent::switch[@select='appl'] or parent::switchinline[@select='appl']">
- <xsl:if test="not(../child::case[@select=$appl]) and not(../child::caseinline[@select=$appl])">
- <xsl:variable name="auxID" select="concat('default',generate-id())"/>
- <xsl:choose>
- <xsl:when test="$embedded = 'yes'">
- <span hidden="true" id="{$auxID}"><xsl:apply-templates mode="embedded"/></span>
- </xsl:when>
- <xsl:otherwise>
- <span hidden="true" id="{$auxID}"><xsl:apply-templates /></span>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
+ <xsl:variable name="auxID" select="concat('default',generate-id())"/>
+ <xsl:choose>
+ <xsl:when test="$embedded = 'yes'">
+ <span hidden="true" id="{$auxID}"><xsl:apply-templates mode="embedded"/></span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span hidden="true" id="{$auxID}"><xsl:apply-templates /></span>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:when>
- <xsl:when test="parent::switch[@select='distrib'] or parent::switchinline[@select='distrib']">
+ <xsl:when test="parent::switch[@select='distrib'] or parent::switchinline[@select='distrib']"><!--TODO: fix this distrib case if relevant-->
<xsl:if test="not(../child::case[@select=$distrib]) and not(../child::caseinline[@select=$distrib])">
<xsl:choose>
<xsl:when test="$embedded = 'yes'">