Fix sort order of Calc functions

Change-Id: I8237b0d52b8b0f29fc35196d34648ed7b51669d1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114113
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

20 files changed, 89 insertions, 92 deletions

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index d30add9d93..b7502f6f49 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -595,28 +595,28 @@
     </xsl:variable>
     <xsl:choose>
         <xsl:when test="string-length(@descendant)=0">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h1'">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h1"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h1"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h2'">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h2"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h2"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h3'">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h3"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h3"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h4'">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h4"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h4"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h5'">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h5"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h5"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h6'">
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h6"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h6"/></xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
-            <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
+            <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
@@ -629,28 +629,28 @@
     </xsl:variable>
     <xsl:choose>
         <xsl:when test="string-length(@descendant)=0">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h1'">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h1"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h1"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h2'">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h2"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h2"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h3'">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h3"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h3"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h4'">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h4"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h4"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h5'">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h5"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h5"/></xsl:apply-templates>
         </xsl:when>
         <xsl:when test="@descendant='h6'">
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::h6"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::h6"/></xsl:apply-templates>
         </xsl:when>
         <xsl:otherwise>
-        <xsl:apply-templates><xsl:sort order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
+        <xsl:apply-templates><xsl:sort lang="{$lang}" order="{$order1}" select="descendant::paragraph"/></xsl:apply-templates>
         </xsl:otherwise>
     </xsl:choose>
 
diff --git a/source/text/scalc/01/04060104.xhp b/source/text/scalc/01/04060104.xhp
index c0c8b27611..27ae5b206b 100644
--- a/source/text/scalc/01/04060104.xhp
+++ b/source/text/scalc/01/04060104.xhp
@@ -144,7 +144,7 @@
   </tablerow>
 </table>
 
-<sort order="asc">
+<sort order="asc" descendant="h2">
 
 <section id="info">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3691824">
@@ -211,7 +211,7 @@
   </tablerow>
 </table>
 
-<paragraph id="par_id1161534" role="note" xml-lang="en-US">Other spreadsheet applications may accept localized values for the <item type="literal">Type</item> parameter, but %PRODUCTNAME Calc will only accept the English values.</paragraph>
+<note id="par_id1161534">Other spreadsheet applications may accept localized values for the <item type="literal">Type</item> parameter, but %PRODUCTNAME Calc will only accept the English values.</note>
 
 <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
 <paragraph id="par_id3994567" role="paragraph" xml-lang="en-US"><item type="input">=INFO("release")</item> returns the product release number of the %PRODUCTNAME in use.<comment>Do not translate "release"</comment></paragraph>
@@ -359,7 +359,7 @@
 <comment>mw inserted "recognizing..." and "formula cells;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTFORMEL" id="bm_id3154740" localize="false"/>
 
-<paragraph id="hd_id3153618" role="heading" level="2" xml-lang="en-US">ISFORMULA</paragraph>
+<h2 id="hd_id3153618">ISFORMULA</h2>
 <paragraph id="par_id3149138" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTFORMEL">Returns TRUE if a cell is a formula cell.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#wahr"/>
 
@@ -379,7 +379,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTGERADE" id="bm_id3149430" localize="false"/>
 
-<paragraph id="hd_id3156048" role="heading" level="2" xml-lang="en-US">ISEVEN</paragraph>
+<h2 id="hd_id3156048">ISEVEN</h2>
 <paragraph id="par_id3149170" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTGERADE">Returns TRUE if the value is an even integer, or FALSE if the value is odd.</ahelp></paragraph>
 
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -402,7 +402,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_ISEVEN" id="bm_id3146094" localize="false"/>
 
-<paragraph id="hd_id3149760" role="heading" level="2" xml-lang="en-US">ISEVEN_ADD</paragraph>
+<h2 id="hd_id3149760">ISEVEN_ADD</h2>
 <paragraph id="par_id3147253" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_ISEVEN">Tests for even numbers. Returns 1 if the number divided by 2 returns a whole number.</ahelp></paragraph>
 <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
 
@@ -423,7 +423,7 @@
 <comment>mw added "cell contents;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTKTEXT" id="bm_id3159342" localize="false"/>
 
-<paragraph id="hd_id3154692" role="heading" level="2" xml-lang="en-US">ISNONTEXT</paragraph>
+<h2 id="hd_id3154692">ISNONTEXT</h2>
 <paragraph id="par_id3155330" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTKTEXT">Tests if the cell contents are text or numbers, and returns FALSE if the contents are text.</ahelp></paragraph>
 <paragraph id="par_id5719779" role="paragraph" xml-lang="en-US">If an error occurs, the function returns TRUE.</paragraph>
 
@@ -445,7 +445,7 @@
 <comment>mw added "blank..." and "empty cells;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTLEER" id="bm_id3148940" localize="false"/>
 
-<paragraph id="hd_id3159148" role="heading" level="2" xml-lang="en-US">ISBLANK</paragraph>
+<h2 id="hd_id3159148">ISBLANK</h2>
 <paragraph id="par_id3148800" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTLEER">Returns TRUE if the reference to a cell is blank.</ahelp> This function is used to determine if the content of a cell is empty. A cell with a formula inside is not empty.</paragraph>
 <embed href="text/shared/00/00000001.xhp#wahr"/>
 
@@ -466,7 +466,7 @@
 <comment>mw added "number formats;" and "logical..."</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTLOG" id="bm_id3158424" localize="false"/>
 
-<paragraph id="hd_id3155356" role="heading" level="2" xml-lang="en-US">ISLOGICAL</paragraph>
+<h2 id="hd_id3155356">ISLOGICAL</h2>
 <paragraph id="par_id3148926" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTLOG">Tests for a logical value (TRUE or FALSE).</ahelp></paragraph>
 <paragraph id="par_id3541062" role="paragraph" xml-lang="en-US">If an error occurs, the function returns FALSE.</paragraph>
 
@@ -487,7 +487,7 @@
 <comment>mw added "#N/A ..."</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTNV" id="bm_id3159275" localize="false"/>
 
-<paragraph id="hd_id3153685" role="heading" level="2" xml-lang="en-US">ISNA</paragraph>
+<h2 id="hd_id3153685">ISNA</h2>
 <paragraph id="par_id3149105" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTNV">Returns TRUE if a cell contains the #N/A (value not available) error value.</ahelp></paragraph>
 <paragraph id="par_id6018860" role="paragraph" xml-lang="en-US">If an error occurs, the function returns FALSE.</paragraph>
 
@@ -507,7 +507,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_IFNA" id="bm_id3159273" localize="false"/>
 
-<paragraph id="hd_id31536851" role="heading" level="2" xml-lang="en-US">IFNA</paragraph>
+<h2 id="hd_id31536851">IFNA</h2>
 <paragraph id="par_id31491051" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_IFNA">Returns the value if the cell does not contains the #N/A (value not available) error value, or the alternative value if it does.</ahelp></paragraph>
 <embed href="text/scalc/00/avail_release.xhp#4.0"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -527,7 +527,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTTEXT" id="bm_id3148468" localize="false"/>
 
-<paragraph id="hd_id3149426" role="heading" level="2" xml-lang="en-US">ISTEXT</paragraph>
+<h2 id="hd_id3149426">ISTEXT</h2>
 <paragraph id="par_id3145368" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTTEXT">Returns TRUE if the cell contents refer to text.</ahelp></paragraph>
 <paragraph id="par_id6779686" role="paragraph" xml-lang="en-US">If an error occurs, the function returns FALSE.</paragraph>
 
@@ -548,7 +548,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTUNGERADE" id="bm_id3149298" localize="false"/>
 
-<paragraph id="hd_id3156034" role="heading" level="2" xml-lang="en-US">ISODD</paragraph>
+<h2 id="hd_id3156034">ISODD</h2>
 <paragraph id="par_id3155920" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTUNGERADE">Returns TRUE if the value is odd, or FALSE if the number is even.</ahelp></paragraph>
 
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -570,7 +570,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_ISODD" id="bm_id3149927" localize="false"/>
 
-<paragraph id="hd_id3153939" role="heading" level="2" xml-lang="en-US">ISODD_ADD</paragraph>
+<h2 id="hd_id3153939">ISODD_ADD</h2>
 <paragraph id="par_id3153538" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_ISODD">Returns TRUE (1) if the number does not return a whole number when divided by 2.</ahelp></paragraph>
 <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
 
@@ -590,7 +590,7 @@
 <comment>mw added "cell contents;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ISTZAHL" id="bm_id3149587" localize="false"/>
 
-<paragraph id="hd_id3148688" role="heading" level="2" xml-lang="en-US">ISNUMBER</paragraph>
+<h2 id="hd_id3148688">ISNUMBER</h2>
 <paragraph id="par_id3154618" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ISTZAHL">Returns TRUE if the value refers to a number.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#wahr"/>
 
@@ -610,7 +610,7 @@
 
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_N" id="bm_id3153786" localize="false"/>
 
-<paragraph id="hd_id3153694" role="heading" level="2" xml-lang="en-US">N</paragraph>
+<h2 id="hd_id3153694">N</h2>
 <paragraph id="par_id3150405" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_N">Returns the numeric value of the given parameter. Returns 0 if parameter is text or FALSE.</ahelp></paragraph>
 <paragraph id="par_id9115573" role="paragraph" xml-lang="en-US">If an error occurs the function returns the error value.</paragraph>
 
@@ -634,7 +634,7 @@
 <comment>mw added "#N/A error;"</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_NV" id="bm_id3154569" localize="false"/>
 
-<paragraph id="hd_id3156275" role="heading" level="2" xml-lang="en-US">NA</paragraph>
+<h2 id="hd_id3156275">NA</h2>
 <paragraph id="par_id3156161" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_NV">Returns the error value #N/A.</ahelp></paragraph>
 
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index 87a0983d2c..cb34a41899 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -37,8 +37,7 @@
 
 <h1 id="hd_id3147124">Mathematical Functions</h1>
 <paragraph id="par_id3154943" role="paragraph" xml-lang="en-US"><variable id="mathematiktext">This category contains the <emph>Mathematical</emph> functions for Calc.</variable> To open the <emph>Function Wizard</emph>, choose <link href="text/scalc/01/04060000.xhp" name="Insert - Function"><emph>Insert - Function</emph></link>.</paragraph>
-<sort>
-
+<sort order="asc" descendant="h2">
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146944">
   <bookmark_value>ABS function</bookmark_value>
diff --git a/source/text/scalc/01/04060107.xhp b/source/text/scalc/01/04060107.xhp
index aac9e7f598..3406416967 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -321,7 +321,7 @@
     </tablecell>
   </tablerow>
 </table>
-<sort>
+<sort order="asc" descendant="h2">
 <section id="Section14">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3158446">
 <bookmark_value>MUNIT function</bookmark_value>
diff --git a/source/text/scalc/01/04060109.xhp b/source/text/scalc/01/04060109.xhp
index 15bc2a7b7e..ec48f0faf3 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -36,7 +36,7 @@
       <section id="howtoget">
          <embed href="text/scalc/00/00000404.xhp#efefft"/>
       </section>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="Section1">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146968"><bookmark_value>ADDRESS function</bookmark_value>
 </bookmark>
@@ -466,7 +466,7 @@
    <tablerow>
        <tablecell>
            <paragraph id="par_id801612978604237" role="tablehead" localize="false"></paragraph>
-       </tablecell>     
+       </tablecell>
        <tablecell>
            <paragraph id="par_id881612978240743" role="tablehead" localize="false">A</paragraph>
        </tablecell>
@@ -489,10 +489,10 @@
    <tablerow>
        <tablecell>
            <paragraph id="par_id421612978935630" role="tablehead" localize="false">1</paragraph>
-       </tablecell>     
+       </tablecell>
        <tablecell>
            <paragraph id="par_id151612978320063" role="tablecontent">Element</paragraph>
-       </tablecell>     
+       </tablecell>
        <tablecell>
            <paragraph id="par_id711612450364379" role="tablecontent">Hydrogen</paragraph>
        </tablecell>
@@ -512,7 +512,7 @@
    <tablerow>
        <tablecell>
            <paragraph id="par_id331612978936143" role="tablehead" localize="false">2</paragraph>
-       </tablecell>   
+       </tablecell>
        <tablecell>
            <paragraph id="par_id341612978329327" role="tablecontent">Symbol</paragraph>
        </tablecell>
@@ -535,7 +535,7 @@
     <tablerow>
        <tablecell>
            <paragraph id="par_id141612978936342" role="tablehead" localize="false">3</paragraph>
-       </tablecell>       
+       </tablecell>
        <tablecell>
            <paragraph id="par_id601612978601591" role="tablecontent">Atomic Number</paragraph>
        </tablecell>
@@ -558,10 +558,10 @@
     <tablerow>
        <tablecell>
            <paragraph id="par_id721612978936518" role="tablehead" localize="false">4</paragraph>
-       </tablecell>       
+       </tablecell>
        <tablecell>
            <paragraph id="par_id751612978603374" role="tablecontent">Relative Atomic Mass</paragraph>
-       </tablecell>      
+       </tablecell>
        <tablecell>
            <paragraph id="par_id771612453688379" role="tablecontent" localize="false">1.008</paragraph>
        </tablecell>
diff --git a/source/text/scalc/01/04060110.xhp b/source/text/scalc/01/04060110.xhp
index 8aadf252a8..718789355f 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -40,7 +40,7 @@
 <section id="howtoget">
 <embed href="text/scalc/00/00000404.xhp#eikatext"/>
 </section>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 
 <section id="arabic">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149384">
diff --git a/source/text/scalc/01/04060111.xhp b/source/text/scalc/01/04060111.xhp
index fbcfe2f7cf..eb282e1c9f 100644
--- a/source/text/scalc/01/04060111.xhp
+++ b/source/text/scalc/01/04060111.xhp
@@ -30,22 +30,22 @@
 <bookmark_value>functions; add-in functions</bookmark_value>
 <bookmark_value>Function Wizard; add-ins</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3150870" xml-lang="en-US" level="1"><variable id="head_addin"><link href="text/scalc/01/04060111.xhp" name="Add-in Functions">Add-in Functions</link></variable></paragraph>
+<h1 id="hd_id3150870"><variable id="head_addin"><link href="text/scalc/01/04060111.xhp" name="Add-in Functions">Add-in Functions</link></variable></h1>
 <paragraph role="paragraph" id="par_id3147427" xml-lang="en-US"><variable id="addintext">The following describes and lists some of the available add-in functions.
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3163713" xml-lang="en-US"><link href="text/scalc/01/04060112.xhp#addinconcept">Add-in concept</link></paragraph>
 <paragraph role="paragraph" id="par_id3146120" xml-lang="en-US">You will also find a <link href="text/scalc/01/04060112.xhp">description of the $[officename] Calc add-in interface</link> in the Help. In addition, important functions and their parameters are described in the Help for the <switchinline select="sys"><caseinline select="UNIX">Shared Library
 </caseinline><defaultinline>$[officename] Calc add-in DLL</defaultinline></switchinline>.</paragraph>
-<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="2">Add-ins supplied</paragraph>
+<h2 id="hd_id3151075">Add-ins supplied</h2>
 <paragraph role="paragraph" id="par_id3156285" xml-lang="en-US">$[officename] contains examples for the add-in interface of $[officename] Calc.</paragraph>
 <paragraph role="paragraph" id="par_id3159267" xml-lang="en-US"><link href="text/scalc/01/04060115.xhp">Analysis Functions Part One</link></paragraph>
 <paragraph role="paragraph" id="par_id3154703" xml-lang="en-US"><link href="text/scalc/01/04060116.xhp">Analysis Functions Part Two</link></paragraph>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="isleapyear">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149566"><bookmark_value>ISLEAPYEAR function</bookmark_value>
 <bookmark_value>leap year determination</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
-<paragraph role="heading" id="hd_id3149566" xml-lang="en-US" level="2">ISLEAPYEAR</paragraph>
+<h2 id="hd_id3149566">ISLEAPYEAR</h2>
 <paragraph role="paragraph" id="par_id3150297" xml-lang="en-US"><ahelp hid=".">Determines whether a year is a leap year.</ahelp> If yes, the function will return the value 1 (TRUE); if not, it will return 0 (FALSE).</paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3150205" xml-lang="en-US">ISLEAPYEAR(Date)</paragraph>
@@ -61,7 +61,7 @@
 <bookmark_value>number of years between two dates</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_DIFFYEARS" id="bm_id3150368" localize="false"/>
-<paragraph role="heading" id="hd_id3154656" xml-lang="en-US" level="2">YEARS</paragraph>
+<h2 id="hd_id3154656">YEARS</h2>
 <paragraph role="paragraph" id="par_id3150886" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_DIFFYEARS">Calculates the difference in years between two dates.</ahelp></paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3146114" xml-lang="en-US">YEARS(StartDate; EndDate; Type)</paragraph>
@@ -77,7 +77,7 @@
 <bookmark_value>number of months between two dates</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_DIFFMONTHS" id="bm_id3148839" localize="false"/>
-<paragraph role="heading" id="hd_id3152898" xml-lang="en-US" level="2">MONTHS</paragraph>
+<h2 id="hd_id3152898">MONTHS</h2>
 <paragraph role="paragraph" id="par_id3153066" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_DIFFMONTHS">Calculates the difference in months between two dates.</ahelp></paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3146869" xml-lang="en-US">MONTHS(StartDate; EndDate; Type)</paragraph>
@@ -93,7 +93,7 @@
 <bookmark_value>encrypting text</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_ROT13" id="bm_id3153283" localize="false"/>
-<paragraph role="heading" id="hd_id3159094" xml-lang="en-US" level="2">ROT13</paragraph>
+<h2 id="hd_id3159094">ROT13</h2>
 <paragraph role="paragraph" id="par_id3146781" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_ROT13">Encrypts a character string by moving the characters 13 positions in the alphabet.</ahelp> After the letter Z, the alphabet begins again (Rotation). By applying the encryption function again to the resulting code, you can decrypt the text.</paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3159205" xml-lang="en-US">ROT13(Text)</paragraph>
@@ -105,7 +105,7 @@
 <bookmark_value>number of days; in a specific year</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_DAYSINYEAR" id="bm_id3153972" localize="false"/>
-<paragraph role="heading" id="hd_id3151300" xml-lang="en-US" level="2">DAYSINYEAR</paragraph>
+<h2 id="hd_id3151300">DAYSINYEAR</h2>
 <paragraph role="paragraph" id="par_id3143220" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_DAYSINYEAR">Calculates the number of days of the year in which the date entered occurs.</ahelp></paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3154651" xml-lang="en-US">DAYSINYEAR(Date)</paragraph>
@@ -119,7 +119,7 @@
 <bookmark_value>number of days;in a specific month of a year</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_DAYSINMONTH" id="bm_id3155593" localize="false"/>
-<paragraph role="heading" id="hd_id3154737" xml-lang="en-US" level="2">DAYSINMONTH</paragraph>
+<h2 id="hd_id3154737">DAYSINMONTH</h2>
 <paragraph role="paragraph" id="par_id3149316" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_DAYSINMONTH">Calculates the number of days of the month in which the date entered occurs.</ahelp></paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3150955" xml-lang="en-US">DAYSINMONTH(Date)</paragraph>
@@ -133,7 +133,7 @@
 <bookmark_value>number of weeks;between two dates</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_DIFFWEEKS" id="bm_id3150435" localize="false"/>
-<paragraph role="heading" id="hd_id3149048" xml-lang="en-US" level="2">WEEKS</paragraph>
+<h2 id="hd_id3149048">WEEKS</h2>
 <paragraph role="paragraph" id="par_id3153340" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_DIFFWEEKS">Calculates the difference in weeks between two dates.</ahelp></paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3147402" xml-lang="en-US">WEEKS(StartDate; EndDate; Type)</paragraph>
@@ -149,7 +149,7 @@
 <bookmark_value>number of weeks;in a specific year</bookmark_value>
 </bookmark><comment>mw added one entry</comment>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_DAI_FUNC_WEEKSINYEAR" id="bm_id3146883" localize="false"/>
-<paragraph role="heading" id="hd_id3145237" xml-lang="en-US" level="2">WEEKSINYEAR</paragraph>
+<h2 id="hd_id3145237">WEEKSINYEAR</h2>
 <paragraph role="paragraph" id="par_id3147410" xml-lang="en-US"><ahelp hid="HID_DAI_FUNC_WEEKSINYEAR">Calculates the number of weeks of the year in which the date entered occurs.</ahelp> The number of weeks is defined as follows: a week that spans two years is added to the year in which most days of that week occur.</paragraph>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
 <paragraph role="code" id="par_id3145638" xml-lang="en-US">WEEKSINYEAR(Date)</paragraph>
@@ -159,7 +159,7 @@
 <paragraph role="paragraph" id="par_id3147614" xml-lang="en-US">WEEKSINYEAR(A1) returns 53 if A1 contains 1970-02-17, a valid date for the year 1970.</paragraph>
 </section>
 </sort>
-<paragraph role="heading" id="hd_id3157901" xml-lang="en-US" level="2">Add-ins through %PRODUCTNAME API</paragraph>
+<h2 id="hd_id3157901">Add-ins through %PRODUCTNAME API</h2>
 <paragraph role="paragraph" id="par_id3149351" xml-lang="en-US">Add-ins can also be implemented through the %PRODUCTNAME <link href="https://api.libreoffice.org/" name="api.libreoffice.org">API</link>.</paragraph>
 <section id="relatedtopics">
 <embed href="text/scalc/01/04060100.xhp#drking"/>
diff --git a/source/text/scalc/01/04060112.xhp b/source/text/scalc/01/04060112.xhp
index 52a320c409..5a80424b38 100644
--- a/source/text/scalc/01/04060112.xhp
+++ b/source/text/scalc/01/04060112.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,7 +16,6 @@
  *   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">
 <meta>
 <topic id="textscalc0104060112xml" indexer="include" status="PUBLISH">
@@ -36,24 +33,24 @@
 <bookmark_value>functions; $[officename] Calc add-in DLL</bookmark_value>
 <bookmark_value>add-ins; for programming</bookmark_value>
 </bookmark><comment>mw made "external..." a one level entry and deleted one "functions;..." entry</comment>
-<paragraph role="heading" id="hd_id3151076" xml-lang="en-US" level="1">Add-in for Programming in $[officename] Calc</paragraph>
-<paragraph role="warning" id="par_id3147001" xml-lang="en-US">The method of extending Calc by Add-Ins that is described in the following is outdated. The interfaces are still valid and supported, to ensure compatibility with existing Add-Ins, but for programming new Add-Ins you should use the new <link href="text/shared/guide/integratinguno.xhp" name="API functions">API functions</link>.</paragraph>
+<h1 id="hd_id3151076">Add-in for Programming in $[officename] Calc</h1>
+<warning id="par_id3147001">The method of extending Calc by Add-Ins that is described in the following is outdated. The interfaces are still valid and supported, to ensure compatibility with existing Add-Ins, but for programming new Add-Ins you should use the new <link href="text/shared/guide/integratinguno.xhp" name="API functions">API functions</link>.</warning>
 <paragraph role="paragraph" id="par_id3150361" xml-lang="en-US">$[officename] Calc can be expanded by Add-Ins, which are external programming modules providing additional functions for working with spreadsheets. These are listed in the <emph>Function Wizard</emph> in the <emph>Add-In</emph> category. If you would like to program an Add-In yourself, you can learn here which functions must be exported by the <switchinline select="sys"><caseinline select="UNIX">shared library
 </caseinline><defaultinline>external DLL</defaultinline></switchinline> so that the Add-In can be successfully attached.</paragraph>
 <paragraph role="paragraph" id="par_id3149211" xml-lang="en-US">$[officename] searches the Add-in folder defined in the configuration for a suitable <switchinline select="sys"><caseinline select="UNIX">shared library
 </caseinline><defaultinline>DLL</defaultinline></switchinline>. To be recognized by $[officename], the <switchinline select="sys"><caseinline select="UNIX">shared library
 </caseinline><defaultinline>DLL</defaultinline></switchinline> must have certain properties, as explained in the following. This information allows you to program your own Add-In for <emph>Function Wizard</emph> of $[officename] Calc.</paragraph>
 <section id="addinconcept">
-<paragraph role="heading" id="hd_id3146981" xml-lang="en-US" level="2">The Add-In Concept</paragraph>
+<h2 id="hd_id3146981">The Add-In Concept</h2>
 <paragraph role="paragraph" id="par_id3156292" xml-lang="en-US">Each Add-In library provides several functions. Some functions are used for administrative purposes. You can choose almost any name for your own functions. However, they must also follow certain rules regarding parameter passing. The exact naming and calling conventions vary for different platforms.</paragraph>
 </section>
-<paragraph role="heading" id="hd_id3152890" xml-lang="en-US" level="3">Functions of <switchinline select="sys"><caseinline select="UNIX">Shared Library
-</caseinline><defaultinline>AddIn DLL</defaultinline></switchinline></paragraph>
+<h3 id="hd_id3152890">Functions of <switchinline select="sys"><caseinline select="UNIX">Shared Library
+</caseinline><defaultinline>AddIn DLL</defaultinline></switchinline></h3>
 <paragraph role="paragraph" id="par_id3148837" xml-lang="en-US">At a minimum, the administrative functions <link href="text/scalc/01/04060112.xhp" name="GetFunctionCount">GetFunctionCount</link> and <link href="text/scalc/01/04060112.xhp" name="GetFunctionData">GetFunctionData</link> must exist. Using these, the functions as well as parameter types and return values can be determined. As return values, the Double and String types are supported. As parameters, additionally the cell areas <link href="text/scalc/01/04060112.xhp" name="Double Array">Double Array</link>, <link href="text/scalc/01/04060112.xhp" name="String Array">String Array</link>, and <link href="text/scalc/01/04060112.xhp" name="Cell Array">Cell Array</link> are supported.</paragraph>
 <paragraph role="paragraph" id="par_id3148604" xml-lang="en-US">Parameters are passed using references. Therefore, a change of these values is basically possible. However, this is not supported in $[officename] Calc because it does not make sense within spreadsheets.</paragraph>
 <paragraph role="paragraph" id="par_id3150112" xml-lang="en-US">Libraries can be reloaded during runtime and their contents can be analyzed by the administrative functions. For each function, information is available about count and type of parameters, internal and external function names and an administrative number.</paragraph>
 <paragraph role="paragraph" id="par_id3155269" xml-lang="en-US">The functions are called synchronously and return their results immediately. Real time functions (asynchronous functions) are also possible; however, they are not explained in detail because of their complexity.</paragraph>
-<paragraph role="heading" id="hd_id3145077" xml-lang="en-US" level="2">General information about the interface</paragraph>
+<h2 id="hd_id3145077">General information about the interface</h2>
 <paragraph role="paragraph" id="par_id3146776" xml-lang="en-US">The maximum number of parameters in an Add-In function attached to $[officename] Calc is 16: one return value and a maximum of 15 function input parameters.</paragraph>
 <paragraph role="paragraph" id="par_id3149899" xml-lang="en-US">The data types are defined as follows:</paragraph>
 <table id="tbl_id3159203">
@@ -110,8 +107,8 @@
 </tablerow>
 </table>
 
-<paragraph role="heading" id="hd_id3156396" xml-lang="en-US" level="2"><switchinline select="sys"><caseinline select="UNIX">Shared Library
-</caseinline><defaultinline>DLL</defaultinline></switchinline> functions</paragraph>
+<h2 id="hd_id3156396"><switchinline select="sys"><caseinline select="UNIX">Shared Library
+</caseinline><defaultinline>DLL</defaultinline></switchinline> functions</h2>
 <paragraph role="paragraph" id="par_id3153019" xml-lang="en-US">Following you will find a description of those functions, which are called at the <switchinline select="sys"><caseinline select="UNIX">Shared Library
 </caseinline><defaultinline>external DLL</defaultinline></switchinline>.</paragraph>
 <paragraph role="paragraph" id="par_id3150038" xml-lang="en-US">For all <switchinline select="sys"><caseinline select="UNIX">Shared Library
@@ -119,7 +116,7 @@
 <paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" localize="false"><literal>void CALLTYPE fn(out, in1, in2, ...)</literal></paragraph>
 <paragraph role="paragraph" id="par_id3147616" xml-lang="en-US"><emph>Output</emph>: Resulting value</paragraph>
 <paragraph role="paragraph" id="par_id3159119" xml-lang="en-US"><emph>Input</emph>: Any number of types (double&amp;, char*, double*, char**, Cell area), where the <link href="text/scalc/01/04060112.xhp" name="Cell area">Cell area</link> is an array of types double array, string array, or cell array.</paragraph>
-<paragraph role="heading" id="hd_id3150653" xml-lang="en-US" level="3" localize="false">GetFunctionCount()</paragraph>
+<h3 id="hd_id3150653">GetFunctionCount()</h3>
 <paragraph role="paragraph" id="par_id3152981" xml-lang="en-US">Returns the number of functions without the management functions of the reference parameter. Each function has a unique number between 0 and nCount-1. This number will be needed for the <link href="text/scalc/01/04060112.xhp" name="GetFunctionData">GetFunctionData</link> and <link href="text/scalc/01/04060112.xhp" name="GetParameterDescription">GetParameterDescription</link> functions later.</paragraph>
 <paragraph role="paragraph" id="par_id3150742" xml-lang="en-US">
 <emph>Syntax</emph>
@@ -130,7 +127,7 @@
 </paragraph>
 <paragraph role="paragraph" id="par_id3146940" xml-lang="en-US" localize="false"><literal>USHORT &amp;nCount</literal>:</paragraph>
 <paragraph role="paragraph" id="par_id3149893" xml-lang="en-US"><emph>Output</emph>: Reference to a variable, which is supposed to contain the number of Add-In functions. For example: If the Add-In provides 5 functions for $[officename] Calc, then nCount=5.</paragraph>
-<paragraph role="heading" id="hd_id3147476" xml-lang="en-US" level="3" localize="false">GetFunctionData()</paragraph>
+<h3 id="hd_id3147476">GetFunctionData()</h3>
 <paragraph role="paragraph" id="par_id3154841" xml-lang="en-US">Determines all the important information about an Add-In function.</paragraph>
 <paragraph role="paragraph" id="par_id3148888" xml-lang="en-US">
 <emph>Syntax</emph>
@@ -151,7 +148,7 @@
 <paragraph role="paragraph" id="par_id3153078" xml-lang="en-US" localize="false"><literal>char* pInternalName</literal>:</paragraph>
 <paragraph role="paragraph" id="par_id3155261" xml-lang="en-US"><emph>Output</emph>: Function name as seen by the user, as it appears in the <emph>Function Wizard</emph>. May contain umlauts.</paragraph>
 <paragraph role="paragraph" id="par_id3153327" xml-lang="en-US">The pFuncName and pInternalName parameters are char arrays, which are implemented with size 256 in $[officename] Calc.</paragraph>
-<paragraph role="heading" id="hd_id3148567" xml-lang="en-US" level="3" localize="false">GetParameterDescription()</paragraph>
+<h3 id="hd_id3148567">GetParameterDescription()</h3>
 <paragraph role="paragraph" id="par_id3153000" xml-lang="en-US">Provides a brief description of the Add-In function and its parameters. As an option, this function can be used to show a function and parameter description in the <emph>Function Wizard</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3154501" xml-lang="en-US">
 <emph>Syntax</emph>
@@ -169,9 +166,9 @@
 <paragraph role="paragraph" id="par_id3151020" xml-lang="en-US" localize="false"><literal>char* pDesc</literal>:</paragraph>
 <paragraph role="paragraph" id="par_id3148389" xml-lang="en-US"><emph>Output</emph>: Takes up the description of the parameter, for example, "Value, at which the universe is to be calculated." Implemented in $[officename] Calc as char[256].</paragraph>
 <paragraph role="paragraph" id="par_id3145303" xml-lang="en-US">pName and pDesc are char arrays; implemented in $[officename] Calc with size 256. Please note that the space available in the <emph>Function Wizard</emph> is limited and that the 256 characters cannot be fully used.</paragraph>
-<paragraph role="heading" id="hd_id3148874" xml-lang="en-US" level="2">Cell areas</paragraph>
+<h2 id="hd_id3148874">Cell areas</h2>
 <paragraph role="paragraph" id="par_id3150265" xml-lang="en-US">The following tables contain information about which data structures must be provided by an external program module in order to pass cell areas. $[officename] Calc distinguishes between three different arrays, depending on the data type.</paragraph>
-<paragraph role="heading" id="hd_id3156060" xml-lang="en-US" level="3">Double Array</paragraph>
+<h3 id="hd_id3156060">Double Array</h3>
 <paragraph role="paragraph" id="par_id3149540" xml-lang="en-US">As a parameter, a cell area with values of the Number/Double type can be passed. A double array in $[officename] Calc is defined as follows:</paragraph>
 <table id="tbl_id3150665">
 <tablerow>
@@ -330,7 +327,7 @@
 </tablerow>
 </table>
 
-<paragraph role="heading" id="hd_id3154935" xml-lang="en-US" level="3">String Array</paragraph>
+<h3 id="hd_id3154935">String Array</h3>
 <paragraph role="paragraph" id="par_id3153105" xml-lang="en-US">A cell area, which contains values of data type Text and is passed as a string array. A string array in $[officename] Calc is defined as follows:</paragraph>
 <table id="tbl_id3146992">
 <tablerow>
@@ -500,7 +497,7 @@
 </tablerow>
 </table>
 
-<paragraph role="heading" id="hd_id3159091" xml-lang="en-US" level="3">Cell Array</paragraph>
+<h3 id="hd_id3159091">Cell Array</h3>
 <paragraph role="paragraph" id="par_id3156140" xml-lang="en-US">Cell arrays are used to call cell areas containing text as well as numbers. A cell array in $[officename] Calc is defined as follows:</paragraph>
 <table id="tbl_id3150942">
 <tablerow>
diff --git a/source/text/scalc/01/04060116.xhp b/source/text/scalc/01/04060116.xhp
index 4f9abb4227..9d554aa81e 100644
--- a/source/text/scalc/01/04060116.xhp
+++ b/source/text/scalc/01/04060116.xhp
@@ -35,7 +35,7 @@
       <section id="howtoget">
          <embed href="text/scalc/00/00000404.xhp#addinana"/>
       </section>
-<sort>
+<sort order="asc" descendant="h2">
 <section id="imabs">
          <paragraph xml-lang="en-US" id="par_id3145074" role="paragraph" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154959"><bookmark_value>IMABS function</bookmark_value>
diff --git a/source/text/scalc/01/04060118.xhp b/source/text/scalc/01/04060118.xhp
index 48dd466e30..f2f89d146d 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -29,7 +29,8 @@
 
 
 <h1 id="hd_id3146780">Financial Functions Part Three</h1>
-<sort>
+<sort order="asc" descendant="h2">
+
 
 <section id="oddfprice">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145112">
diff --git a/source/text/scalc/01/04060119.xhp b/source/text/scalc/01/04060119.xhp
index fbbb1e8ae0..ccf3e35ad7 100644
--- a/source/text/scalc/01/04060119.xhp
+++ b/source/text/scalc/01/04060119.xhp
@@ -33,7 +33,7 @@
 </section>
 <paragraph role="paragraph" id="par_id3148742" xml-lang="en-US"><link href="text/scalc/01/04060103.xhp" name="Back to Financial Functions Part One">Back to Financial Functions Part One</link></paragraph>
 <paragraph role="paragraph" id="par_id3151341" xml-lang="en-US"><link href="text/scalc/01/04060118.xhp" name="Forward to Financial Functions Part Three">Forward to Financial Functions Part Three</link></paragraph>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="ppmt">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3150026"><bookmark_value>PPMT function</bookmark_value>
 </bookmark>
diff --git a/source/text/scalc/01/04060120.xhp b/source/text/scalc/01/04060120.xhp
index 0a22215b9f..b5e805053a 100644
--- a/source/text/scalc/01/04060120.xhp
+++ b/source/text/scalc/01/04060120.xhp
@@ -38,16 +38,16 @@
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id4149052" xml-lang="en-US" level="1">Bit Operation Functions</paragraph>
+<h1 id="hd_id4149052">Bit Operation Functions</h1>
 <section id="howtoget">
 <embed href="text/scalc/00/00000404.xhp#eikama"/>
 </section>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="bitand">
 <bookmark xml-lang="en-US" branch="index" id="bm_id4150026"><bookmark_value>BITAND function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_BITAND" id="bm_id4145827" localize="false"/>
-<paragraph role="heading" id="hd_id4150026" xml-lang="en-US" level="2">BITAND</paragraph>
+<h2 id="hd_id4150026">BITAND</h2>
 <paragraph role="paragraph" id="par_id4146942" xml-lang="en-US"><ahelp hid="HID_FUNC_BITAND">Returns a bitwise logical "and" of the parameters.</ahelp></paragraph>
 <embed href="text/scalc/00/avail_release.xhp#3.5"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -62,7 +62,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id4146139"><bookmark_value>BITOR function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_BITOR" id="bm_id4148754" localize="false"/>
-<paragraph role="heading" id="hd_id4146139" xml-lang="en-US" level="2">BITOR</paragraph>
+<h2 id="hd_id4146139">BITOR</h2>
 <paragraph role="paragraph" id="par_id4150140" xml-lang="en-US"><ahelp hid="HID_FUNC_BITOR">Returns a bitwise logical "or" of the parameters.</ahelp></paragraph>
 <embed href="text/scalc/00/avail_release.xhp#3.5"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -76,7 +76,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id4150019"><bookmark_value>BITXOR function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_BITXOR" id="bm_id4154330" localize="false"/>
-<paragraph role="heading" id="hd_id4150019" xml-lang="en-US" level="2">BITXOR</paragraph>
+<h2 id="hd_id4150019">BITXOR</h2>
 <paragraph role="paragraph" id="par_id4145246" xml-lang="en-US"><ahelp hid="HID_FUNC_BITXOR">Returns a bitwise logical "exclusive or" of the parameters.</ahelp></paragraph>
 <embed href="text/scalc/00/avail_release.xhp#3.5"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -91,7 +91,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id4155370"><bookmark_value>BITLSHIFT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_BITLSHIFT" id="bm_id4148593" localize="false"/>
-<paragraph role="heading" id="hd_id4155370" xml-lang="en-US" level="2">BITLSHIFT</paragraph>
+<h2 id="hd_id4155370">BITLSHIFT</h2>
 <paragraph role="paragraph" id="par_id4158411" xml-lang="en-US"><ahelp hid="HID_FUNC_BITLSHIFT">Shifts a number left by n bits.</ahelp></paragraph>
 <embed href="text/scalc/00/avail_release.xhp#3.5"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
@@ -108,7 +108,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id4083280"><bookmark_value>BITRSHIFT function</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_BITRSHIFT" id="bm_id4154312" localize="false"/>
-<paragraph role="heading" id="hd_id4083280" xml-lang="en-US" level="2">BITRSHIFT</paragraph>
+<h2 id="hd_id4083280">BITRSHIFT</h2>
 <paragraph role="paragraph" id="par_id4152482" xml-lang="en-US"><ahelp hid="HID_FUNC_BITRSHIFT">Shifts a number right by n bits.</ahelp></paragraph>
 <embed href="text/scalc/00/avail_release.xhp#3.5"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
diff --git a/source/text/scalc/01/04060181.xhp b/source/text/scalc/01/04060181.xhp
index a6ac2baedc..f32cab5e08 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -29,7 +29,7 @@
 
 
 <h1 id="hd_id3146320"><variable id="ae"><link href="text/scalc/01/04060181.xhp">Statistical Functions Part One</link></variable></h1>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 
 <section id="intercept">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145632">
diff --git a/source/text/scalc/01/04060182.xhp b/source/text/scalc/01/04060182.xhp
index a324f5681e..df82688b33 100644
--- a/source/text/scalc/01/04060182.xhp
+++ b/source/text/scalc/01/04060182.xhp
@@ -27,7 +27,7 @@
    <body>
       <h1 id="hd_id3154372"><variable id="fh"><link href="text/scalc/01/04060182.xhp" name="Statistical Functions Part Two">Statistical Functions Part Two</link>
 </variable></h1>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="finv">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3145388"><bookmark_value>FINV function</bookmark_value>
          <bookmark_value>inverse F probability distribution</bookmark_value>
diff --git a/source/text/scalc/01/04060183.xhp b/source/text/scalc/01/04060183.xhp
index c543cf5393..a4e5524bd8 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -29,7 +29,7 @@
 <body>
 <h1 id="hd_id3166425"><variable id="kl"><link href="text/scalc/01/04060183.xhp" name="Statistical Functions Part Three">Statistical Functions Part Three</link>
 </variable></h1>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="large">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149530"><bookmark_value>LARGE function</bookmark_value>
 </bookmark>
diff --git a/source/text/scalc/01/04060184.xhp b/source/text/scalc/01/04060184.xhp
index a2faa30e4b..ce1f605593 100644
--- a/source/text/scalc/01/04060184.xhp
+++ b/source/text/scalc/01/04060184.xhp
@@ -29,7 +29,7 @@
 <body>
 <h1 id="hd_id3153415"><variable id="mq"><link href="text/scalc/01/04060184.xhp" name="Statistical Functions Part Four">Statistical Functions Part Four</link>
 </variable></h1>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="max">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154511"><bookmark_value>MAX function</bookmark_value>
 </bookmark>
diff --git a/source/text/scalc/01/04060185.xhp b/source/text/scalc/01/04060185.xhp
index ce6d078ea9..648dd3ec6e 100644
--- a/source/text/scalc/01/04060185.xhp
+++ b/source/text/scalc/01/04060185.xhp
@@ -29,7 +29,7 @@
    <body>
       <h1 id="hd_id3147072"><variable id="rz"><link href="text/scalc/01/04060185.xhp" name="Statistical Functions Part Five">Statistical Functions Part Five</link>
 </variable></h1>
-<sort order="asc">
+<sort order="asc" descendant="h2">
 <section id="rank">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155071"><bookmark_value>RANK function</bookmark_value>
          <bookmark_value>numbers;determining ranks</bookmark_value>
diff --git a/source/text/scalc/01/func_color.xhp b/source/text/scalc/01/func_color.xhp
index f7c7b13582..2affaf6315 100644
--- a/source/text/scalc/01/func_color.xhp
+++ b/source/text/scalc/01/func_color.xhp
@@ -32,7 +32,7 @@
          <bookmark_value>colors;calculating in spreadsheets</bookmark_value>
          <bookmark_value>COLOR function</bookmark_value>
      </bookmark>
-     <h2 id="hd_id456845684568"><variable id="color_head"><link href="text/scalc/01/func_color.xhp">COLOR</link></variable></h2>
+     <h1 id="hd_id456845684568"><variable id="color_head"><link href="text/scalc/01/func_color.xhp">COLOR</link></variable></h1>
      <paragraph id="par_id1102201617001848" role="paragraph" xml-lang="en-US"><ahelp hid=".">Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system.</ahelp> The result depends on the color system used by your computer.</paragraph>
  </section>
  <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
diff --git a/source/text/scalc/01/func_countifs.xhp b/source/text/scalc/01/func_countifs.xhp
index e9b49865f7..2f1192b059 100644
--- a/source/text/scalc/01/func_countifs.xhp
+++ b/source/text/scalc/01/func_countifs.xhp
@@ -24,7 +24,7 @@
   <bookmark_value>counting row;satisfying criteria</bookmark_value>
   <bookmark_value>counting column;satisfying criteria</bookmark_value>
 </bookmark>
-<h2 id="hd_id456845684568"><variable id="countifs_head"><link href="text/scalc/01/func_countifs.xhp">COUNTIFS</link></variable> function</h2>
+<h1 id="hd_id456845684568"><variable id="countifs_head"><link href="text/scalc/01/func_countifs.xhp">COUNTIFS</link></variable></h1>
 <paragraph id="par_id462646264626" role="paragraph" xml-lang="en-US"><ahelp hid="."><variable id="countifs_des">Returns the count of cells that meet criteria in multiple ranges.</variable></ahelp></paragraph>
 </section>
 <embed href="text/scalc/00/avail_release.xhp#4.0"/>
diff --git a/source/text/scalc/01/func_sumifs.xhp b/source/text/scalc/01/func_sumifs.xhp
index ec594d56b4..db5e3c5401 100644
--- a/source/text/scalc/01/func_sumifs.xhp
+++ b/source/text/scalc/01/func_sumifs.xhp
@@ -23,7 +23,7 @@
   <bookmark_value>SUMIFS function</bookmark_value>
   <bookmark_value>sum;satisfying conditions</bookmark_value>
 </bookmark>
-<h1 id="hd_id658866588665886"><variable id="sumifs_head"><link href="text/scalc/01/func_sumifs.xhp">SUMIFS</link></variable> function</h1>
+<h1 id="hd_id658866588665886"><variable id="sumifs_head"><link href="text/scalc/01/func_sumifs.xhp">SUMIFS</link></variable></h1>
 <paragraph id="par_id659756597565975" role="paragraph" xml-lang="en-US"><ahelp hid="."><variable id="sumifs_des">Returns the sum of the values of cells in a range that meets multiple criteria in multiple ranges.</variable></ahelp></paragraph>
 </section>
 <embed href="text/scalc/00/avail_release.xhp#4.0"/>