diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2015-09-22 10:40:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-10-06 21:21:16 +0000 |
| commit | f830600ece806ec365a4839e79afabe183c5e36d (patch) | |
| tree | 1bcfeccf135fc1489b1f850ca3462df514f5b294 /include | |
| parent | e3ddcbea3fd8b9402ce2339de47793c4bc2b4b80 (diff) | |
tdf#50950 Add ODFF1.2 Calc function ISOWEEKNUM,
make Calc function WEEKNUM compliant with ODFF1.2,
provide backward compatibility for Calc function WEEKNUM,
add unit tests for ISOWEEKNUM, WEEKNUM and backward compatibility.
Change-Id: I63af5543cea2f470d710462e55404ac754022c89
Reviewed-on: https://gerrit.libreoffice.org/18760
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include')
| -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 9d45b9aa9212..984ec02c0edd 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -204,7 +204,8 @@ #define SC_OPCODE_ERFC_MS 174 #define SC_OPCODE_ERROR_TYPE_ODF 175 #define SC_OPCODE_ENCODEURL 176 -#define SC_OPCODE_STOP_1_PAR 177 +#define SC_OPCODE_ISOWEEKNUM 177 +#define SC_OPCODE_STOP_1_PAR 178 /*** Functions with more than one parameters ***/ #define SC_OPCODE_START_2_PAR 201 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 806147c7a12c..0c4c8e8f510e 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -449,6 +449,7 @@ enum OpCode : sal_uInt16 ocBitLshift = SC_OPCODE_BITLSHIFT, // miscellaneous ocWeek = SC_OPCODE_WEEK, + ocIsoWeeknum = SC_OPCODE_ISOWEEKNUM, ocGetDayOfWeek = SC_OPCODE_GET_DAY_OF_WEEK, ocNetWorkdays = SC_OPCODE_NETWORKDAYS, ocNetWorkdays_MS = SC_OPCODE_NETWORKDAYS_MS, |