source/text/scalc/01/ful_func.xhp | 17 ++++++++++-------
source/text/scalc/01/func_sequence.xhp | 4 ++--
source/text/scalc/01/func_sort.xhp | 4 ++--
source/text/scalc/01/func_sortby.xhp | 6 +++---
source/text/scalc/01/func_unique.xhp | 6 +++---
source/text/scalc/01/func_xmatch.xhp | 4 ++--
6 files changed, 22 insertions(+), 19 deletions(-)
New commits:
commit c6956d32c0cfa26e219bd2e32f66d3fe7796ad76
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Jul 15 08:11:49 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Jul 15 17:08:11 2024 +0200
tdf#162025 Fix param separator of several functions
Change-Id: Ib4622836fbdfa5084edf38cd9fb13db815382c6d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/170494
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Jenkins
diff --git a/source/text/scalc/01/ful_func.xhp
b/source/text/scalc/01/ful_func.xhp
index 1681a65bc6..1a6ccda766 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -64,34 +64,37 @@
<comment>255 arguments</comment>
<paragraph role="paragraph" id="par_id71584446760037"><variable
id="string255_1">String 1 [; String 2 [; … [; String
255]]]</variable></paragraph>
<section id="string255">
- <paragraph role="paragraph" id="par_id631556228516997"><emph>String 1,
String 2, … , String 255</emph> are strings, references to cells or to cell
ranges of strings.</paragraph>
+ <paragraph role="paragraph" id="par_id631556228516997"><emph>String 1;
String 2; … ; String 255</emph> are strings, references to cells or to cell
ranges of strings.</paragraph>
</section>
<paragraph role="paragraph" id="par_id401584447957914"><variable
id="integer255_1">Integer 1 [; Integer 2 [; … [; Integer
255]]]</variable></paragraph>
<section id="integer255">
- <paragraph role="paragraph" id="par_id1001584395844941"><emph>Integer
1, Integer 2, … , Integer 255</emph> are integers, references to cells or to
cell ranges of integers.</paragraph>
+ <paragraph role="paragraph" id="par_id1001584395844941"><emph>Integer
1; Integer 2; … ; Integer 255</emph> are integers, references to cells or to
cell ranges of integers.</paragraph>
</section>
<paragraph role="paragraph" id="par_id101584447971004"><variable
id="number254_1">Number 1 [; Number 2 [; … [; Number
254]]]</variable></paragraph>
<section id="number254">
- <paragraph role="paragraph" id="par_id931584305947010"><emph>Number 1,
Number 2, … , Number 254</emph> are numbers, references to cells or to cell
ranges of numbers.</paragraph>
+ <paragraph role="paragraph" id="par_id931584305947010"><emph>Number 1;
Number 2; … ; Number 254</emph> are numbers, references to cells or to cell
ranges of numbers.</paragraph>
</section>
<paragraph role="paragraph" id="par_id101584447970004"><variable
id="number255_1">Number 1 [; Number 2 [; … [; Number
255]]]</variable></paragraph>
<section id="number255">
- <paragraph role="paragraph" id="par_id931584395947010"><emph>Number 1,
Number 2, … , Number 255</emph> are numbers, references to cells or to cell
ranges of numbers.</paragraph>
+ <paragraph role="paragraph" id="par_id931584395947010"><emph>Number 1;
Number 2; … ; Number 255</emph> are numbers, references to cells or to cell
ranges of numbers.</paragraph>
</section>
<paragraph role="paragraph" id="par_id291584447988879"><variable
id="logical255_1">Logical 1 [; Logical 2 [; … [; Logical
255]]]</variable></paragraph>
<section id="logical255">
- <paragraph role="paragraph" id="par_id931584395957010"><emph>Logical
1, Logical 2, … , Logical 255</emph> are boolean values, references to cells
or to cell ranges of logical values.</paragraph>
+ <paragraph role="paragraph" id="par_id931584395957010"><emph>Logical
1; Logical 2; … ; Logical 255</emph> are boolean values, references to cells
or to cell ranges of logical values.</paragraph>
</section>
<paragraph role="paragraph" id="par_id91584448008632"><variable
id="complex255_1">Complex 1 [; Complex 2 [; … [; Complex
255]]]</variable></paragraph>
<section id="complex255">
- <paragraph role="paragraph" id="par_id931584335947010"><emph>Complex
1, Complex 2, … ,Complex 255</emph> are complex numbers, references to cells or
to cell ranges of complex numbers. Complex numbers are entered in the form
"x+yi" or "x+yj". </paragraph>
+ <paragraph role="paragraph" id="par_id931584335947010"><emph>Complex
1; Complex 2; … ; Complex 255</emph> are complex numbers, references to cells
or to cell ranges of complex numbers. Complex numbers are entered in the form
"x+yi" or "x+yj". </paragraph>
</section>
<paragraph role="paragraph" id="par_id61584448028298"><variable
id="reference255_1">Reference 1 [; Reference 2 [; … [; Reference
255]]]</variable></paragraph>
<section id="reference255">
- <paragraph role="paragraph" id="par_id431584335947010"><emph>Reference
1, Reference 2, … ,Reference 255</emph> are references to cells.</paragraph>
+ <paragraph role="paragraph" id="par_id431584335947010"><emph>Reference
1; Reference 2; … ; Reference 255</emph> are references to cells.</paragraph>
</section>
<section id="func_volatile">
<paragraph role="paragraph" id="par_id1001601332672155">This function
is always recalculated whenever a recalculation occurs.</paragraph>
</section>
+ <section id="func_case_sensitive">
+ <note id="par_id711715953325962">The function is always <emph>case
insensitive</emph>, independent from the setting of <emph>Case sensitive</emph>
checkbox in <switchinline select="sys"><caseinline
select="MAC"><menuitem>%PRODUCTNAME -
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools -
Options</menuitem></defaultinline></switchinline> - <link
href="text/shared/optionen/01060500.xhp"><menuitem>%PRODUCTNAME Calc -
Calculate</menuitem></link>. You can however, use the mode modifier
<emph>(?-i)</emph> in <link href="text/shared/01/02100001.xhp">regular
expressions</link> to force search for a case-sensitive match.</note>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_sequence.xhp
b/source/text/scalc/01/func_sequence.xhp
index d4a91e3751..00537e7516 100644
--- a/source/text/scalc/01/func_sequence.xhp
+++ b/source/text/scalc/01/func_sequence.xhp
@@ -25,7 +25,7 @@
<paragraph id="par_id771708806478128" role="paragraph">Generate a list of
sequential numbers in an array.</paragraph>
</section>
<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
-<paragraph role="code" id="par_id211708281649651">SEQUENCE(Rows, Columns,
[Start], [Step])</paragraph>
+<paragraph role="code" id="par_id211708281649651">SEQUENCE(Rows; Columns [;
Start [; Step ] ])</paragraph>
<paragraph role="paragraph" id="par_id601714592655068"><emph>Rows</emph>: a
positive integer. The number of rows to return.</paragraph>
<paragraph role="paragraph" id="par_id521714592660164"><emph>Columns</emph>: a
positive integer. The number of columns to return.</paragraph>
<paragraph role="paragraph" id="par_id171714592664667"><emph>Start</emph>:
optional. The initial value of the sequence. If omitted, default is
1.</paragraph>
@@ -34,7 +34,7 @@
<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>
<paragraph role="paragraph" id="par_id61714595841660">The array is filled from
the first row to the right up to the value of <emph>Columns</emph>, and then
down to the number of rows.</paragraph>
<embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
-<paragraph role="paragraph"
id="par_id201714595986945"><input>{=SEQUENCE(3,3,10,11)}</input> returns the
3-by-3 array below with an upper-left value of 10 and filling the array to the
right and then downward in steps of 11.</paragraph>
+<paragraph role="paragraph" id="par_id201714595986945"><input>{=SEQUENCE(3; 3;
10; 11)}</input> returns the 3-by-3 array below with an upper-left value of 10
and filling the array to the right and then downward in steps of 11.</paragraph>
<table id="tab_id641714595997898">
<tablerow>
<tablecell>
diff --git a/source/text/scalc/01/func_sort.xhp
b/source/text/scalc/01/func_sort.xhp
index a771ccbfa2..807860d1aa 100644
--- a/source/text/scalc/01/func_sort.xhp
+++ b/source/text/scalc/01/func_sort.xhp
@@ -35,7 +35,7 @@
<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>
-<paragraph role="paragraph"
id="par_id131711466000482"><input>{=SORT(A2:C6,2,1)}</input> </paragraph>
+<paragraph role="paragraph"
id="par_id131711466000482"><input>{=SORT(A2:C6;2;1)}</input> </paragraph>
<paragraph role="paragraph" id="par_id471711472262161">Sort the range A2:C6
based on the second column in ascending order (Sales).</paragraph>
<table id="result01">
<tablerow>
@@ -95,7 +95,7 @@
</tablerow>
</table>
<h4 id="hd_id51711480751179">Example with descending order</h4>
-<paragraph role="paragraph"
id="par_id731711466320553"><input>{=SORT(A2:C6,3,-1)}</input> </paragraph>
+<paragraph role="paragraph"
id="par_id731711466320553"><input>{=SORT(A2:C6;3;-1)}</input> </paragraph>
<paragraph role="paragraph" id="par_id401711479167509">Sort the range A2:C6
based on the third column in descending order (Revenue).</paragraph>
<table id="result02">
<tablerow>
diff --git a/source/text/scalc/01/func_sortby.xhp
b/source/text/scalc/01/func_sortby.xhp
index 1f0f045a47..66a597afd1 100644
--- a/source/text/scalc/01/func_sortby.xhp
+++ b/source/text/scalc/01/func_sortby.xhp
@@ -25,10 +25,10 @@
<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>
diff --git a/source/text/scalc/01/func_unique.xhp
b/source/text/scalc/01/func_unique.xhp
index 845a64f193..2e222519d8 100644
--- a/source/text/scalc/01/func_unique.xhp
+++ b/source/text/scalc/01/func_unique.xhp
@@ -26,7 +26,7 @@
</section>
<embed href="text/scalc/01/ful_func.xhp#func_case_sensitive"/>
<embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
-<paragraph role="code" id="par_id211708281649651">UNIQUE(Array, [By col],
[Uniqueness])</paragraph>
+<paragraph role="code" id="par_id211708281649651">UNIQUE(Array [; By col [;
Uniqueness] ])</paragraph>
<paragraph role="paragraph" id="par_id381715698113514"><emph>Array</emph>: the
range or array from which to return unique values.</paragraph>
<paragraph role="paragraph" id="par_id311715698119400"><emph>By col</emph>:
(optional) a logical value that indicates how to compare data: TRUE - compares
data horizontally for a match of all cells in each column, across all columns.
FALSE or omitted (default) - compares data vertically, for a match of all cells
of each row, across all rows.</paragraph>
@@ -36,7 +36,7 @@
<paragraph role="paragraph" id="par_id471715980557106">Given the data table
below, the examples returns unique occurrences of grades and age.</paragraph>
<embed href="text/scalc/01/04060101.xhp#tbl_database_sample"/>
<h3 id="hd_id931715984553129">Example 1</h3>
-<paragraph role="paragraph"
id="par_id641715980827372"><input>{=UNIQUE(B1:C10,FALSE(),FALSE())}</input>
returns the array below. The grades and ages of the rows with name Andy and
Harry are returned only once. The same for rows with name Eva and
Irene.</paragraph>
+<paragraph role="paragraph" id="par_id641715980827372"><input>{=UNIQUE(B1:C10;
FALSE(); FALSE())}</input> returns the array below. The grades and ages of the
rows with name Andy and Harry are returned only once. The same for rows with
name Eva and Irene.</paragraph>
<table id="sample1">
<tablerow><tablecell><paragraph role="paragraph"
id="par_id641715983343641"><emph>Grade</emph></paragraph></tablecell><tablecell><paragraph
role="paragraph"
id="par_id511715983350731"><emph>Age</emph></paragraph></tablecell></tablerow>
<tablerow><tablecell><paragraph role="paragraph"
id="par_id751715983361251"
localize="false">3</paragraph></tablecell><tablecell><paragraph
role="paragraph" id="par_id51715983367115"
localize="false">9</paragraph></tablecell></tablerow>
@@ -48,7 +48,7 @@
<tablerow><tablecell><paragraph role="paragraph"
id="par_id391715983424898"
localize="false">1</paragraph></tablecell><tablecell><paragraph
role="paragraph" id="par_id951715983443729"
localize="false">7</paragraph></tablecell></tablerow>
</table>
<h3 id="hd_id981715984567844">Example 2</h3>
-<paragraph role="paragraph"
id="par_id801715981230387"><input>{=UNIQUE(B1:C10,FALSE(),TRUE())}</input>,
with <emph>Uniqueness</emph> as TRUE. Returns the array below with the rows of
Andy, Harry, Eva and Irene omitted because their combined grades and ages are
not unique.</paragraph>
+<paragraph role="paragraph" id="par_id801715981230387"><input>{=UNIQUE(B1:C10;
FALSE(); TRUE())}</input>, with <emph>Uniqueness</emph> as TRUE. Returns the
array below with the rows of Andy, Harry, Eva and Irene omitted because their
combined grades and ages are not unique.</paragraph>
<table id="sample2">
<tablerow><tablecell><paragraph role="paragraph"
id="par_id501715983764524"><emph>Grade</emph></paragraph></tablecell><tablecell><paragraph
role="paragraph"
id="par_id31715983773608"><emph>Age</emph></paragraph></tablecell></tablerow>
<tablerow><tablecell><paragraph role="paragraph"
id="par_id611715983782594"
localize="false">4</paragraph></tablecell><tablecell><paragraph
role="paragraph" id="par_id671715983787993"
localize="false">10</paragraph></tablecell></tablerow>
diff --git a/source/text/scalc/01/func_xmatch.xhp
b/source/text/scalc/01/func_xmatch.xhp
index 8a14e52a28..7817ca451f 100644
--- a/source/text/scalc/01/func_xmatch.xhp
+++ b/source/text/scalc/01/func_xmatch.xhp
@@ -55,8 +55,8 @@
<embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
<embed href="text/scalc/01/04060109.xhp#xmpl_periodic_elements"/>
-<paragraph role="paragraph" id="par_id471716753503759"><input>=XMATCH("Atomic
Number",A1:A4)</input> returns 3, the third line of the A1:A4 array.</paragraph>
-<paragraph role="paragraph"
id="par_id581716753499133"><input>=XMATCH("Li",A2:DO2)</input> returns 4, the
fourth column of the A2:DO2 array.</paragraph>
+<paragraph role="paragraph" id="par_id471716753503759"><input>=XMATCH("Atomic
Number"; A1:A4)</input> returns 3, the third line of the A1:A4
array.</paragraph>
+<paragraph role="paragraph" id="par_id581716753499133"><input>=XMATCH("Li";
A2:DO2)</input> returns 4, the fourth column of the A2:DO2 array.</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"/>
