[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/inc

[Seth Chaiklin (via logerrit)]

 helpcontent2       |    2 +-
 sc/inc/scfuncs.hrc |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4200a025df1cadecf03904e54f7cfe6aa1a249ef
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Sat Nov 14 09:03:12 2020 +0200
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Sat Nov 14 08:03:12 2020 +0100

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to b63c7644809e62a5f179ccd62b9975695e8f1d2b
      - tdf#103419  add missing functions to "Logical" category help page in Calc
    
              ( scalc/01/04060105.xhp )
              embed headers and link to SWITCH and IFS
              embed full sections for IFERROR and IFNA
              update select ID to "logical"
              rename variable ID "logischtext" --> "logicaltext"
                (only embedded in scalc/01/04060100.xhp )
    
              ( scalc/00/00000404.xhp )
              rename variable ID "eikalo" --> "logical"
              only embedded in scalc/01/04060105.xhp )
    
              ( scalc/01/04060100.xhp )
               update select ID to "logicaltext"
               update to <h1>,some <h2>
    
        Change-Id: I1764301fa43bd564831b7de613a3c8acbcf0c3dc
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105364
        Tested-by: Jenkins
        Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>

diff --git a/helpcontent2 b/helpcontent2
index 56bbf73adfd3..b63c7644809e 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 56bbf73adfd3c4258db6822dad27d4b5ca7b9beb
+Subproject commit b63c7644809e62a5f179ccd62b9975695e8f1d2b
commit b8480abd38016378e92e2e3f6690f1c219dbadd2
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Tue Nov 10 01:38:08 2020 +0200
Commit:     Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Sat Nov 14 08:00:13 2020 +0100

    Resolves: tdf#103419 - update tooltip for SWITCH in Calc
    
    Change-Id: I931ae2d4b2a26f5369c78b4f91ecd53a1b1fd4bf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105464
    Tested-by: Jenkins
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>

diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc
index 9a96b3d9975c..a5a5e2449fc6 100644
--- a/sc/inc/scfuncs.hrc
+++ b/sc/inc/scfuncs.hrc
@@ -3603,11 +3603,11 @@ const char* SC_OPCODE_IFS_MS_ARY[] =
 // -=*# Resource for function SWITCH #*=-
 const char* SC_OPCODE_SWITCH_MS_ARY[] =
 {
-    NC_("SC_OPCODE_SWITCH_MS", "Checks 1 or more values and returns a result corresponding to the first value equal to the given expression."),
+    NC_("SC_OPCODE_SWITCH_MS", "Compares expression against list of value/result pairs, and returns result for first value that matches the expression.  If expression does not match any value, a default result is returned, if it is placed as final item in parameter list without a value."),
     NC_("SC_OPCODE_SWITCH_MS", "Expression"),
-    NC_("SC_OPCODE_SWITCH_MS", "Value that will be compared against value1-valueN."),
+    NC_("SC_OPCODE_SWITCH_MS", "Value to be compared against value1…valueN (N ≤ 127)"),
     NC_("SC_OPCODE_SWITCH_MS", "Value"),
-    NC_("SC_OPCODE_SWITCH_MS", "Value that will be compared against expression."),
+    NC_("SC_OPCODE_SWITCH_MS", "Value to compare against expression. If no result is given, then value is returned as default result."),
     NC_("SC_OPCODE_SWITCH_MS", "Result"),
     NC_("SC_OPCODE_SWITCH_MS", "Value to return when corresponding value argument matches expression.")
 };