help3xsl/online_transform.xsl | 39 ++++++-------------
source/text/scalc/01/12080500.xhp | 76 ++++++++++++++++++--------------------
2 files changed, 49 insertions(+), 66 deletions(-)
New commits:
commit c4c67afc5f5ac8ada17f82a248eba33c8bd0c520
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Sat Feb 5 06:51:12 2022 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sat Feb 5 15:31:37 2022 +0100
Drop last 00/00000004.xhp#wie and simplify XSLT
Change-Id: I85d2da067db208f806b78020a9ca95889444ce0d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129519
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 4f75de400..a6ce8255b 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -419,11 +419,6 @@
<xsl:when test="(concat('/',@href) =
/helpdocument/meta/topic/filename) or (@href =
/helpdocument/meta/topic/filename)">
<xsl:apply-templates />
</xsl:when>
- <xsl:when
test="contains(child::embedvar/@href,'/00/00000004.xhp#wie')"> <!-- special
treatment of howtoget links -->
- <xsl:call-template name="insert_howtoget">
- <xsl:with-param name="linkhref" select="@href"/>
- </xsl:call-template>
- </xsl:when>
<xsl:otherwise>
<xsl:call-template name="createlink" />
</xsl:otherwise>
@@ -481,10 +476,6 @@
</xsl:call-template>
</xsl:when>
- <xsl:when
test="contains(descendant::embedvar/@href,'/00/00000004.xhp#wie')"> <!--
special treatment of howtoget links -->
- <xsl:apply-templates />
- </xsl:when>
-
<xsl:when test="@role='bascode' or @role='pycode'">
<xsl:call-template name="brand">
<xsl:with-param name="string" select="."/>
@@ -528,10 +519,6 @@
</xsl:call-template>
</xsl:when>
- <xsl:when
test="contains(descendant::embedvar/@href,'/00/00000004.xhp#wie')"> <!--
special treatment of howtoget links -->
- <xsl:apply-templates />
- </xsl:when>
-
<xsl:when test="@role='bascode' or @role='pycode'">
<xsl:call-template name="brand">
<xsl:with-param name="string" select="."/>
@@ -1437,20 +1424,18 @@
</xsl:template>
<xsl:template name="resolveembedvar">
- <xsl:if test="not(@href='text/shared/00/00000004.xhp#wie')"> <!-- special
treatment if howtoget links -->
- <xsl:variable name="archive"><xsl:value-of
select="concat(substring-before(substring-after(@href,'text/'),'/'),'/')"/></xsl:variable>
- <xsl:variable name="href"><xsl:value-of
select="concat($urlpre,substring-before(@href,'#'))"/></xsl:variable>
- <xsl:variable name="anchor"><xsl:value-of
select="substring-after(@href,'#')"/></xsl:variable>
- <xsl:variable name="doc" select="document($href)"/>
- <xsl:choose>
- <xsl:when test="$doc//variable[@id=$anchor]"> <!-- test for a
variable of that name -->
- <xsl:apply-templates select="$doc//variable[@id=$anchor]"
mode="embedded"/>
- </xsl:when>
- <xsl:otherwise> <!-- or give up -->
- <span class="bug">[<xsl:value-of select="@href"/> not
found].</span>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
+ <xsl:variable name="archive"><xsl:value-of
select="concat(substring-before(substring-after(@href,'text/'),'/'),'/')"/></xsl:variable>
+ <xsl:variable name="href"><xsl:value-of
select="concat($urlpre,substring-before(@href,'#'))"/></xsl:variable>
+ <xsl:variable name="anchor"><xsl:value-of
select="substring-after(@href,'#')"/></xsl:variable>
+ <xsl:variable name="doc" select="document($href)"/>
+ <xsl:choose>
+ <xsl:when test="$doc//variable[@id=$anchor]"> <!-- test for a variable
of that name -->
+ <xsl:apply-templates select="$doc//variable[@id=$anchor]"
mode="embedded"/>
+ </xsl:when>
+ <xsl:otherwise> <!-- or give up -->
+ <span class="bug">[<xsl:value-of select="@href"/> not
found].</span>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<!-- Apply -->
diff --git a/source/text/scalc/01/12080500.xhp
b/source/text/scalc/01/12080500.xhp
index f6dfedc58..35e0b4e1d 100644
--- a/source/text/scalc/01/12080500.xhp
+++ b/source/text/scalc/01/12080500.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textscalc0112080500xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">AutoOutline</title>
@@ -30,62 +26,64 @@
<body>
<section id="auto_outline">
<bookmark xml-lang="en-US" branch="hid/.uno:AutoOutline" id="bm_id1815805"
localize="false"/>
-<paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="1"><link
href="text/scalc/01/12080500.xhp"
name="AutoOutline">AutoOutline</link></paragraph>
+<h1 id="hd_id3150275"><link href="text/scalc/01/12080500.xhp"
name="AutoOutline">AutoOutline</link></h1>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US"><ahelp
hid=".uno:AutoOutline">If the selected cell range contains formulas or
references, $[officename] automatically outlines the
selection.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US"
localize="false"><link href="text/scalc/00/00000412.xhp#dnglagl"><embedvar
href="text/scalc/00/00000004.xhp#wie"/></link></paragraph>
+<section id="howtoget">
+<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US"
localize="false"><embedvar
href="text/scalc/00/00000412.xhp#dnglagl"/></paragraph>
+</section>
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US">For example,
consider the following table:</paragraph>
<table id="tbl_id3125865">
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154123"
xml-lang="en-US">January</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3154123"
xml-lang="en-US">January</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154011"
xml-lang="en-US">February</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3154011"
xml-lang="en-US">February</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152460"
xml-lang="en-US">March</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3152460"
xml-lang="en-US">March</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US">1st
Quarter</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3146119" xml-lang="en-US">1st
Quarter</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155854"
xml-lang="en-US">April</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3155854"
xml-lang="en-US">April</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148575" xml-lang="en-US">May</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3148575" xml-lang="en-US">May</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145271"
xml-lang="en-US">June</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3145271"
xml-lang="en-US">June</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145648" xml-lang="en-US">2nd
Quarter</paragraph>
+<tablecell>
+<paragraph role="tablehead" id="par_id3145648" xml-lang="en-US">2nd
Quarter</paragraph>
</tablecell>
</tablerow>
<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US">100</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153876" xml-lang="en-US"
localize="false">100</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US">120</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US"
localize="false">120</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US">130</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3149400" xml-lang="en-US"
localize="false">130</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150328" xml-lang="en-US">350</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3150328" xml-lang="en-US"
localize="false">350</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155443" xml-lang="en-US">100</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3155443" xml-lang="en-US"
localize="false">100</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153713" xml-lang="en-US">100</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3153713" xml-lang="en-US"
localize="false">100</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US">200</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US"
localize="false">200</paragraph>
</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145230" xml-lang="en-US">400</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3145230" xml-lang="en-US"
localize="false">400</paragraph>
</tablecell>
</tablerow>
</table>
