diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-11-11 17:33:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-04-29 23:39:09 +0000 |
| commit | 010b2d2d9be846fb6b10848204e29e1bc00ef1ea (patch) | |
| tree | 7ac115c5bd37be8b9e4cf295a84385d63f212d8e /include/formula | |
| parent | 3a6866c2953c17a55536fa434b9fceda670d0685 (diff) | |
fdo#69552 [part 1] make calc functions CEILING comply with ODF1.2
Also, add support for CEILING.MATH and fix small
deficiencies with CEILING functions, as most are interwoven.
Change-Id: I0d9a46fb17e982ccf1e9d9e403b58926172c1a7a
Reviewed-on: https://gerrit.libreoffice.org/7088
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 | 6 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 1fd4a58f3681..f5bd316ba999 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -209,7 +209,7 @@ /*** Functions with more than one parameters ***/ #define SC_OPCODE_START_2_PAR 201 #define SC_OPCODE_ARC_TAN_2 201 -#define SC_OPCODE_CEIL 202 +#define SC_OPCODE_CEIL_MATH 202 #define SC_OPCODE_FLOOR 203 #define SC_OPCODE_ROUND 204 #define SC_OPCODE_ROUND_UP 205 @@ -479,8 +479,10 @@ #define SC_OPCODE_WORKDAY_MS 469 #define SC_OPCODE_AGGREGATE 470 #define SC_OPCODE_COLOR 471 +#define SC_OPCODE_CEIL 472 +#define SC_OPCODE_CEIL_PRECISE 473 +#define SC_OPCODE_STOP_2_PAR 474 /* last function with two or more parameters' OpCode + 1 */ -#define SC_OPCODE_STOP_2_PAR 472 /* 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 fa4c1bfba798..73b911aedd2f 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -199,7 +199,9 @@ enum OpCode : sal_uInt16 ocArcTan2 = SC_OPCODE_ARC_TAN_2, ocCeil = SC_OPCODE_CEIL, ocCeil_MS = SC_OPCODE_CEIL_MS, + 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, ocRound = SC_OPCODE_ROUND, |