diff options
author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-07 15:58:44 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-09 12:45:04 +0000 |
commit | 5af576c2fcf8ebdc517b3919dd0ef808b09b04a1 (patch) | |
tree | f9757e8a00bb68a8dba3043ded874d8f69769b25 /formula | |
parent | 2963dbb5ce65a141051cb3e4e3ed06a6ed31574c (diff) |
fdo#85818: rename Kombin, Kombin2, Variationen, Variationen2
Rename OcKombin to OcCombin, SC_OPCODE_KOMBIN to SC_OPCODE_COMBIN,
ScInterpreter::ScKombin() to ScInterpreter::ScCombin(), OpKombin to
OpCombin.
Rename OcKombin2 to OcCombinA, SC_OPCODE_KOMBIN_2 to
SC_OPCODE_COMBIN_A, ScInterpreter::ScKombin2() to
ScInterpreter::ScCombinA(), OpKombin2 to OpCombinA.
Rename OcVariationen to OcPermut, SC_OPCODE_VARIATIONEN to
SC_OPCODE_PERMUT, ScInterpreter::ScVariationen() to
ScInterpreter::ScPermut(), OpVariationen to OpPermut.
Rename OcVariationen2 to OcPermutationA, SC_OPCODE_VARIATIONEN_2 to
SC_OPCODE_PERMUTATION_A, ScInterpreter::ScVariationen2() to
ScInterpreter::ScPermutationA(), OpVariationen2 to OpPermutationA.
Change-Id: I2efa01e9b160e98058879d08e2e2313284a5ec91
Reviewed-on: https://gerrit.libreoffice.org/13814
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/resource/core_resource.src | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index af7279872e72..f704d0cebb0d 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -206,10 +206,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_BINOM_DIST_MS { Text = "COM.MICROSOFT.BINOM.DIST" ; }; String SC_OPCODE_POISSON_DIST { Text = "POISSON" ; }; String SC_OPCODE_POISSON_DIST_MS { Text = "COM.MICROSOFT.POISSON.DIST" ; }; - String SC_OPCODE_KOMBIN { Text = "COMBIN" ; }; - String SC_OPCODE_KOMBIN_2 { Text = "COMBINA" ; }; - String SC_OPCODE_VARIATIONEN { Text = "PERMUT" ; }; - String SC_OPCODE_VARIATIONEN_2 { Text = "PERMUTATIONA" ; }; + String SC_OPCODE_COMBIN { Text = "COMBIN" ; }; + String SC_OPCODE_COMBIN_A { Text = "COMBINA" ; }; + String SC_OPCODE_PERMUT { Text = "PERMUT" ; }; + String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; }; String SC_OPCODE_BW { Text = "PV" ; }; String SC_OPCODE_DIA { Text = "SYD" ; }; String SC_OPCODE_GDA { Text = "DDB" ; }; @@ -613,10 +613,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_BINOM_DIST_MS { Text = "_xlfn.BINOM.DIST" ; }; String SC_OPCODE_POISSON_DIST { Text = "POISSON" ; }; String SC_OPCODE_POISSON_DIST_MS { Text = "_xlfn.POISSON.DIST" ; }; - String SC_OPCODE_KOMBIN { Text = "COMBIN" ; }; - String SC_OPCODE_KOMBIN_2 { Text = "_xlfn.COMBINA" ; }; - String SC_OPCODE_VARIATIONEN { Text = "PERMUT" ; }; - String SC_OPCODE_VARIATIONEN_2 { Text = "_xlfn.PERMUTATIONA" ; }; + String SC_OPCODE_COMBIN { Text = "COMBIN" ; }; + String SC_OPCODE_COMBIN_A { Text = "_xlfn.COMBINA" ; }; + String SC_OPCODE_PERMUT { Text = "PERMUT" ; }; + String SC_OPCODE_PERMUTATION_A { Text = "_xlfn.PERMUTATIONA" ; }; String SC_OPCODE_BW { Text = "PV" ; }; String SC_OPCODE_DIA { Text = "SYD" ; }; String SC_OPCODE_GDA { Text = "DDB" ; }; @@ -1022,10 +1022,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_BINOM_DIST_MS { Text = "BINOM.DIST" ; }; String SC_OPCODE_POISSON_DIST { Text = "POISSON" ; }; String SC_OPCODE_POISSON_DIST_MS { Text = "POISSON.DIST" ; }; - String SC_OPCODE_KOMBIN { Text = "COMBIN" ; }; - String SC_OPCODE_KOMBIN_2 { Text = "COMBINA" ; }; - String SC_OPCODE_VARIATIONEN { Text = "PERMUT" ; }; - String SC_OPCODE_VARIATIONEN_2 { Text = "PERMUTATIONA" ; }; + String SC_OPCODE_COMBIN { Text = "COMBIN" ; }; + String SC_OPCODE_COMBIN_A { Text = "COMBINA" ; }; + String SC_OPCODE_PERMUT { Text = "PERMUT" ; }; + String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; }; String SC_OPCODE_BW { Text = "PV" ; }; String SC_OPCODE_DIA { Text = "SYD" ; }; String SC_OPCODE_GDA { Text = "DDB" ; }; @@ -1907,19 +1907,19 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "POISSON.DIST" ; }; - String SC_OPCODE_KOMBIN + String SC_OPCODE_COMBIN { Text [ en-US ] = "COMBIN" ; }; - String SC_OPCODE_KOMBIN_2 + String SC_OPCODE_COMBIN_A { Text [ en-US ] = "COMBINA" ; }; - String SC_OPCODE_VARIATIONEN + String SC_OPCODE_PERMUT { Text [ en-US ] = "PERMUT" ; }; - String SC_OPCODE_VARIATIONEN_2 + String SC_OPCODE_PERMUTATION_A { Text [ en-US ] = "PERMUTATIONA" ; }; |