diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2015-06-01 13:47:07 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-06-11 11:17:58 +0000 |
| commit | cb13c46da1cdd1e2b95fd473cc0ff54f776dfe9c (patch) | |
| tree | 9474954b7d84c6ad88a809b53ade12ac7b2b5b5b /include/formula | |
| parent | 29f6ef4632a53243b1bf60cb412d8c5ee8447dc6 (diff) | |
tdf#69552 [part 2] support all ODFF1.2 and Excel2013 variations
of CEILING and FLOOR
Change-Id: I9537d9bd8dbca2eac769e74e9d3d5b298b76f594
Reviewed-on: https://gerrit.libreoffice.org/16016
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/compiler.hrc | 4 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 4798c190c57c..34bb0d810352 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -482,7 +482,9 @@ #define SC_OPCODE_CEIL 472 #define SC_OPCODE_CEIL_PRECISE 473 #define SC_OPCODE_NETWORKDAYS 474 -#define SC_OPCODE_STOP_2_PAR 475 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_FLOOR_MATH 475 +#define SC_OPCODE_FLOOR_PRECISE 476 +#define SC_OPCODE_STOP_2_PAR 477 /* 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 9d4d67611f79..806147c7a12c 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -202,8 +202,10 @@ enum OpCode : sal_uInt16 ocCeil_Precise = SC_OPCODE_CEIL_PRECISE, ocCeil_ISO = SC_OPCODE_CEIL_ISO, ocCeil_Math = SC_OPCODE_CEIL_MATH, - ocFloor_MS = SC_OPCODE_FLOOR_MS, ocFloor = SC_OPCODE_FLOOR, + ocFloor_MS = SC_OPCODE_FLOOR_MS, + ocFloor_Math = SC_OPCODE_FLOOR_MATH, + ocFloor_Precise = SC_OPCODE_FLOOR_PRECISE, ocRound = SC_OPCODE_ROUND, ocRoundUp = SC_OPCODE_ROUND_UP, ocRoundDown = SC_OPCODE_ROUND_DOWN, |