source/text/scalc/00/00000412.xhp | 19 ++++++++++- source/text/scalc/01/12030100.xhp | 61 ++++++++++++++++++++------------------ source/text/scalc/01/12030200.xhp | 12 ++----- 3 files changed, 54 insertions(+), 38 deletions(-)
New commits: commit e472157173dd1f7a61c6e8889943cf4e84db2b4f Author: Olivier Hallot <[email protected]> AuthorDate: Sat Dec 13 22:58:21 2025 -0300 Commit: Olivier Hallot <[email protected]> CommitDate: Sun Dec 14 10:29:40 2025 +0100 tdf#167695 Update Calc Sort Criteria page + Align help page with current sort dialog. Change-Id: Ie6ee007410b621bf18d9927c7198b19d4d26bd9d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/195616 Reviewed-by: Olivier Hallot <[email protected]> Tested-by: Jenkins diff --git a/source/text/scalc/00/00000412.xhp b/source/text/scalc/00/00000412.xhp index 741c831b80..782be07209 100644 --- a/source/text/scalc/00/00000412.xhp +++ b/source/text/scalc/00/00000412.xhp @@ -149,8 +149,23 @@ </section> <section id="sort_criteria"> + <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> <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> + <embed href="text/shared/00/00000004.xhp#from_tabUI"/> + <paragraph role="paragraph" id="par_id811765674974680">On the <menuitem>Data</menuitem> tab, choose <menuitem>Sort</menuitem>.</paragraph> + <embed href="text/shared/00/00000004.xhp#from_toolbars"/> + <table id="tab_id231765675002662"> + <tablerow> + <tablecell> + <paragraph id="par_id61765675002662" role="paragraph"><image src="cmd/lc_datasort.svg" id="img_id851765675002662" width="1cm" height="1cm"><alt id="alt_id981765675002662">Icon Sort</alt></image></paragraph> + </tablecell> + <tablecell> + <paragraph id="par_id541765675002662" role="paragraph">Sort</paragraph> + </tablecell> + </tablerow> + </table> + </section> + <section id="sysort_criteria"> <section id="sortascending"> <table id="tbl_id3156023"> @@ -181,7 +196,7 @@ </table> </section> </section> - </section> + <section id="dnstot1"> <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> diff --git a/source/text/scalc/01/12030100.xhp b/source/text/scalc/01/12030100.xhp index c4030b6386..7c8a913891 100644 --- a/source/text/scalc/01/12030100.xhp +++ b/source/text/scalc/01/12030100.xhp @@ -19,43 +19,48 @@ <helpdocument version="1.0"> <meta> <topic id="textscalc0112030100xml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Sort Criteria</title> +<title id="tit">Sort Criteria</title> <filename>/text/scalc/01/12030100.xhp</filename> </topic> </meta> <body> -<section id="sort_criteria"> -<bookmark xml-lang="en-US" branch="index" id="bm_id3152350"><bookmark_value>sorting; sort criteria for database ranges</bookmark_value> +<bookmark branch="index" id="bm_id3152350"> +<bookmark_value>sorting; sort criteria for database ranges</bookmark_value> +<bookmark_value>sort by rows</bookmark_value> +<bookmark_value>sort by columns</bookmark_value> +<bookmark_value>rows;sorting</bookmark_value> +<bookmark_value>columns:sorting</bookmark_value> </bookmark> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortcriteriapage/SortCriteriaPage" id="bm_id3156326" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortcriteriapage/@@nowidget@@" id="bm_id3156326" localize="false"/> -<h1 id="hd_id3152350"><link href="text/scalc/01/12030100.xhp">Sort Criteria</link></h1> -<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US"><ahelp hid="modules/scalc/ui/sortcriteriapage/SortCriteriaPage">Specify the sorting options for the selected range.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/sortcriteriapage/SortCriteriaPage" id="bm_id3156326" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/sortcriteriapage/@@nowidget@@" id="bm_id3156326" localize="false"/> +<section id="sort_criteria"> + <h1 id="hd_id3152350"><variable id="h1"><link href="text/scalc/01/12030100.xhp">Sort Criteria</link></variable></h1> +<description id="par_id3151385"><ahelp hid="modules/scalc/ui/sortcriteriapage/SortCriteriaPage">Specify the sorting criteria and sorting direction for the selected range.</ahelp></description> </section> -<note id="par_id3152462">Ensure that you include any row and column titles in the selection.</note> <section id="howtoget"> <embed href="text/scalc/00/00000412.xhp#sort_criteria"/> </section> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortkey/@@nowidget@@" id="bm_id3147434" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortkey/SortKeyFrame" id="bm_id3147434" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortkey/sortlb" id="bm_id3147434" localize="false"/> -<h2 id="hd_id3147428">Sort by</h2> -<paragraph role="paragraph" id="par_id3155854" xml-lang="en-US"><ahelp hid="modules/scalc/ui/sortkey/sortlb">Select the column that you want to use as the primary sort key.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortkey/up" id="bm_id3153142" localize="false"/><h3 id="hd_id3146121">Ascending</h3> -<paragraph role="paragraph" id="par_id3148645" xml-lang="en-US"><ahelp hid="modules/scalc/ui/sortkey/up">Sorts the selection from the lowest value to the highest value. The sorting rules are given by the locale. You can define the sort rules on Data - Sort - Options.</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> -<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortkey/down" id="bm_id3149377" localize="false"/><h3 id="hd_id3155411">Descending</h3> -<paragraph role="paragraph" id="par_id3151075" xml-lang="en-US"><ahelp hid="modules/scalc/ui/sortkey/down">Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options.</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> -<h2 id="hd_id3154492">Then by</h2> -<paragraph role="paragraph" id="par_id3156283" xml-lang="en-US">Select the column that you want to use as the secondary sort key.</paragraph> -<h3 id="hd_id3149413">Ascending</h3> -<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 branch="hid/modules/scalc/ui/sortkey/@@nowidget@@" id="bm_id3147434" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/sortkey/SortKeyFrame" id="bm_id3147434" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/sortkey/sortlb" id="bm_id3147434" localize="false"/> +<h2 id="hd_id3147428">Sort Key 1, 2, 3, ...</h2> +<paragraph role="paragraph" id="par_id3155854"><ahelp hid="modules/scalc/ui/sortkey/sortlb">Select the column or row that you want to use as the primary, secondary or tertiary sort key.</ahelp> Sorting by rows or columns depends on the direction specified in the Sort Options below.</paragraph> +<note id="par_id881765670580519">In %PRODUCTNAME Calc, the sort dialog initially shows three sort criteria. When the last available sort key is used, the dialog expands to offer an additional sort criterion.</note> <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> -<embed href="text/scalc/00/00000412.xhp#sysort_criteria"/> +<paragraph role="paragraph" id="par_id3158212"><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 <menuitem>Data - Sort - Options</menuitem>.</variable></ahelp> You define the default on <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Languages and Locales - General.</menuitem></paragraph> + +<h2 id="hd_id631765671020476">Sort Options</h2> +<h3 id="hd_id821765671024524">Range contains columns labels</h3> +<paragraph role="paragraph" id="par_id701765672755330">Check to exclude the header row from the sorting range.</paragraph> +<h3 id="hd_id3152580">Direction</h3> +<bookmark branch="hid/modules/scalc/ui/sortcriteriapage/rbTopDown" id="bm_id3155507" localize="false"/> +<h4 id="hd_id3154201"> Top to Bottom (Sort Rows)</h4> +<paragraph role="paragraph" id="par_id3166430"><ahelp hid="modules/scalc/ui/sortcriteriapage/rbTopDown"> Sorts rows by the values in the active columns of the selected range.</ahelp></paragraph> +<bookmark branch="hid/modules/scalc/ui/sortcriteriapage/rbLeftRight" id="bm_id3155529" localize="false"/> +<h4 id="hd_id3145588"> Left to Right (Sort Columns)</h4> +<paragraph role="paragraph" id="par_id3154370"><ahelp hid="modules/scalc/ui/sortcriteriapage/leftright"> Sorts columns by the values in the active rows of the selected range.</ahelp></paragraph> +<section id="relatedtopics"> + <embed href="text/scalc/01/12030200.xhp#h1"/> +</section> </body> </helpdocument> diff --git a/source/text/scalc/01/12030200.xhp b/source/text/scalc/01/12030200.xhp index 05a38c4e11..aa75909ca1 100644 --- a/source/text/scalc/01/12030200.xhp +++ b/source/text/scalc/01/12030200.xhp @@ -38,7 +38,7 @@ <bookmark branch="hid/modules/scalc/ui/sortoptionspage/SortOptionsPage" id="bm_id3151044" localize="false"/> <bookmark branch="hid/modules/scalc/ui/sortoptionspage/@@nowidget@@" id="bm_id3151044" localize="false"/> <section id="options"> -<h1 id="hd_id3147228"><link href="text/scalc/01/12030200.xhp">Sort Options</link></h1> + <h1 id="hd_id3147228"><variable id="h1"><link href="text/scalc/01/12030200.xhp">Sort Options</link></variable></h1> <description id="par_id3153770"><ahelp hid="modules/scalc/ui/sortoptionspage/SortOptionsPage">Sets additional sorting options such as natural sorting, locale for sorting, handling columns boundaries, sort results location and more.</ahelp></description> </section> <section id="howtoget"> @@ -99,12 +99,8 @@ <bookmark branch="hid/modules/scalc/ui/sortoptionspage/algorithmlb" id="bm_id3150304" localize="false"/> <h3 id="hd_id3150344"> Options</h3> <paragraph role="paragraph" id="par_id3155113"><ahelp hid="modules/scalc/ui/sortoptionspage/algorithmlb"> Select a sorting option for the locale.</ahelp> For example, select the "phonebook" option for German to include the umlaut special character in the sorting.</paragraph> -<h2 id="hd_id3152580"> Direction</h2> -<bookmark branch="hid/modules/scalc/ui/sortoptionspage/topdown" id="bm_id3155507" localize="false"/> -<h3 id="hd_id3154201"> Top to Bottom (Sort Rows)</h3> -<paragraph role="paragraph" id="par_id3166430"><ahelp hid="modules/scalc/ui/sortoptionspage/topdown"> Sorts rows by the values in the active columns of the selected range.</ahelp></paragraph> -<bookmark branch="hid/modules/scalc/ui/sortoptionspage/leftright" id="bm_id3155529" localize="false"/> -<h3 id="hd_id3145588"> Left to Right (Sort Columns)</h3> -<paragraph role="paragraph" id="par_id3154370"><ahelp hid="modules/scalc/ui/sortoptionspage/leftright"> Sorts columns by the values in the active rows of the selected range.</ahelp></paragraph> +<section id="relatedtopics"> + <embed href="text/scalc/01/12030100.xhp#h1"/> +</section> </body> </helpdocument>
