diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-05-30 19:40:37 -0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-08-07 17:58:33 +0200 |
| commit | b562f4f2c229afbc50c8d7c7dfe60104d4e30a0a (patch) | |
| tree | 982d7a2a9d307205aab6def4546f0fe829d769ab | |
| parent | 06f84e645efc70c246685fa3f252b4ace8a57a87 (diff) | |
Fix default cases in switches
Change-Id: I40f6c8e5a6fd0a0ff1d3e6205de449f14598212b
Reviewed-on: https://gerrit.libreoffice.org/55107
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
| -rw-r--r-- | help3xsl/online_transform.xsl | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 54dd71c0c5..d73413a3d4 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'"> |