tdf#99517 help for CONCAT, TEXTJOIN, IFS, SWITCH

CONCAT, TEXTJOIN, IFS, SWITCH Change-Id: Ic1d74ac8b810bd0c0d4b4f570baab1d1e270f912 Reviewed-on: https://gerrit.libreoffice.org/71339 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
author: Olivier Hallot <olivier.hallot@libreoffice.org> 2019-04-25 23:42:20 -0300
committer: Olivier Hallot <olivier.hallot@libreoffice.org> 2019-04-27 14:08:21 +0200
commit: 7b20c74a33942157b02b99353aa98e45f7c0a111 (patch)
tree: 96a7a6f07cb29672409942dc3c02c2a84b876cb6
parent: 0a874cee4a5d694b6c055b896d4dc64f7151b001 (diff)
7 files changed, 182 insertions, 4 deletions
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 6bdbc1e562..152b32238f 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -190,6 +190,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_averageifs \
     helpcontent2/source/text/scalc/01/func_countifs \
     helpcontent2/source/text/scalc/01/func_color \
+    helpcontent2/source/text/scalc/01/func_concat \
     helpcontent2/source/text/scalc/01/func_date \
     helpcontent2/source/text/scalc/01/func_datedif \
     helpcontent2/source/text/scalc/01/func_datevalue \
@@ -209,6 +210,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_forecastetsseason \
     helpcontent2/source/text/scalc/01/exponsmooth_embd \
     helpcontent2/source/text/scalc/01/func_hour \
+    helpcontent2/source/text/scalc/01/func_ifs \
     helpcontent2/source/text/scalc/01/func_imcot \
     helpcontent2/source/text/scalc/01/func_imcos \
     helpcontent2/source/text/scalc/01/func_imcosh \
@@ -237,6 +239,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_second \
     helpcontent2/source/text/scalc/01/func_skewp \
     helpcontent2/source/text/scalc/01/func_sumifs \
+    helpcontent2/source/text/scalc/01/func_switch \
+    helpcontent2/source/text/scalc/01/func_textjoin \
     helpcontent2/source/text/scalc/01/func_time \
     helpcontent2/source/text/scalc/01/func_timevalue \
     helpcontent2/source/text/scalc/01/func_today \
diff --git a/source/text/scalc/01/func_color.xhp b/source/text/scalc/01/func_color.xhp
index 7b631e9178..fced92ec06 100644
--- a/source/text/scalc/01/func_color.xhp
+++ b/source/text/scalc/01/func_color.xhp
@@ -32,7 +32,7 @@
          <bookmark_value>colors;calculating in spreadsheets</bookmark_value>
          <bookmark_value>COLOR function</bookmark_value>
      </bookmark>
-     <paragraph id="hd_id456845684568" role="heading" level="1" xml-lang="en-US"><variable id="color_head"><link href="text/scalc/01/func_color.xhp">COLOR</link></variable></paragraph>
+     <h2 id="hd_id456845684568"><variable id="color_head"><link href="text/scalc/01/func_color.xhp">COLOR</link></variable></h2>
      <paragraph id="par_id1102201617001848" role="paragraph" xml-lang="en-US"><ahelp hid=".">Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system.</ahelp> The result depends on the color system used by your computer.</paragraph>
  </section>
  <embed href="text/scalc/01/ful_func.xhp#func_head_syntax"/>
diff --git a/source/text/scalc/01/func_concat.xhp b/source/text/scalc/01/func_concat.xhp
new file mode 100644
index 0000000000..2aaa632401
--- /dev/null
+++ b/source/text/scalc/01/func_concat.xhp
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="functconcat" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">CONCAT function</title>
+            <filename>/text/scalc/01/func_concat.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="concat01">
+        <bookmark id="bm_id941556226436779" xml-lang="en-US" branch="hid/SC_HID_FUNC_CONCAT_MS" localize="false"/>
+        <bookmark xml-lang="en-US" branch="index" id="bm_id741556228031712">
+            <bookmark_value>CONCAT function</bookmark_value>
+        </bookmark>
+        <h2 id="hd_id471556226436779"><variable id="concatfunct"><link href="text/scalc/01/func_concat.xhp" name="concat">CONCAT</link></variable></h2>
+        <paragraph id="par_id891556226436781" role="paragraph" xml-lang="en-US"><variable id="concatfunction"><ahelp hid=".">Concatenates one or more strings</ahelp></variable></paragraph>
+    </section>
+    <paragraph role="paragraph" id="par_id701556226865876">CONCAT is an enhancement of CONCATENATE, as CONCAT also accepts ranges as arguments, like B2:E5, K:K or K:M.</paragraph>
+    <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>
+    <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">
+        <embed href="text/scalc/01/func_textjoin.xhp#textjoinfunct"/>
+        <paragraph role="paragraph" id="par_id781556244709752"><link href="text/scalc/01/04060110.xhp#concatenate" name="concatenate">CONCATENATE</link></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/func_ifs.xhp b/source/text/scalc/01/func_ifs.xhp
new file mode 100644
index 0000000000..61349e747b
--- /dev/null
+++ b/source/text/scalc/01/func_ifs.xhp
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="ifs01" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">IFS function</title>
+            <filename>/text/scalc/01/func_ifs.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="ifsfunciton01">
+        <bookmark id="bm_id721556234923653" xml-lang="en-US" branch="hid/SC_HID_FUNC_IFS_MS" localize="false"/>
+        <bookmark xml-lang="en-US" branch="index" id="bm_id901556242230198">
+            <bookmark_value>IFS function</bookmark_value>
+        </bookmark>
+        <h2 id="hd_id271556234923654"><variable id="ifsfunct"><link href="text/scalc/01/func_ifs.xhp" name="function ifs">IFS</link></variable></h2>
+        <paragraph id="par_id171556234923655" role="paragraph" xml-lang="en-US"><variable id="variable name"><ahelp hid=".">IFS is a multiple IF-function.</ahelp></variable></paragraph>
+    </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="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>
+    <paragraph role="paragraph" id="par_id551556235712759">IF expression1 is TRUE</paragraph>
+    <paragraph role="paragraph" id="par_id1001556235718948">THEN result1</paragraph>
+    <paragraph role="paragraph" id="par_id571556235725969">ELSE IF expression2 is TRUE</paragraph>
+    <paragraph role="paragraph" id="par_id581556235731982">THEN result2</paragraph>
+    <paragraph role="paragraph" id="par_id961556235738258">ELSE IF expression3 is TRUE</paragraph>
+    <paragraph role="paragraph" id="par_id951556235743954">THEN result3</paragraph>
+    <paragraph role="paragraph" id="par_id671556235758504">To get a default result should no expression be TRUE, add a last expression that is always TRUE, like TRUE or 1=1 followed by the default result.</paragraph>
+    <paragraph role="paragraph" id="par_id541556235771022">If there is a result missing for an expression or is no expression is TRUE, a #N/A error is returned.</paragraph>
+    <paragraph role="paragraph" id="par_id181556235788473">If expression is neither TRUE or FALSE, a #VALUE error is returned.</paragraph>
+    <section id="relatedtopics">
+        <embed href="text/scalc/01/func_switch.xhp#switchfunct"/>
+        <paragraph role="paragraph" id="par_id781556244709752"><link href="text/scalc/01/04060105.xhp#Section4" name="if">IF</link></paragraph>
+    </section>
+    </body>
+</helpdocument>
diff --git a/source/text/scalc/01/func_switch.xhp b/source/text/scalc/01/func_switch.xhp
new file mode 100644
index 0000000000..45a286fd0d
--- /dev/null
+++ b/source/text/scalc/01/func_switch.xhp
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="switchfunction" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">SWITCH function</title>
+            <filename>/text/scalc/01/func_switch.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="switch01">
+        <bookmark id="bm_id111556242313790" xml-lang="en-US" branch="hid/SC_HID_FUNC_SWITCH_MS" localize="false"/>
+        <bookmark xml-lang="en-US" branch="index" id="bm_id571556244875552">
+            <bookmark_value>SWITCH function</bookmark_value>
+        </bookmark>
+        <h2 id="hd_id21556242313791"><variable id="switchfunct"><link href="text/scalc/01/func_switch.xhp" name="switch">SWITCH</link></variable></h2>
+        <paragraph id="par_id361556242313793" role="paragraph" xml-lang="en-US"><variable id="functionswitch"><ahelp hid=".">SWITCH compares <emph>expression</emph> with <emph>value1</emph> to <emph>valuen</emph> and returns the result belonging to the first value that equals expression. If there is no match and default_value is given, that will be returned.</ahelp></variable></paragraph>
+    </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="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>
+    <paragraph role="paragraph" id="par_id331556245422283"><emph>default_result</emph>: any value or reference to a cell that is returned when there is no match.</paragraph>
+    <paragraph role="paragraph" id="par_id871556243022881">If no <emph>value</emph> equals <emph>expression</emph> and no default result is given, a #N/A error is returned.</paragraph>
+    <embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
+    <paragraph role="paragraph" id="par_id851556243961783"><input>=SWITCH(MONTH(A3),1,"January",2,"February",3,"March","No match")</input> returns "January" when A3=1, February when A3=2 , etc...</paragraph>
+    <section id="relatedtopics">
+        <embed href="text/scalc/01/func_ifs.xhp#ifsfunct"/>
+        <paragraph role="paragraph" id="par_id781556244709752"><link href="text/scalc/01/04060105.xhp#Section4" name="if">IF</link></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/func_textjoin.xhp b/source/text/scalc/01/func_textjoin.xhp
new file mode 100644
index 0000000000..0b24f81614
--- /dev/null
+++ b/source/text/scalc/01/func_textjoin.xhp
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="textjoinfunc" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">TEXTJOIN function</title>
+            <filename>/text/scalc/01/func_textjoin.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <section id="textjoin01">
+        <bookmark id="bm_id681556227727944" xml-lang="en-US" branch="hid/SC_HID_FUNC_TEXTJOIN_MS" localize="false"/>
+        <bookmark xml-lang="en-US" branch="index" id="bm_id581556228060864">
+            <bookmark_value>TEXTJOIN function</bookmark_value>
+        </bookmark>
+	<h2 id="hd_id551556227727946"><variable id="textjoinfunct"><link href="text/scalc/01/func_textjoin.xhp" name="textjoinfunction">TEXTJOIN</link></variable></h2>
+        <paragraph id="par_id121556227727948" role="paragraph"><variable id="textjoinfunction"><ahelp hid=".">Concatenates one or more strings, and uses delimiters between them.</ahelp></variable></paragraph>
+    </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="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>
+    <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>
+    <paragraph role="paragraph" id="par_id321556228557611">If there are less delimiters than strings to be joined, the delimiters will be used again from the start.</paragraph>
+    <embed href="text/scalc/01/ful_func.xhp#func_head_example"/>
+    <paragraph role="paragraph" id="par_id441556229012536"><input>=TEXTJOIN(" ",TRUE, "Here", "comes", "the", "sun")</input> returns "Here comes the sun" with space character as delimiter and empty strings are ignored.</paragraph>
+    <paragraph role="paragraph" id="par_id441556239012536">if A1:B2 contains "Here", "comes", "the", "sun" respectively, <input>=TEXTJOIN("-",TRUE,A1:B2)</input> returns "Here-comes-the-sun" with dash character as delimiter and empty strings are ignored.</paragraph>
+    <section id="relatedtopics">
+        <embed href="text/scalc/01/func_concat.xhp#concatfunct"/>
+        <paragraph role="paragraph" id="par_id781556244709752"><link href="text/scalc/01/04060110.xhp#concatenate" name="concatenate">CONCATENATE</link></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/func_webservice.xhp b/source/text/scalc/01/func_webservice.xhp
index c7427d6de3..d2eee3321e 100644
--- a/source/text/scalc/01/func_webservice.xhp
+++ b/source/text/scalc/01/func_webservice.xhp
@@ -21,7 +21,7 @@
         </bookmark>
         <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_WEBSERVICE" id="bm_id3150028" localize="false"/>
         <section id="webservicefuncheader">
-            <paragraph role="heading" id="hd_id3149012" xml-lang="en-US" level="1"><variable id="webservicefuncname"><link href="text/scalc/01/func_webservice.xhp#webservice" name="webservice">WEBSERVICE</link></variable></paragraph>
+            <h2 id="hd_id3149012"><variable id="webservicefuncname"><link href="text/scalc/01/func_webservice.xhp#webservice" name="webservice">WEBSERVICE</link></variable></h2>
             <paragraph role="paragraph" id="par_id3149893" xml-lang="en-US"><ahelp
                     hid="HID_FUNC_WEBSERVICE">Get some web content from a URI.</ahelp></paragraph>
             </section>
@@ -39,7 +39,7 @@
                 <bookmark_value>FILTERXML function</bookmark_value>
             </bookmark>
             <section id="filterxmlfuncheader">
-                <paragraph role="heading" id="hd_id2949012" xml-lang="en-US" level="1"><variable id="filterxmlfuncname"><link href="text/scalc/01/func_webservice.xhp#filterxml" name="filterxml">FILTERXML</link></variable></paragraph>
+                <h2 id="hd_id2949012"><variable id="filterxmlfuncname"><link href="text/scalc/01/func_webservice.xhp#filterxml" name="filterxml">FILTERXML</link></variable></h2>
                 <paragraph role="paragraph" id="par_id2949893" xml-lang="en-US"><ahelp hid="HID_FUNC_FILTERXML">Apply a XPath expression to a XML document.</ahelp></paragraph>
             </section>
             <embed href="text/scalc/00/avail_release.xhp#4.2"/>
@@ -57,7 +57,7 @@
                 <bookmark_value>ENCODEURL function</bookmark_value>
             </bookmark>
             <section id="encodeurlfuncheader">
-                <paragraph id="hd_id671517132649769" role="heading" level="1" xml-lang="en-US"><variable id="encodeurlname"><link href="text/scalc/01/func_webservice.xhp#encodeurl" name="linkname">ENCODEURL</link></variable></paragraph>
+                <h2 id="hd_id671517132649769"><variable id="encodeurlname"><link href="text/scalc/01/func_webservice.xhp#encodeurl" name="linkname">ENCODEURL</link></variable></h2>
                 <paragraph id="par_id51517132649769" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FUNC_ENCODEURL">Returns a URL-encoded string.</ahelp></paragraph>
             </section>
             <paragraph role="paragraph" id="par_id721517134647880" xml-lang="en-US">Use this function to transform text with symbols of national alphabets (for example accented characters, non-ASCII alphabets or Asian words) to a string of URL-standard symbols.</paragraph>
author	Olivier Hallot <olivier.hallot@libreoffice.org>	2019-04-25 23:42:20 -0300
committer	Olivier Hallot <olivier.hallot@libreoffice.org>	2019-04-27 14:08:21 +0200
commit	7b20c74a33942157b02b99353aa98e45f7c0a111 (patch)
tree	96a7a6f07cb29672409942dc3c02c2a84b876cb6
parent	0a874cee4a5d694b6c055b896d4dc64f7151b001 (diff)