diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-05-12 12:02:11 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-05-05 19:15:15 +0000 |
| commit | 111952dccc1bf9e28e61c0233816248c848cbf53 (patch) | |
| tree | 5b5a65e36d00abc292e7ec7d5dc38f72cf3023a2 /include/formula | |
| parent | ´Color´ : ambiguous symbol (diff) | |
| download | core-111952dccc1bf9e28e61c0233816248c848cbf53.tar.gz core-111952dccc1bf9e28e61c0233816248c848cbf53.zip | |
fdo#77985 make calc function NETWORKDAYS comply with ODFF1.2
Change-Id: I523b0c71bc0fed501a4d5fffd75c5a4704f6dd13
Reviewed-on: https://gerrit.libreoffice.org/9827
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 | 3 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index f5bd316ba999..4798c190c57c 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -481,7 +481,8 @@ #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_NETWORKDAYS 474 +#define SC_OPCODE_STOP_2_PAR 475 /* 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 73b911aedd2f..9d4d67611f79 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -448,6 +448,7 @@ enum OpCode : sal_uInt16 // miscellaneous ocWeek = SC_OPCODE_WEEK, ocGetDayOfWeek = SC_OPCODE_GET_DAY_OF_WEEK, + ocNetWorkdays = SC_OPCODE_NETWORKDAYS, ocNetWorkdays_MS = SC_OPCODE_NETWORKDAYS_MS, ocWorkday_MS = SC_OPCODE_WORKDAY_MS, ocNoName = SC_OPCODE_NO_NAME, |