From 7b20c74a33942157b02b99353aa98e45f7c0a111 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Thu, 25 Apr 2019 23:42:20 -0300 Subject: 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 --- AllLangHelp_scalc.mk | 4 +++ source/text/scalc/01/func_color.xhp | 2 +- source/text/scalc/01/func_concat.xhp | 40 +++++++++++++++++++++++++++ source/text/scalc/01/func_ifs.xhp | 47 ++++++++++++++++++++++++++++++++ source/text/scalc/01/func_switch.xhp | 42 ++++++++++++++++++++++++++++ source/text/scalc/01/func_textjoin.xhp | 45 ++++++++++++++++++++++++++++++ source/text/scalc/01/func_webservice.xhp | 6 ++-- 7 files changed, 182 insertions(+), 4 deletions(-) create mode 100644 source/text/scalc/01/func_concat.xhp create mode 100644 source/text/scalc/01/func_ifs.xhp create mode 100644 source/text/scalc/01/func_switch.xhp create mode 100644 source/text/scalc/01/func_textjoin.xhp 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 @@ colors;calculating in spreadsheets COLOR function - COLOR +

COLOR

Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system. The result depends on the color system used by your computer. 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 @@ + + + + + + + CONCAT function + /text/scalc/01/func_concat.xhp + + + +
+ + + CONCAT function + +

CONCAT

+ Concatenates one or more strings +
+ CONCAT is an enhancement of CONCATENATE, as CONCAT also accepts ranges as arguments, like B2:E5, K:K or K:M. + When ranges are used, the cells are traversed row by row (from top to bottom) to concatenate. + + + CONCAT( string1[, string2][, …] ) + string1[, string2][, …] are strings or references to cells or ranges that contains strings to concatenate. + + =CONCAT("Hello ", A1:C3) concatenates the string "Hello" with all strings in range A1:C3. +
+ + CONCATENATE +
+ +
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 @@ + + + + + + + IFS function + /text/scalc/01/func_ifs.xhp + + + +
+ + + IFS function + +

IFS

+ IFS is a multiple IF-function. +
+ + + IFS( expression1, result1[, expression2, result2][, …] ) + expression1, expression2, ... are any boolean values or expressions that can be TRUE or FALSE + result1, result2, ... are the values that are returned if the logical test is TRUE + IFS( expression1, result1, expression2, result2, expression3, result3 ) is executed as + IF expression1 is TRUE + THEN result1 + ELSE IF expression2 is TRUE + THEN result2 + ELSE IF expression3 is TRUE + THEN result3 + 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. + If there is a result missing for an expression or is no expression is TRUE, a #N/A error is returned. + If expression is neither TRUE or FALSE, a #VALUE error is returned. +
+ + IF +
+ +
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 @@ + + + + + + + SWITCH function + /text/scalc/01/func_switch.xhp + + + +
+ + + SWITCH function + +

SWITCH

+ SWITCH compares expression with value1 to valuen 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. +
+ + + SWITCH( expression, value1, result1[, value2, result2][, … ][, default_result] ) + expression is a text, numeric, logical or date input or reference to a cell. + value1, value2, ... is any value or reference to a cell. Each value must have a result given. + result1, result2, ... is any value or reference to a cell. + default_result: any value or reference to a cell that is returned when there is no match. + If no value equals expression and no default result is given, a #N/A error is returned. + + =SWITCH(MONTH(A3),1,"January",2,"February",3,"March","No match") returns "January" when A3=1, February when A3=2 , etc... +
+ + IF +
+ +
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 @@ + + + + + + + TEXTJOIN function + /text/scalc/01/func_textjoin.xhp + + + +
+ + + TEXTJOIN function + +

TEXTJOIN

+ Concatenates one or more strings, and uses delimiters between them. +
+ + + TEXTJOIN( delimiter, skip_empty, string1[, string2][, …] ) + delimiter is a text string and can be a range. + skip_empty is a logical (TRUE or FALSE, 1 or 0) argument. When TRUE, empty strings will be ignored. + string1[, string2][, …] are strings or references to cells or ranges that contains text to join. + Ranges are traversed row by row (from top to bottom). + If delimiter is a range, the range need not be of the same size as the number of strings to be joined. + If there are more delimiters than strings to be joined, not all delimiters will be used. + If there are less delimiters than strings to be joined, the delimiters will be used again from the start. + + =TEXTJOIN(" ",TRUE, "Here", "comes", "the", "sun") returns "Here comes the sun" with space character as delimiter and empty strings are ignored. + if A1:B2 contains "Here", "comes", "the", "sun" respectively, =TEXTJOIN("-",TRUE,A1:B2) returns "Here-comes-the-sun" with dash character as delimiter and empty strings are ignored. +
+ + CONCATENATE +
+ +
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 @@
- WEBSERVICE +

WEBSERVICE

Get some web content from a URI.
@@ -39,7 +39,7 @@ FILTERXML function
- FILTERXML +

FILTERXML

Apply a XPath expression to a XML document.
@@ -57,7 +57,7 @@ ENCODEURL function
- ENCODEURL +

ENCODEURL

Returns a URL-encoded string.
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. -- cgit