source/text/scalc/01/04060110.xhp | 5 --
source/text/scalc/01/ful_func.xhp | 73 ++++++++++++++++++---------------
source/text/scalc/01/func_concat.xhp | 4 -
source/text/scalc/01/func_textjoin.xhp | 4 -
4 files changed, 47 insertions(+), 39 deletions(-)
New commits:
commit 5708e58ddae44ea7c5f5ad2f76b47be980b53b80
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Mar 17 08:11:45 2020 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Wed Mar 18 20:52:16 2020 +0100
tdf#131360,tdf#131361 (part) 256 arguments
- update argument limit from 30 to 256
- create embeddedable text reusable for many functions
listed in tdf#131360 and tdf#131261 when arguments
are strings, integes, numbers, logicals, complex and references
- with reduced translation job
- fixes CONCAT, TEXTJOIN and CONCATENATE with String arguments.
Change-Id: I8a32914c5ef31d796a21cf2ee705b92de7b58f90
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/90613
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/01/04060110.xhp
b/source/text/scalc/01/04060110.xhp
index 5e24c67a8..b9ad5ab2e 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -196,9 +196,8 @@
<paragraph id="par_id3154524" role="paragraph" xml-lang="en-US"><ahelp
hid="HID_FUNC_VERKETTEN">Combines several text strings into one
string.</ahelp></paragraph>
<embed href="text/scalc/01/common_func.xhp#sectionsyntax"/>
-<paragraph id="par_id3155954" role="code"
xml-lang="en-US">CONCATENATE("Text1"; ...; "Text30")</paragraph>
-<paragraph id="par_id3146847" role="paragraph" xml-lang="en-US"> <emph>Text 1;
Text 2; ...</emph> represent up to 30 text passages which are to be combined
into one string.</paragraph>
-
+<paragraph id="par_id3155954" role="code" xml-lang="en-US">CONCATENATE(
<embedvar href="text/scalc/01/ful_func.xhp#string256_1" markup="keep"/>
)</paragraph>
+<embed href="text/scalc/01/ful_func.xhp#string256"/>
<embed href="text/scalc/01/common_func.xhp#sectionexample"/>
<paragraph id="par_id3150008" role="paragraph" xml-lang="en-US"> <item
type="input">=CONCATENATE("Good ";"Morning ";"Mrs. ";"Doe")</item> returns:
Good Morning Mrs. Doe.</paragraph>
</section>
diff --git a/source/text/scalc/01/ful_func.xhp
b/source/text/scalc/01/ful_func.xhp
index f0bd195d8..79934d07c 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -16,50 +16,59 @@
<body>
<comment> Title in descriptions of functions </comment>
<section id="func_head_syntax">
- <paragraph id="hd_id126511265112651" role="heading" level="3"
xml-lang="en-US">
- Syntax
- </paragraph>
+ <h3 id="hd_id126511265112651">Syntax</h3>
</section>
<section id="func_head_example">
- <paragraph id="hd_id980889808898088" role="heading" level="3"
xml-lang="en-US">
- Examples
- </paragraph>
+ <h3 id="hd_id980889808898088">Examples</h3>
</section>
<comment> Notes for functions </comment>
- <paragraph id="par_id2595283314097" role="note" xml-lang="en-US">
- <variable id="func_im_comp_numb">
- A <emph>complex number</emph> is a string expression
resulting in the form "a+bi" or "a+bj", where a and b are numbers.
- </variable>
- </paragraph>
- <paragraph id="par_id26516178768369" role="note" xml-lang="en-US">
- <variable id="func_im_real_numb">
- If the <emph>complex number</emph> is actually a real
number (b=0), then it can be either a string expression or a number value.
- </variable>
- </paragraph>
+ <note id="par_id2595283314097">
+ <variable id="func_im_comp_numb">A <emph>complex number</emph>
is a string expression resulting in the form "a+bi" or "a+bj", where a and b
are numbers.</variable>
+ </note>
+ <note id="par_id26516178768369">
+ <variable id="func_im_real_numb">If the <emph>complex
number</emph> is actually a real number (b=0), then it can be either a string
expression or a number value.</variable>
+ </note>
<comment>Warnings for functions </comment>
- <paragraph id="par_id1566939488738" role="warning" xml-lang="en-US">
- <variable id="func_im_return_text">
- The function always returns a string representing a
complex number.
- </variable>
- </paragraph>
- <paragraph id="par_id9623767621137" role="warning" xml-lang="en-US">
- <variable id="func_im_ignor_zero">
- If the result is a complex number with one of its parts
(a or b) equal to zero, that part is not displayed.
- </variable>
- </paragraph>
+ <warning id="par_id1566939488738">
+ <variable id="func_im_return_text">The function always returns
a string representing a complex number.</variable>
+ </warning>
+ <warning id="par_id9623767621137">
+ <variable id="func_im_ignor_zero">If the result is a complex
number with one of its parts (a or b) equal to zero, that part is not
displayed.</variable>
+ </warning>
<comment> Other paragraphs </comment>
<paragraph id="par_id962376732432" role="paragraph" xml-lang="en-US">
- <variable id="func_imag_zero">
- The imaginary part is equal to zero, so it is not
displayed in the result.
- </variable>
+ <variable id="func_imag_zero">The imaginary part is equal to
zero, so it is not displayed in the result.</variable>
</paragraph>
<section id="func_im_des">
- <paragraph id="par_id29750345314640" role="paragraph"
xml-lang="en-US">
- The result is presented in the string format and has
the character "i" or "j" as an imaginary unit.
- </paragraph>
+ <paragraph id="par_id29750345314640" role="paragraph"
xml-lang="en-US">The result is presented in the string format and has the
character "i" or "j" as an imaginary unit.</paragraph>
</section>
+ <comment>256 arguments</comment>
+ <paragraph role="paragraph" id="par_id71584446760037"><variable
id="string256_1">String 1[, String 2][, … ,[String 256]]</variable></paragraph>
+ <section id="string256">
+ <paragraph role="paragraph" id="par_id631556228516997"><emph>String
1[, String 2][, … ,[String 256]]</emph> are strings, references to cells or to
cell ranges of strings.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id401584447957914"><variable
id="integer256_1">Integer 1[, Integer 2][, … ,[Integer
256]]</variable></paragraph>
+ <section id="integer256">
+ <paragraph role="paragraph" id="par_id1001584395844941"><emph>Integer
1[, Integer 2][, … ,[Integer 256]]</emph> are integers, references to cells or
to cell ranges of integers.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id101584447970004"><variable
id="number256_1">Number 1[, Number 2][, … ,[Number 256]]</variable></paragraph>
+ <section id="number256">
+ <paragraph role="paragraph" id="par_id931584395947010"><emph>Number
1[, Number 2][, … ,[Number 256]]</emph> are numbers, references to cells or to
cell ranges of numbers.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id291584447988879"><variable
id="logical256_1">Logical 1[, Logical 2][, … ,[Logical
256]]</variable></paragraph>
+ <section id="logical256">
+ <paragraph role="paragraph" id="par_id931584395957010"><emph>Logical
1[, Logical 2][, … ,[Logical 256]]</emph> are boolean values, references to
cells or to cell ranges of logical values.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id91584448008632"><variable
id="complex256_1">Complex 1[, Complex 2][, … ,[Complex
256]]</variable></paragraph>
+ <section id="complex256">
+ <paragraph role="paragraph" id="par_id931584335947010"><emph>Complex
1[, Complex 2][, … ,[Complex 256]]</emph> are complex numbers, references to
cells or to cell ranges of complex numbers.</paragraph>
+ </section>
+ <paragraph role="paragraph" id="par_id61584448028298"><variable
id="reference256_1">Reference 1[, Reference 2][, … ,[Reference
256]]</variable></paragraph>
+ <section id="reference256">
+ <paragraph role="paragraph" id="par_id431584335947010"><emph>Reference
1[, Reference 2][, … ,[Reference 256]]</emph> are references to
cells.</paragraph>
+ </section>
</body>
</helpdocument>
diff --git a/source/text/scalc/01/func_concat.xhp
b/source/text/scalc/01/func_concat.xhp
index 2aaa63240..d7d1dc7a4 100644
--- a/source/text/scalc/01/func_concat.xhp
+++ b/source/text/scalc/01/func_concat.xhp
@@ -28,8 +28,8 @@
<paragraph role="paragraph" id="par_id461556226873963">When ranges are
used, the cells are traversed row by row (from top to bottom) to
concatenate.</paragraph>
<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_id911556226813411">CONCAT( string1[,
string2][, …] )</paragraph>
- <paragraph role="paragraph" id="par_id581556227044166"><emph>string1[,
string2][, …]</emph> are strings or references to cells or ranges that contains
strings to concatenate.</paragraph>
+ <paragraph role="code" id="par_id911556226813412">CONCAT( <embedvar
href="text/scalc/01/ful_func.xhp#string256_1" markup="keep"/> )</paragraph>
+ <embed href="text/scalc/01/ful_func.xhp#string256"/>
<embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
<paragraph role="paragraph"
id="par_id531556227248228"><input>=CONCAT("Hello ", A1:C3)</input>
concatenates the string "Hello" with all strings in range
<literal>A1:C3</literal>.</paragraph>
<section id="relatedtopics">
diff --git a/source/text/scalc/01/func_textjoin.xhp
b/source/text/scalc/01/func_textjoin.xhp
index 0b24f8161..f2878ff7b 100644
--- a/source/text/scalc/01/func_textjoin.xhp
+++ b/source/text/scalc/01/func_textjoin.xhp
@@ -26,10 +26,10 @@
</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_id541556228253979">TEXTJOIN( delimiter,
skip_empty, string1[, string2][, …] )</paragraph>
+ <paragraph role="code" id="par_id541556228253979">TEXTJOIN( delimiter,
skip_empty, <embedvar href="text/scalc/01/ful_func.xhp#string256_1"
markup="keep"/> )</paragraph>
<paragraph role="paragraph"
id="par_id741556228390897"><emph>delimiter</emph> is a text string and can be a
range.</paragraph>
<paragraph role="paragraph"
id="par_id621556228397269"><emph>skip_empty</emph> is a logical (TRUE or FALSE,
1 or 0) argument. When TRUE, empty strings will be ignored.</paragraph>
- <paragraph role="paragraph" id="par_id631556228516997"><emph>string1[,
string2][, …]</emph> are strings or references to cells or ranges that contains
text to join.</paragraph>
+ <embed href="text/scalc/01/ful_func.xhp#string256"/>
<paragraph role="paragraph" id="par_id1001556228523394">Ranges are
traversed row by row (from top to bottom).</paragraph>
<paragraph role="paragraph" id="par_id81556228530082">If
<emph>delimiter</emph> is a range, the range need not be of the same size as
the number of strings to be joined.</paragraph>
<paragraph role="paragraph" id="par_id831556228543099">If there are more
delimiters than strings to be joined, not all delimiters will be
used.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
