tdf#155876 UI cmds Calc-Sheet menu (35)

+ Data menu for Calc, Sort.
+ refactoring

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

7 files changed, 91 insertions, 42 deletions

diff --git a/source/text/scalc/00/00000412.xhp b/source/text/scalc/00/00000412.xhp
index 720fe4734b..86032b9ae2 100644
--- a/source/text/scalc/00/00000412.xhp
+++ b/source/text/scalc/00/00000412.xhp
@@ -30,9 +30,64 @@
     <paragraph role="paragraph" id="par_id8366954"><variable id="text2columns">Choose <emph>Data - Text to Columns</emph>.</variable></paragraph>
     <paragraph role="paragraph" id="par_id3147399"><variable id="dbrbf">Choose <emph>Data - Define Range</emph>.</variable></paragraph>
     <paragraph role="paragraph" id="par_id3145345"><variable id="dbrba">Choose <emph>Data - Select Range</emph>.</variable></paragraph>
-    <paragraph role="paragraph" id="par_id3150443"><variable id="dnsrt">Choose <emph>Data - Sort...</emph>.</variable></paragraph>
-    <paragraph role="paragraph" id="par_id641584647437810"><variable id="datasortascending">Choose <menuitem>Data - Sort Ascending</menuitem></variable></paragraph>
-    <paragraph role="paragraph" id="par_id711584647447316"><variable id="datasortdescending">Choose <menuitem>Data - Sort Descending</menuitem></variable></paragraph>
+
+    <section id="sort">
+        <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+        <paragraph role="paragraph" id="par_id3150443"><variable id="dnsrt">Choose <emph>Data - Sort...</emph>.</variable></paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+        <paragraph role="paragraph" id="par_id871703614487983">Choose <menuitem>Data - Sort</menuitem>.</paragraph>
+        <paragraph role="paragraph" id="par_id171703614533423">On the <menuitem>Data</menuitem> menu of the <menuitem>Data</menuitem> tab, choose <menuitem>Sort</menuitem>.</paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+        <table id="tab_id551703614720322">
+            <tablerow>
+                <tablecell>
+                    <paragraph id="par_id701703614720324" role="paragraph"><image src="cmd/lc_datasort.svg" id="img_id171703614720325" width="1cm"  height="1cm"><alt id="alt_id321703614720326">Icon Sort</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph id="par_id841703614720328" role="paragraph">Sort</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
+
+    <section id="datasortascending1">
+        <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+        <paragraph role="paragraph" id="par_id641584647437810"><variable id="datasortascending">Choose <menuitem>Data - Sort Ascending</menuitem></variable></paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+        <paragraph role="paragraph" id="par_id51703615084612">Choose <menuitem>Data - Sort Ascending</menuitem>.</paragraph>
+        <paragraph role="paragraph" id="par_id421703615080492">On the <menuitem>Data</menuitem> menu of the <menuitem>Data</menuitem> tab, choose <menuitem>Sort Ascending</menuitem>.</paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+        <table id="tab_id481703615010039">
+            <tablerow>
+                <tablecell>
+                    <paragraph id="par_id881703615010041" role="paragraph"><image src="cmd/lc_sortascending.svg" id="img_id431703615010042" width="1cm"  height="1cm"><alt id="alt_id861703615010043">Icon Sort Ascending</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph id="par_id741703615010044" role="paragraph">Sort Ascending</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
+
+    <section id="datasortdescending1">
+        <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+        <paragraph role="paragraph" id="par_id711584647447316"><variable id="datasortdescending">Choose <menuitem>Data - Sort Descending</menuitem></variable></paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+        <paragraph role="paragraph" id="par_id381703615221123">Choose <menuitem>Data - Sort Descending</menuitem>.</paragraph>
+        <paragraph role="paragraph" id="par_id731703615224099">On the <menuitem>Data</menuitem> menu of the <menuitem>Data</menuitem> tab, choose <menuitem>Sort Descending</menuitem>.</paragraph>
+        <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+        <table id="tab_id581703615261055">
+            <tablerow>
+                <tablecell>
+                    <paragraph id="par_id531703615261057" role="paragraph"><image src="cmd/lc_sortdescending.svg" id="img_id51703615261058" width="1cm"  height="1cm"><alt id="alt_id451703615261059">Icon Sort Descending</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph id="par_id401703615261060" role="paragraph">Sort Descending</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
+
     <section id="sort_criteria">
         <paragraph role="paragraph" id="par_id3148491">Choose <emph>Data - Sort - Sort Criteria</emph> tab.</paragraph>
         <paragraph role="paragraph" id="par_id3154516"><variable id="onthestandardbar">On <emph>Standard</emph> bar, click</variable></paragraph>
diff --git a/source/text/scalc/01/12010000.xhp b/source/text/scalc/01/12010000.xhp
index ac66b4c966..4c934c2799 100644
--- a/source/text/scalc/01/12010000.xhp
+++ b/source/text/scalc/01/12010000.xhp
@@ -22,36 +22,36 @@
 
 <meta>
 <topic id="textscalc0112010000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Define Database Range</title>
+<title id="tit">Define Database Range</title>
 <filename>/text/scalc/01/12010000.xhp</filename>
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:DefineDBName" id="bm_id6632476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/DefineDatabaseRangeDialog" id="bm_id3147335" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/@@nowidget@@" id="bm_id3147335" localize="false"/>
+<bookmark branch="hid/.uno:DefineDBName" id="bm_id6632476" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/DefineDatabaseRangeDialog" id="bm_id3147335" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/@@nowidget@@" id="bm_id3147335" localize="false"/>
 <section id="defineDBrangeheader">
 <h1 id="hd_id3157909"><link href="text/scalc/01/12010000.xhp">Define Range</link></h1>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US"><variable id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based on the selected cells in your sheet.</ahelp></variable></paragraph>
+<paragraph role="paragraph" id="par_id3155922"><variable id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based on the selected cells in your sheet.</ahelp></variable></paragraph>
 </section>
 
 <note id="par_id3149456">You can only select a rectangular cell range.</note>
 <section id="howtoget">
 <embed href="text/scalc/00/00000412.xhp#dbrbf"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/entry" id="bm_id3150868" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/entry" id="bm_id3150868" localize="false"/>
 <h2 id="hd_id3156422">Name</h2>
-<paragraph role="paragraph" id="par_id3150770" xml-lang="en-US"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/entry">Enter a name for the database range that you want to define, or select an existing name from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/assign" id="bm_id3155133" localize="false"/>
+<paragraph role="paragraph" id="par_id3150770"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/entry">Enter a name for the database range that you want to define, or select an existing name from the list.</ahelp></paragraph>
+<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/assign" id="bm_id3155133" localize="false"/>
 <h2 id="hd_id3147228">Range</h2>
-<paragraph role="paragraph" id="par_id3150441" xml-lang="en-US"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/assign">Displays the selected cell range.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150441"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/assign">Displays the selected cell range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#shrink_maximize"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/add" id="bm_id3153951" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/add" id="bm_id3153951" localize="false"/>
 <h2 id="hd_id3153188">Add/Modify</h2>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/add">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153726"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/add">Adds the selected cell range to the database range list, or modifies an existing database range.</ahelp></paragraph>
 <embed href="text/shared/00/00000001.xhp#delete"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/more" id="bm_id3152596" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/definedatabaserangedialog/more" id="bm_id3152596" localize="false"/>
 <h2 id="hd_id3150010">More &gt;&gt;</h2>
-<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/more">Shows additional <link href="text/scalc/01/12010100.xhp">options</link>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153144"><ahelp hid="modules/scalc/ui/definedatabaserangedialog/more">Shows additional <link href="text/scalc/01/12010100.xhp">options</link>.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/01/12030000.xhp b/source/text/scalc/01/12030000.xhp
index afa2df1306..7e64f3f089 100644
--- a/source/text/scalc/01/12030000.xhp
+++ b/source/text/scalc/01/12030000.xhp
@@ -19,7 +19,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0112030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sort</title>
+<title id="tit">Sort</title>
 <filename>/text/scalc/01/12030000.xhp</filename>
 </topic>
 <history>
@@ -27,15 +27,15 @@
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/.uno:DataSort" id="bm_id3150084" localize="false"/>
+<bookmark branch="hid/.uno:DataSort" id="bm_id3150084" localize="false"/>
 <section id="sortheader">
 <h1 id="hd_id3150275"><link href="text/scalc/01/12030000.xhp">Sort</link></h1>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US"><variable id="sorttext"><ahelp hid=".uno:DataSort">Sorts the selected rows according to the conditions that you specify.</ahelp>
+<paragraph role="paragraph" id="par_id3155922"><variable id="sorttext"><ahelp hid=".uno:DataSort">Sorts the selected rows according to the conditions that you specify.</ahelp>
 </variable> $[officename] automatically recognizes and selects database ranges.</paragraph>
 </section>
 <note id="par_id3147428">You cannot sort data if the <link href="text/shared/01/02230000.xhp">Record changes</link> options is enabled.</note>
 <section id="howtoget">
-  <embed href="text/scalc/00/00000412.xhp#dnsrt"/>
+  <embed href="text/scalc/00/00000412.xhp#sort"/>
 </section>
 <embed href="text/scalc/01/12030100.xhp#sort_criteria"/>
 <embed href="text/scalc/01/12030200.xhp#options"/>
diff --git a/source/text/scalc/01/12030100.xhp b/source/text/scalc/01/12030100.xhp
index 554fbb4ea4..c4030b6386 100644
--- a/source/text/scalc/01/12030100.xhp
+++ b/source/text/scalc/01/12030100.xhp
@@ -51,8 +51,8 @@
 <paragraph role="paragraph" id="par_id3154018" xml-lang="en-US">Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Languages and Locales - General.</paragraph>
 <h3 id="hd_id3146972">Descending</h3>
 <paragraph role="paragraph" id="par_id3145640" xml-lang="en-US">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Languages and Locales - General.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SortAscending" id="bm_id1196545" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:SortDescending" id="bm_id1104741" localize="false"/>
+
+
 <h2 id="hd_id3150300">Sort Ascending/Descending</h2>
 <paragraph role="paragraph" id="par_id3158212" xml-lang="en-US"><ahelp hid="."><variable id="sytext">Sorts the selection from the highest to the lowest value, or from the lowest to the highest value. Number fields are sorted by size and text fields by the order of the characters. You can define the sort rules on Data - Sort - Options.</variable></ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Languages and Locales - General.</paragraph>
 <paragraph role="paragraph" id="par_id3159236" xml-lang="en-US">Icons on the <emph>Standard</emph> toolbar</paragraph>
diff --git a/source/text/scalc/main0112.xhp b/source/text/scalc/main0112.xhp
index dd0d084618..8fee120a6c 100644
--- a/source/text/scalc/main0112.xhp
+++ b/source/text/scalc/main0112.xhp
@@ -19,14 +19,14 @@
 <helpdocument version="1.0">
 <meta>
   <topic id="textscalcmain0112xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Data</title>
+    <title id="tit">Data</title>
     <filename>/text/scalc/main0112.xhp</filename>
   </topic>
 </meta>
 <body>
   <section id="data">
-    <bookmark xml-lang="en-US" branch="hid/.uno:DataMenu" id="bm_id9612414" localize="false"/><h1 id="hd_id3153254"><link href="text/scalc/main0112.xhp">Data</link></h1>
-    <paragraph role="paragraph" id="par_id3147264" xml-lang="en-US"><ahelp hid=".">Use the <emph>Data</emph> menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and create a pivot table.</ahelp></paragraph>
+    <bookmark branch="hid/.uno:DataMenu" id="bm_id9612414" localize="false"/><h1 id="hd_id3153254"><link href="text/scalc/main0112.xhp">Data</link></h1>
+    <paragraph role="paragraph" id="par_id3147264"><ahelp hid=".">Use the <emph>Data</emph> menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and create a pivot table.</ahelp></paragraph>
   </section>
   <embed href="text/scalc/01/12030000.xhp#sortheader"/>
   <embed href="text/shared/02/12010000.xhp#sortascending"/>
diff --git a/source/text/shared/02/12010000.xhp b/source/text/shared/02/12010000.xhp
index 510dea5545..fed4ac7ad7 100644
--- a/source/text/shared/02/12010000.xhp
+++ b/source/text/shared/02/12010000.xhp
@@ -19,25 +19,22 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0212010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sort Ascending</title>
+<title id="tit">Sort Ascending</title>
 <filename>/text/shared/02/12010000.xhp</filename>
 </topic>
 </meta>
 <body>
+<bookmark branch="hid/.uno:SortAscending" id="bm_id1196545" localize="false"/>
 <section id="sortascending">
 <h1 id="hd_id3152594"><link href="text/shared/02/12010000.xhp">Sort Ascending</link></h1>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sorts the data of the selected field in ascending order. </ahelp>Text fields are sorted alphabetically, numerical fields are sorted by number.<comment>UFI: Help ID .uno:Sortup is found in 	text/sdatabase/11090000.xhp so I deleted it here</comment></paragraph>
+<paragraph role="paragraph" id="par_id3150693"><ahelp hid=".">Sorts the data of the selected field or cell range in ascending order. </ahelp>Text fields are sorted alphabetically, numerical fields are sorted by number.<comment>UFI: Help ID .uno:Sortup is found in 	text/sdatabase/11090000.xhp so I deleted it here</comment></paragraph>
 </section>
 <section id="howtoget">
-    <switch select="appl"><case select="CALC">
-        <embed href="text/scalc/00/00000412.xhp#datasortascending"/>
-        <embed href="text/scalc/00/00000412.xhp#onthestandardbar"/>
-    </case></switch>
-    <embed href="text/scalc/00/00000412.xhp#sortascending"/>
+    <embed href="text/scalc/00/00000412.xhp#datasortascending1"/>
 </section>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US"><variable id="selektionsortieren">Data of the currently selected field are always sorted. A field is always selected as soon as you place the cursor in the field. To sort within tables, you can also click the corresponding column header.
+<paragraph role="paragraph" id="par_id3154380"><variable id="selektionsortieren">Data of the currently selected field are always sorted. A field is always selected as soon as you place the cursor in the field. To sort within tables, you can also click the corresponding column header.
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150504" xml-lang="en-US"><variable id="dialogsortieren">To sort more than one data field, choose <emph>Data - Sort</emph>, then choose the <link href="text/shared/02/12100100.xhp">Sort Criteria</link> tab, where you can combine several sort criteria.
+<paragraph role="paragraph" id="par_id3150504"><variable id="dialogsortieren">To sort more than one data field, choose <emph>Data - Sort</emph>, then choose the <link href="text/shared/02/12100100.xhp">Sort Criteria</link> tab, where you can combine several sort criteria.
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/12020000.xhp b/source/text/shared/02/12020000.xhp
index 82e080d39d..2988747bd0 100644
--- a/source/text/shared/02/12020000.xhp
+++ b/source/text/shared/02/12020000.xhp
@@ -19,22 +19,19 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0212020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Sort Descending</title>
+<title id="tit">Sort Descending</title>
 <filename>/text/shared/02/12020000.xhp</filename>
 </topic>
 </meta>
 <body>
+<bookmark branch="hid/.uno:SortDescending" id="bm_id1104741" localize="false"/>
+<bookmark branch="hid/.uno:SortDown" id="bm_id5470183" localize="false"/>
 <section id="sortdescending">
-<bookmark xml-lang="en-US" branch="hid/.uno:SortDown" id="bm_id5470183" localize="false"/>
 <h1 id="hd_id3154689"><link href="text/shared/02/12020000.xhp">Sort Descending</link></h1>
-<paragraph role="paragraph" id="par_id3149987" xml-lang="en-US"><ahelp hid=".uno:SortDown" visibility="hidden">Sorts the data of the selected field in descending order.</ahelp> Text fields are sorted alphabetically, number fields are sorted by number.</paragraph>
+<paragraph role="paragraph" id="par_id3149987"><ahelp hid=".uno:SortDown">Sorts the data of the selected field or cell range in descending order.</ahelp> Text fields are sorted alphabetically, number fields are sorted by number.</paragraph>
 </section>
 <section id="howtoget">
-    <switch select="appl"><case select="CALC">
-        <embed href="text/scalc/00/00000412.xhp#datasortdescending"/>
-        <embed href="text/scalc/00/00000412.xhp#onthestandardbar"/>
-    </case></switch>
-    <embed href="text/scalc/00/00000412.xhp#sortdescending"/>
+    <embed href="text/scalc/00/00000412.xhp#datasortdescending1"/>
 </section>
 <embed href="text/shared/02/12010000.xhp#selektionsortieren"/>
 <embed href="text/shared/02/12010000.xhp#dialogsortieren"/>