summaryrefslogtreecommitdiffstats
path: root/include/formula
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2014-03-27 13:33:15 +0100
committerEike Rathke <erack@redhat.com>2014-04-02 14:01:28 +0000
commit22dac22fe256b28b78c8e0783f2625aee0f75ace (patch)
tree95b026cc7820f2597f07c8e00f98c4ccfca9e9b3 /include/formula
parentKill superfluous vertical whitespace (diff)
downloadcore-22dac22fe256b28b78c8e0783f2625aee0f75ace.tar.gz
core-22dac22fe256b28b78c8e0783f2625aee0f75ace.zip
fdo#73147 add Excel2010 functions NETWORKDAYS.INTL and WORKDAY.INTL
Change-Id: I3ab9dde5c421a3a3e6022a27be37f23547197317 Reviewed-on: https://gerrit.libreoffice.org/8772 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.hrc4
-rw-r--r--include/formula/opcode.hxx2
2 files changed, 5 insertions, 1 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 23eedf3dcac0..47d22aab3d1c 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -463,8 +463,10 @@
#define SC_OPCODE_CEIL_MS 465
#define SC_OPCODE_CEIL_ISO 466
#define SC_OPCODE_FLOOR_MS 467
+#define SC_OPCODE_NETWORKDAYS_MS 468
+#define SC_OPCODE_WORKDAY_MS 469
-#define SC_OPCODE_STOP_2_PAR 468 /* last function with two or more parameters' OpCode + 1 */
+#define SC_OPCODE_STOP_2_PAR 470 /* 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 13daeff55658..4239c538bcd2 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -436,6 +436,8 @@ enum OpCodeEnum
// miscellaneous
ocWeek = SC_OPCODE_WEEK,
ocGetDayOfWeek = SC_OPCODE_GET_DAY_OF_WEEK,
+ ocNetWorkdays_MS = SC_OPCODE_NETWORKDAYS_MS,
+ ocWorkday_MS = SC_OPCODE_WORKDAY_MS,
ocNoName = SC_OPCODE_NO_NAME,
ocStyle = SC_OPCODE_STYLE,
ocDde = SC_OPCODE_DDE,