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 /include | |
| 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 'include')
| -rw-r--r-- | include/formula/compiler.hrc | 8 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index f8631efe7f29..aca7b923415a 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -237,10 +237,10 @@ #define SC_OPCODE_EXP_DIST 237 #define SC_OPCODE_BINOM_DIST 238 #define SC_OPCODE_POISSON_DIST 239 -#define SC_OPCODE_KOMBIN 240 -#define SC_OPCODE_KOMBIN_2 241 -#define SC_OPCODE_VARIATIONEN 242 -#define SC_OPCODE_VARIATIONEN_2 243 +#define SC_OPCODE_COMBIN 240 +#define SC_OPCODE_COMBIN_A 241 +#define SC_OPCODE_PERMUT 242 +#define SC_OPCODE_PERMUTATION_A 243 #define SC_OPCODE_BW 244 #define SC_OPCODE_DIA 245 #define SC_OPCODE_GDA 246 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 7b807866bcee..a122e2bdc0a7 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -241,10 +241,10 @@ enum OpCode : sal_uInt16 ocBinomInv = SC_OPCODE_BINOM_INV, ocPoissonDist = SC_OPCODE_POISSON_DIST, ocPoissonDist_MS = SC_OPCODE_POISSON_DIST_MS, - ocKombin = SC_OPCODE_KOMBIN, - ocKombin2 = SC_OPCODE_KOMBIN_2, - ocVariationen = SC_OPCODE_VARIATIONEN, - ocVariationen2 = SC_OPCODE_VARIATIONEN_2, + ocCombin = SC_OPCODE_COMBIN, + ocCombinA = SC_OPCODE_COMBIN_A, + ocPermut = SC_OPCODE_PERMUT, + ocPermutationA = SC_OPCODE_PERMUTATION_A, ocBW = SC_OPCODE_BW, ocDIA = SC_OPCODE_DIA, ocGDA = SC_OPCODE_GDA, |