[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Olivier Hallot]

 help3xsl/online_transform.xsl |   42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

New commits:
commit fc875c6ab3763e36008fd872b3670d953f18ba9d
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date:   Wed May 30 19:40:37 2018 -0300

    Fix default cases in switches
    
    Change-Id: I40f6c8e5a6fd0a0ff1d3e6205de449f14598212b
    Reviewed-on: https://gerrit.libreoffice.org/55107
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

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'">