From fff5031898f743c3adf5fcc35bc95fff48094ebb Mon Sep 17 00:00:00 2001 From: Marina Plakalovic Date: Fri, 14 Dec 2012 20:42:52 +0100 Subject: calcishmakkica: #i101466# implement AVERAGEIF Merged from Apache OO with adaptions. http://svn.apache.org/viewvc?rev=1381445&view=rev Original Apache OO committer: Andrew Rist Original Author: Marina Plakalovic Original Author: Eike Rathke [er] Original Committer: Eike Rathke [er] slightly reworked patch by # HG changeset patch # User Eike Rathke [er] # Date 1284055400 -7200 # Node ID 237cb91dd986ff11eb100cc631206cda102e91f7 # Parent 1c32319bb02fdf173de6a609fca9f2e9c9f4c73a Change-Id: Id168462272dc8d618513319ebab41fde5c728b08 --- formula/inc/formula/compiler.hrc | 5 +++-- formula/inc/formula/opcode.hxx | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'formula/inc') diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index 6b595ce6766d..9ae1c1850a08 100644 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -392,8 +392,9 @@ #define SC_OPCODE_BITLSHIFT 399 #define SC_OPCODE_GET_DATEDIF 400 #define SC_OPCODE_XOR 401 -#define SC_OPCODE_STOP_2_PAR 402 -#define SC_OPCODE_LAST_OPCODE_ID 402 /* last OpCode */ +#define SC_OPCODE_AVERAGE_IF 402 +#define SC_OPCODE_STOP_2_PAR 403 +#define SC_OPCODE_LAST_OPCODE_ID 403 /* last OpCode */ /*** Internal ***/ #define SC_OPCODE_INTERNAL_BEGIN 9999 diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index 14f862f5c6e0..046d25b752ad 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -274,6 +274,7 @@ enum OpCodeEnum ocCountEmptyCells = SC_OPCODE_COUNT_EMPTY_CELLS, ocCountIf = SC_OPCODE_COUNT_IF, ocSumIf = SC_OPCODE_SUM_IF, + ocAverageIf = SC_OPCODE_AVERAGE_IF, ocLookup = SC_OPCODE_LOOKUP, ocVLookup = SC_OPCODE_V_LOOKUP, ocHLookup = SC_OPCODE_H_LOOKUP, -- cgit