source/text/scalc/01/func_randarray.xhp | 7 ++++--- source/text/scalc/01/func_sort.xhp | 12 ++++++------ source/text/scalc/01/func_sortby.xhp | 9 +++++---- 3 files changed, 15 insertions(+), 13 deletions(-)
New commits: commit 7b824f49fb1a71b173ed318241f99aeb7320eac0 Author: Olivier Hallot <olivier.hal...@libreoffice.org> AuthorDate: Mon May 27 14:46:51 2024 -0300 Commit: Olivier Hallot <olivier.hal...@libreoffice.org> CommitDate: Tue May 28 14:45:54 2024 +0200 tdf#159872 Review Help for SORT/SORTBY function + Fix syntax definition Change-Id: I9b24b25bdeb4298f6ba12f605b783324b3b921d1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168115 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> diff --git a/source/text/scalc/01/func_sort.xhp b/source/text/scalc/01/func_sort.xhp index e0f9b694c8..a771ccbfa2 100644 --- a/source/text/scalc/01/func_sort.xhp +++ b/source/text/scalc/01/func_sort.xhp @@ -26,12 +26,12 @@ </section> <note id="par_id131711543270539">Enter the formula as an <link href="text/scalc/01/04060107.xhp">array formula</link>.</note> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> -<paragraph role="code" id="par_id211708281649651">SORT(Range [, SortIndex[, SortOrder[, ByCol]]])</paragraph> -<paragraph role="paragraph" id="par_id551711457515235"><emph>Range:</emph> Required. The range or array to sort.</paragraph> -<paragraph role="paragraph" id="par_id151711457520290"><emph>SortIndex:</emph> Optional. The number indicating the row or column to sort by.</paragraph> -<paragraph role="paragraph" id="par_id131711457525811"><emph>SortOrder:</emph> Optional. A number indicating the desired sort order; 1 for ascending order (default), -1 for descending order.</paragraph> -<paragraph role="paragraph" id="par_id351711457531579"><emph>ByCol:</emph> Optional. A logical value indicating the desired sort direction; <emph>FALSE</emph> to sort by row (default), <emph>TRUE</emph> to sort by column.</paragraph> - +<paragraph role="code" id="par_id211708281649651">SORT(Range [; SortIndex [; SortOrder [; ByCol] ] ])</paragraph> +<paragraph role="paragraph" id="par_id551711457515235"><emph>Range:</emph> the range or array to sort.</paragraph> +<paragraph role="paragraph" id="par_id151711457520290"><emph>SortIndex:</emph> (optional). The number indicating the row or column to sort by.</paragraph> +<paragraph role="paragraph" id="par_id131711457525811"><emph>SortOrder:</emph> (optional). A number indicating the desired sort order; 1 for ascending order (default), -1 for descending order.</paragraph> +<paragraph role="paragraph" id="par_id351711457531579"><emph>ByCol:</emph> (optional). A logical value indicating the desired sort direction; <emph>FALSE</emph> to sort by row (default), <emph>TRUE</emph> to sort by column.</paragraph> +<embed href="text/scalc/01/common_func.xhp#optional_args"/> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> <embed href="text/scalc/01/ex_data_stat_func.xhp#ex_func_average_table"/> <h4 id="hd_id751711480783220">Example with ascending order</h4> diff --git a/source/text/scalc/01/func_sortby.xhp b/source/text/scalc/01/func_sortby.xhp index 332005731a..1f0f045a47 100644 --- a/source/text/scalc/01/func_sortby.xhp +++ b/source/text/scalc/01/func_sortby.xhp @@ -25,12 +25,13 @@ <paragraph id="par_id771708806478128" role="paragraph">Sorts the contents of a range or array based on the values in a corresponding range or array.</paragraph> </section> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> -<paragraph role="code" id="par_id211708281649651">SORTBY(Range, SortByRange1, SortOrder1[, SortByRange2, SortOrder2,[...]])</paragraph> +<paragraph role="code" id="par_id211708281649651">SORTBY(Range; SortByRange1; SortOrder1 [; SortByRange2; SortOrder2,[...] ])</paragraph> <paragraph role="paragraph" id="par_id451711544450734"><emph>Range</emph>: The array or range to sort.</paragraph> -<paragraph role="paragraph" id="par_id291711544460323"><emph>SortByRange1, SortByRange2,... </emph>: Range 1, range 2,... are the arrays or ranges to sort on.</paragraph> -<paragraph role="paragraph" id="par_id501711544465886"><emph>SortOrder1, SortOrder2,...</emph> : Order 1, order 2,... are the orders to use for sorting. 1 for ascending, -1 for descending. Default is ascending.</paragraph> +<paragraph role="paragraph" id="par_id291711544460323"><emph>SortByRange1, SortByRange2,... </emph>: range 1, range 2,... are the arrays or ranges to sort on.</paragraph> +<paragraph role="paragraph" id="par_id501711544465886"><emph>SortOrder1, SortOrder2,...</emph> : order 1, order 2,... are the orders to use for sorting. 1 for ascending, -1 for descending. Default is ascending.</paragraph> +<embed href="text/scalc/01/common_func.xhp#optional_args"/> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> -<paragraph role="paragraph" id="par_id131711466000482"><input>{=SORTBY(A2:C7,A2:A7,1,C2:C7,-1)}</input></paragraph> +<paragraph role="paragraph" id="par_id131711466000482"><input>{=SORTBY(A2:C7;A2:A7;1;C2:C7;-1)}</input></paragraph> <paragraph role="paragraph" id="par_id471711472262161">Sort the range A2:C7 based on the first column in ascending order and third column in descending order.</paragraph> <embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> <embed href="text/scalc/00/avail_release.xhp#24.8"/> commit 99ebed65db57abb67aa4765f636de2c3c60c10a9 Author: Olivier Hallot <olivier.hal...@libreoffice.org> AuthorDate: Mon May 27 13:22:38 2024 -0300 Commit: Olivier Hallot <olivier.hal...@libreoffice.org> CommitDate: Tue May 28 14:45:40 2024 +0200 tdf#159872 Review Help for RANDARRAY function + Fix syntax definition Change-Id: I9acde26c9d6237409813939b1bd1c23e3d61f862 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/168110 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org> diff --git a/source/text/scalc/01/func_randarray.xhp b/source/text/scalc/01/func_randarray.xhp index 1a746c97e0..9ec298ad44 100644 --- a/source/text/scalc/01/func_randarray.xhp +++ b/source/text/scalc/01/func_randarray.xhp @@ -18,14 +18,14 @@ <body> <bookmark id="bm_id221708806478124" branch="hid/SC_HID_FUNC_RANDARRAY_MS" localize="false"/> <bookmark branch="index" id="bm_id361708283183878"> - <bookmark_value>RANDARRAY function</bookmark_value> +<bookmark_value>RANDARRAY function</bookmark_value> </bookmark> <section id="randarray"> <h1 id="hd_id901708806478126"><variable id="h1"><link href="text/scalc/01/func_randarray.xhp">RANDARRAY</link></variable></h1> <paragraph id="par_id771708806478128" role="paragraph">Generates an array of random numbers between two limit values.</paragraph> </section> <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/> -<paragraph role="code" id="par_id211708281649651">RANDARRAY([Rows], [Columns], [Min], [Max], [Integers])</paragraph> +<paragraph role="code" id="par_id211708281649651">RANDARRAY([Rows [; Columns [; Min [; Max [; Integers] ] ] ])</paragraph> <paragraph role="paragraph" id="par_id101715616072623"><emph>Rows</emph>: (optional) the number of rows to return. If omitted, the value is 1.</paragraph> <paragraph role="paragraph" id="par_id271715616076797"><emph>Columns</emph>: (optional) the number of columns to return. If omitted, the value is 1.</paragraph> <paragraph role="paragraph" id="par_id171715616081037"><emph>Min</emph>: (optional) The lower limit of the generated numbers. If omitted, the minimum value is 0.</paragraph> @@ -33,8 +33,9 @@ <paragraph role="paragraph" id="par_id511715616090373"><emph>Integers</emph>: (optional) returns whole numbers (TRUE) or decimal numbers (FALSE). Default is FALSE.</paragraph> <note id="par_id821708357634624">If <emph>Rows</emph> and <emph>Columns</emph> are greater than 1, the RANDARRAY function must be entered as an <link href="text/scalc/01/04060107.xhp#creating_array_formulas">array formula</link>.</note> <paragraph role="paragraph" id="par_id141715790327107">If <emph>Rows</emph> or <emph>Columns</emph> are references to the content of other cells, the array dimensions do not change when the referenced content changes. The array formula must be deleted and re-entered.</paragraph> +<embed href="text/scalc/01/common_func.xhp#optional_args"/> <embed href="text/scalc/01/ful_func.xhp#func_head_example"/> -<paragraph role="paragraph" id="par_id521715616457946"><input>{=RANDARRAY(10,4,10,50,1)}</input> returns an array of 10 rows, 4 columns with minimum value 10 and maximum value of 50 of whole numbers (integers).</paragraph> +<paragraph role="paragraph" id="par_id521715616457946"><input>{=RANDARRAY(10;4;10;50;1)}</input> returns an array of 10 rows, 4 columns with minimum value 10 and maximum value of 50 of whole numbers (integers).</paragraph> <embed href="text/scalc/01/common_func.xhp#sectiontechinfo"/> <embed href="text/scalc/00/avail_release.xhp#24.8"/> <embed href="text/scalc/01/common_func.xhp#notODFF"/>