diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-12 19:56:39 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-14 19:52:07 +0000 |
| commit | 1f56cbf8cc15f76131d1dc8801935bec92be05ea (patch) | |
| tree | 4fc480b6ba409d9a68aee78130df7693e12b43b2 /include | |
| parent | 975832d885ca5d185e91a975b157bf06bf9a7a0e (diff) | |
sc: rename ocChose et al. to ocChoose et al.
Change-Id: I1aa8ee6c827a6d6a6c6beb190bdc9c3c91d82b22
Reviewed-on: https://gerrit.libreoffice.org/13889
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 2 | ||||
| -rw-r--r-- | include/formula/compiler.hrc | 2 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 2 | ||||
| -rw-r--r-- | include/formula/tokenarray.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 488760e4a618..0d959c69fdca 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -37,7 +37,7 @@ #include <unordered_map> -#define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */ +#define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChoose) */ #define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */ diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 9578a2a06783..cc8b7091507a 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -32,7 +32,7 @@ #define SC_OPCODE_IF 6 /* jump commands */ #define SC_OPCODE_IF_ERROR 7 #define SC_OPCODE_IF_NA 8 -#define SC_OPCODE_CHOSE 9 +#define SC_OPCODE_CHOOSE 9 #define SC_OPCODE_OPEN 10 /* parentheses and separators */ #define SC_OPCODE_CLOSE 11 #define SC_OPCODE_SEP 12 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 25da573b162e..b7cdba5f59ce 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -36,7 +36,7 @@ enum OpCode : sal_uInt16 ocIf = SC_OPCODE_IF, ocIfError = SC_OPCODE_IF_ERROR, ocIfNA = SC_OPCODE_IF_NA, - ocChose = SC_OPCODE_CHOSE, + ocChoose = SC_OPCODE_CHOOSE, // Parentheses and separators ocOpen = SC_OPCODE_OPEN, ocClose = SC_OPCODE_CLOSE, diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index e37f75167cff..244a7b96b427 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -321,7 +321,7 @@ public: @param nStop Stop before reaching code at position nStop. If not specified the default is to either run the entire code, or to stop if an ocSep or - ocClose is encountered, which are only present in ocIf or ocChose + ocClose is encountered, which are only present in ocIf or ocChoose jumps. */ void Jump( short nStart, short nNext, short nStop = SHRT_MAX ); |