tdf#131360 Adjust number of function parameters

fix for AGGREGATE, GCD_EXCEL2003, LCM_EXCEL2003
MULTINOMIAL, RAWSUBTRACT, SUMIFS, AVERAGEIFS, COUNTIFS,
MAXIFS, MINIFS, IFS, SWITCH

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

7 files changed, 30 insertions, 39 deletions

diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index 94bef60362..a34aba2f39 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -515,17 +515,13 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3151221">
   <bookmark_value>GCD_EXCEL2003 function</bookmark_value>
 </bookmark>
-
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_GCD" id="bm_id3147578" localize="false"/>
-
 <h2 id="hd_id3151221">GCD_EXCEL2003</h2>
 <paragraph id="par_id3153257" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_GCD">The result is the greatest common divisor of a list of numbers.</ahelp></paragraph>
 <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3156205" role="code" xml-lang="en-US">GCD_EXCEL2003(Number(s))</paragraph>
-<paragraph id="par_id3145150" role="paragraph" xml-lang="en-US"><emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
-
+<paragraph id="par_id3156205" role="code" xml-lang="en-US">GCD_EXCEL2003(<embedvar href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#number255"/>
 <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
 <paragraph id="par_id3159192" role="paragraph" xml-lang="en-US"><item type="input">=GCD_EXCEL2003(5;15;25)</item> returns 5.</paragraph>
 </section>
@@ -554,17 +550,13 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154230">
   <bookmark_value>LCM_EXCEL2003 function</bookmark_value>
 </bookmark>
-
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_LCM" id="bm_id3147222" localize="false"/>
-
 <h2 id="hd_id3154230">LCM_EXCEL2003</h2>
 <paragraph id="par_id3149036" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_LCM">The result is the lowest common multiple of a list of numbers.</ahelp></paragraph>
 <embed href="text/scalc/01/04060102.xhp#ADD_note"/>
-
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3154395" role="code" xml-lang="en-US">LCM_EXCEL2003(Number(s))</paragraph>
-<paragraph id="par_id3147377" role="paragraph" xml-lang="en-US"><emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
-
+<paragraph id="par_id3154395" role="code" xml-lang="en-US">LCM_EXCEL2003(<embedvar href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#number255"/>
 <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
 <paragraph id="par_id3145135" role="paragraph" xml-lang="en-US"><item type="input">=LCM_EXCEL2003(5;15;25)</item> returns 75.</paragraph>
 </section>
@@ -817,16 +809,12 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152418">
   <bookmark_value>MULTINOMIAL function</bookmark_value>
 </bookmark>
-
 <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_MULTINOMIAL" id="bm_id3152429" localize="false"/>
-
 <h2 id="hd_id3152418">MULTINOMIAL</h2>
 <paragraph id="par_id3152454" role="paragraph" xml-lang="en-US"><ahelp hid="HID_AAI_FUNC_MULTINOMIAL">Returns the factorial of the sum of the arguments divided by the product of the factorials of the arguments.</ahelp></paragraph>
-
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3155660" role="code" xml-lang="en-US">MULTINOMIAL(Number(s))</paragraph>
-<paragraph id="par_id3155673" role="paragraph" xml-lang="en-US"><emph>Number(s)</emph> is a list of up to 30 numbers.</paragraph>
-
+<paragraph id="par_id3155660" role="code" xml-lang="en-US">MULTINOMIAL(<embedvar href="text/scalc/01/ful_func.xhp#number255_1" markup="keep"/>)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#number255"/>
 <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
 <paragraph id="par_id3155701" role="paragraph" xml-lang="en-US"><item type="input">=MULTINOMIAL(F11:H11)</item> returns 1260, if F11 to H11 contain the values <item type="input">2</item>, <item type="input">3</item> and <item type="input">4</item>. This corresponds to the formula =(2+3+4)! / (2!*3!*4!)</paragraph>
 </section>
diff --git a/source/text/scalc/01/ex_data_stat_func.xhp b/source/text/scalc/01/ex_data_stat_func.xhp
index c43dd90897..8a43857384 100644
--- a/source/text/scalc/01/ex_data_stat_func.xhp
+++ b/source/text/scalc/01/ex_data_stat_func.xhp
@@ -121,7 +121,7 @@
 </table>
 <warning id="par_id1191767622119">In all examples below, ranges for calculation contain the row #6, which is ignored because it contains text.</warning>
 </section>
-<paragraph role="paragraph" id="par_id961527953004850" xml-lang="en-US"><variable id="args">Func_Range; Range1; Criterion1 [ ; Range2; Criterion2 [;...]])</variable></paragraph>
+<paragraph role="paragraph" id="par_id961527953004850" xml-lang="en-US"><variable id="args">Func_Range; Range1; Criterion1[; Range2; Criterion2][; … ; [Range127; Criterion127]]</variable></paragraph>
 <section id="note01">
     <note id="par_id94162948227556">The logical relation between criteria can be defined as logical AND (conjunction). In other words, if and only if all given criteria are met, a value from the corresponding cell of the given <emph>Func_Range</emph> is taken into calculation.</note>
 </section>
@@ -129,6 +129,7 @@
     <paragraph id="par_id14734320631377" role="paragraph" xml-lang="en-US"><emph>Func_Range</emph> and <emph>Range1, Range2...</emph> must have the same size, otherwise the function returns err:502 - Invalid argument.</paragraph>
 </section>
 <section id="par00">
+    <paragraph id="par_id101585468691583" role="paragraph" xml-lang="en-US"><emph>Range1</emph> – required argument. It is a range of cells, a name of a named range, or a label of a column or a row, to which the corresponding criterion is to be applied.</paragraph>
     <paragraph id="par_id23526994221948" role="paragraph" xml-lang="en-US"><emph>Criterion1</emph> – required argument. A string expression representing a logical condition or a cell reference to such string expression. The expression can contain text, numbers, regular expressions or wildcards (<link href="text/shared/optionen/01060500.xhp#wildcards" name="Wild cards">if enabled in calculation options</link>).</paragraph>
     <paragraph id="par_id190621657742" role="paragraph" xml-lang="en-US"><emph>Range2</emph> – Optional. Range2 and all the following mean the same as Range1.</paragraph>
     <paragraph id="par_id317001803813193" role="paragraph" xml-lang="en-US"><emph>Criterion2</emph> – Optional. Criterion2 and all the following mean the same as Criterion1.</paragraph>
diff --git a/source/text/scalc/01/func_aggregate.xhp b/source/text/scalc/01/func_aggregate.xhp
index ba8ce64ec0..9e899b4d85 100644
--- a/source/text/scalc/01/func_aggregate.xhp
+++ b/source/text/scalc/01/func_aggregate.xhp
@@ -14,26 +14,23 @@
     <filename>/text/scalc/01/func_aggregate.xhp</filename>
   </topic>
 </meta>
-
 <body>
-
-
 <section id="aggregate_function">
 <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_AGGREGATE" id="bm_id13660154375100" localize="false"/>
 <bookmark xml-lang="en-US" branch="index" id="bm_id126123001625791">
   <bookmark_value>AGGREGATE function</bookmark_value>
 </bookmark>
-
-
 <paragraph id="hd_id3154073" role="heading" level="1" xml-lang="en-US"><variable id="aggregate_head"><link href="text/scalc/01/func_aggregate.xhp">AGGREGATE</link></variable> function</paragraph>
 <paragraph id="par_id2209201514174373" role="paragraph" xml-lang="en-US"><ahelp hid="."><variable id="aggregate_des">This function returns an aggregate result of the calculations in the range. You can use different aggregate functions listed below. The Aggregate function enables you to omit hidden rows, errors, SUBTOTAL and other AGGREGATE function results in the calculation.</variable></ahelp></paragraph>
 </section>
 <paragraph id="par_id2209201514174453" role="note" xml-lang="en-US">AGGREGATE function is applied to vertical ranges of data with activated AutoFilter. If AutoFilter is not activated, automatic recalculation of the function result does not work for newly hidden rows. It is not supposed to work with horizontal ranges, however it can be applied to them as well, but with limitations. In particular, the AGGREGATE function applied to a horizontal data range does not recognize hiding columns, however correctly omits errors and results of SUBTOTAL and other AGGREGATE functions embedded into the row. </paragraph>
 <embed href="text/scalc/00/avail_release.xhp#4.4"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id200801176228491" role="code" xml-lang="en-US">AGGREGATE(Function; Option; Ref1 [; Ref2 [; …]])</paragraph>
+
+<paragraph id="par_id200801176228491" role="code" xml-lang="en-US">AGGREGATE(Function; Option; Number 1[; Number 2][; ... ;[Number 253]])</paragraph>
 <paragraph id="par_id2309201516102726" role="paragraph" xml-lang="en-US">or</paragraph>
-<paragraph id="par_id30181907128680" role="code" xml-lang="en-US">AGGREGATE(Function; Option; Array [; k])</paragraph>
+<paragraph id="par_id30181907128680" role="code" xml-lang="en-US">AGGREGATE(Function; Option; Array[; k])</paragraph>
+
 <paragraph id="par_id2209201514174378" role="paragraph" xml-lang="en-US"><emph>Function</emph> – obligatory argument. A function index or a reference to a cell with value from 1 to 19, in accordance with the following table. </paragraph>
 
 <table id="table_functions_aggregate">
@@ -276,11 +273,11 @@
   </tablerow>
 </table>
 
-<paragraph id="par_id220402843321947" role="paragraph" xml-lang="en-US"><emph>Ref1</emph> – obligatory argument. The first numeric argument (if the range is set by a list of values inside the function) or a reference to a cell that contains it. </paragraph>
-<paragraph id="par_id2309201514193338" role="paragraph" xml-lang="en-US"><emph>Ref2, 3, ...</emph> – optional. A numeric argument or a reference to a cell (up to 253 arguments), for which you need the aggregate value.</paragraph>
-<paragraph id="par_id99381371214702" role="paragraph" xml-lang="en-US"><emph>Array</emph> – obligatory argument. The array can be specified by the boundaries of the range, the name of the named range or the column label.</paragraph>
+<paragraph id="par_id220402843321947" role="paragraph" xml-lang="en-US"><emph>Number1</emph> – required argument. The first numeric argument (if the range is set by a list of values inside the function) or a reference to a cell that contains it. </paragraph>
+<paragraph id="par_id2309201514193338" role="paragraph" xml-lang="en-US"><emph>Number2, 3, ...</emph> – optional. A numeric argument or a reference to a cell (up to 253 arguments), for which you need the aggregate value.</paragraph>
+<paragraph id="par_id99381371214702" role="paragraph" xml-lang="en-US"><emph>Array</emph> – required argument. The array can be specified by the boundaries of the range, the name of the named range or the column label.</paragraph>
 <paragraph id="par_id2309201515555812" role="note" xml-lang="en-US">For using column labels “Automatically find columns and rows labels” function needs to be enabled.</paragraph>
-<paragraph id="par_id2209201514174370" role="paragraph" xml-lang="en-US"><emph>k</emph> – obligatory argument for the following functions: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC. It is a numeric argument, which must correspond to the second argument of these functions.</paragraph>
+<paragraph id="par_id2209201514174370" role="paragraph" xml-lang="en-US"><emph>k</emph> – required argument for the following functions: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC. It is a numeric argument, which must correspond to the second argument of these functions.</paragraph>
 
 <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
 
diff --git a/source/text/scalc/01/func_countifs.xhp b/source/text/scalc/01/func_countifs.xhp
index 71517c8246..8d57b125ca 100644
--- a/source/text/scalc/01/func_countifs.xhp
+++ b/source/text/scalc/01/func_countifs.xhp
@@ -29,8 +29,8 @@
 </section>
 <embed href="text/scalc/00/avail_release.xhp#4.0"/>
 <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id27421466710275" role="code" xml-lang="en-US">COUNTIFS(Range1; Criterion1 [; Range2; Criterion2 [; ...]])</paragraph>
-<paragraph id="par_id242131304318587" role="paragraph" xml-lang="en-US"><emph>Range1</emph> – required argument. It is a range of cells, a name of a named range or a label of a column or a row containing values for counting and finding the corresponding criterion.</paragraph>
+
+<paragraph id="par_id27421466710275" role="code" xml-lang="en-US">COUNTIFS(Range1; Criterion1[; Range2; Criterion2][; ... ; [Range127; Criterion127]])</paragraph>
 <embed href="text/scalc/01/ex_data_stat_func.xhp#par00"/>
 <embed href="text/shared/00/00000001.xhp#regulaer"/>
 <paragraph role="paragraph" id="par_id14734320631377"><emph>Range1, Range2, ...</emph> and <emph>Criterion1, Criterion2, ...</emph> must have the same size, otherwise the function returns err:502 - Invalid argument.</paragraph>
diff --git a/source/text/scalc/01/func_ifs.xhp b/source/text/scalc/01/func_ifs.xhp
index 61349e747b..08f55172be 100644
--- a/source/text/scalc/01/func_ifs.xhp
+++ b/source/text/scalc/01/func_ifs.xhp
@@ -26,7 +26,8 @@
     </section>
     <embed href="text/scalc/00/avail_release.xhp#5.2"/>
     <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
-    <paragraph role="code" id="par_id271556235333493">IFS( expression1, result1[, expression2, result2][, …] )</paragraph>
+
+    <paragraph role="code" id="par_id271556235333493">IFS(expression1; result1[; expression2; result2][; ... ; [expression127; result127]])</paragraph>
     <paragraph role="paragraph" id="par_id31556235655212"><emph>expression1, expression2, ...</emph> are any boolean values or expressions that can be TRUE or FALSE</paragraph>
     <paragraph role="paragraph" id="par_id441556235649549"><emph>result1, result2, ... </emph> are the values that are returned if the logical test is TRUE</paragraph>
     <paragraph role="paragraph" id="par_id641556235704257">IFS( expression1, result1, expression2, result2, expression3, result3 ) is executed as</paragraph>
diff --git a/source/text/scalc/01/func_rawsubtract.xhp b/source/text/scalc/01/func_rawsubtract.xhp
index 3ce5a64646..4bf0ed013c 100644
--- a/source/text/scalc/01/func_rawsubtract.xhp
+++ b/source/text/scalc/01/func_rawsubtract.xhp
@@ -26,11 +26,13 @@
         <paragraph id="par_2016112109232" role="paragraph" xml-lang="en-US"><ahelp hid=".">Subtracts a set of numbers and gives the result without eliminating small roundoff errors.</ahelp></paragraph>
     </section>
     <embed href="text/scalc/00/avail_release.xhp#5.2"/>
-    <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
-    <paragraph id="par_2016112109233" role="code" xml-lang="en-US">RAWSUBTRACT(Minuend, Subtrahend1, Subtrahend2, ...)</paragraph>
-    <paragraph id="par_2016112109234" role="paragraph" xml-lang="en-US">Subtracts the subtrahend(s) from the minuend without eliminating roundoff errors. The function should be called with at least two parameters.</paragraph>
-    <embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
-    <paragraph id="par_2016112109235" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765, 0.9876543210987)</item> returns 6.53921361504217E-14</paragraph>
+    <embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
+    <paragraph id="par_2016112109233" role="code" xml-lang="en-US">RAWSUBTRACT(Minuend; Subtrahend 1[; Subtrahend 2][; … ;[ Subtrahend 254]])</paragraph>
+    <paragraph id="par_2016112109234" role="paragraph" xml-lang="en-US"><emph>Minuend</emph> is a number or a reference to a cell containing a number.</paragraph>
+    <paragraph id="par_id241585352178687" role="paragraph" xml-lang="en-US"><emph>Subtrahend 1[; Subtrahend 2][; ... ;[ Subtrahend 254]]</emph> are numbers or references to cells containing numbers.</paragraph>
+    <paragraph id="par_2016112109235" role="paragraph" xml-lang="en-US">The function should be called with at least two parameters.</paragraph>
+    <embed href="text/scalc/01/common_func.xhp#sectionexample"/>
+    <paragraph id="par_2016112109236" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765, 0.9876543210987)</item> returns 6.53921361504217E-14</paragraph>
     <paragraph id="par_2016112109237" role="paragraph" xml-lang="en-US"><item type="literal">RAWSUBTRACT(0.987654321098765)</item> returns Err:511 (Missing variable) because RAWSUBTRACT requires a minimum of two numbers. </paragraph>
 </section>
 </body>
diff --git a/source/text/scalc/01/func_switch.xhp b/source/text/scalc/01/func_switch.xhp
index 2c162d2ae5..f337953c94 100644
--- a/source/text/scalc/01/func_switch.xhp
+++ b/source/text/scalc/01/func_switch.xhp
@@ -26,7 +26,9 @@
     </section>
     <embed href="text/scalc/00/avail_release.xhp#5.2"/>
     <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
-    <paragraph role="code" id="par_id521556242803283">SWITCH( expression, value1, result1[, value2, result2][, … ][, default_result] )</paragraph>
+
+    <paragraph role="code" id="par_id521556242803283">SWITCH(expression; value1; result1[; value2; result2][; ... ; [value127; result127][; default_result]])</paragraph>
+    <tip id="par_id111585520651521">If you choose not to specify a default result, 127 value / result pairs may be entered as parameters. If you choose to include a default result at the end of the list of parameters, then only 126 value / result pairs may be entered.</tip>
     <paragraph role="paragraph" id="par_id341556242996378"><emph>expression</emph> is a text, numeric, logical or date input or reference to a cell.</paragraph>
     <paragraph role="paragraph" id="par_id321556243790332"><emph>value1, value2, ...</emph>  is any value or reference to a cell. Each value must have a result given.</paragraph>
     <paragraph role="paragraph" id="par_id171556243796068"><emph>result1, result2, ...</emph> is any value or reference to a cell.</paragraph>