diff options
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/compiler.hxx | 13 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 10 |
2 files changed, 19 insertions, 4 deletions
diff --git a/include/formula/compiler.hxx b/include/formula/compiler.hxx index 266d260622d3..a8962479a432 100644 --- a/include/formula/compiler.hxx +++ b/include/formula/compiler.hxx @@ -517,10 +517,15 @@ #define SC_OPCODE_SORTBY 502 #define SC_OPCODE_MAT_SEQUENCE 503 #define SC_OPCODE_RANDARRAY 504 -#define SC_OPCODE_TOCOL 505 -#define SC_OPCODE_TOROW 506 -#define SC_OPCODE_UNIQUE 507 -#define SC_OPCODE_STOP_2_PAR 508 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_DROP 505 +#define SC_OPCODE_EXPAND 506 +#define SC_OPCODE_TAKE 507 +#define SC_OPCODE_TOCOL 508 +#define SC_OPCODE_TOROW 509 +#define SC_OPCODE_UNIQUE 510 +#define SC_OPCODE_WRAPCOLS 511 +#define SC_OPCODE_WRAPROWS 512 +#define SC_OPCODE_STOP_2_PAR 513 /* last function with two or more parameters' OpCode + 1 */ #define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR /* last function's OpCode + 1 */ #define SC_OPCODE_LAST_OPCODE_ID (SC_OPCODE_STOP_FUNCTION - 1) /* last OpCode */ diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index e71b3ff05549..81774d97e255 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -513,9 +513,14 @@ enum OpCode : sal_uInt16 ocSortBy = SC_OPCODE_SORTBY, ocMatSequence = SC_OPCODE_MAT_SEQUENCE, ocRandArray = SC_OPCODE_RANDARRAY, + ocDrop = SC_OPCODE_DROP, + ocExpand = SC_OPCODE_EXPAND, + ocTake = SC_OPCODE_TAKE, ocToCol = SC_OPCODE_TOCOL, ocToRow = SC_OPCODE_TOROW, ocUnique = SC_OPCODE_UNIQUE, + ocWrapCols = SC_OPCODE_WRAPCOLS, + ocWrapRows = SC_OPCODE_WRAPROWS, // internal stuff ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN, ocTTT = SC_OPCODE_TTT, @@ -1000,10 +1005,15 @@ inline std::string OpCodeEnumToString(OpCode eCode) case ocFilter: return "Filter"; case ocSort: return "Sort"; case ocSortBy: return "SortBy"; + case ocDrop: return "Drop"; + case ocExpand: return "Expand"; + case ocTake: return "Take"; case ocToCol: return "ToCol"; case ocToRow: return "ToRow"; case ocUnique: return "Unique"; case ocLet: return "Let"; + case ocWrapCols: return "WrapCols"; + case ocWrapRows: return "WrapRows"; case ocTTT: return "TTT"; case ocDebugVar: return "DebugVar"; case ocDataToken1: return "DataToken1"; |