diff options
| author | Marina Plakalovic <makkica@openoffice.org> | 2012-12-14 20:42:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-12-15 21:42:39 +0100 |
| commit | fff5031898f743c3adf5fcc35bc95fff48094ebb (patch) | |
| tree | 1960204911472480b34d3135bdaa044869471434 /formula | |
| parent | 9c321f0d21281cc6b1d5303f24de00d5bb2849db (diff) | |
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 <arist@apache.org>
Original Author: Marina Plakalovic <makkica@openoffice.org>
Original Author: Eike Rathke [er] <eike.rathke@oracle.com>
Original Committer: Eike Rathke [er] <eike.rathke@oracle.com>
slightly reworked patch by <makkica>
# HG changeset patch
# User Eike Rathke [er] <eike.rathke@oracle.com>
# Date 1284055400 -7200
# Node ID 237cb91dd986ff11eb100cc631206cda102e91f7
# Parent 1c32319bb02fdf173de6a609fca9f2e9c9f4c73a
Change-Id: Id168462272dc8d618513319ebab41fde5c728b08
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/inc/formula/compiler.hrc | 5 | ||||
| -rw-r--r-- | formula/inc/formula/opcode.hxx | 1 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 6 |
3 files changed, 10 insertions, 2 deletions
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, diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 5d4615b927b9..1c165d023d1a 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -237,6 +237,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_COUNT_EMPTY_CELLS { Text = "COUNTBLANK" ; }; String SC_OPCODE_COUNT_IF { Text = "COUNTIF" ; }; String SC_OPCODE_SUM_IF { Text = "SUMIF" ; }; + String SC_OPCODE_AVERAGE_IF { Text = "AVERAGEIF" ; }; String SC_OPCODE_LOOKUP { Text = "LOOKUP" ; }; String SC_OPCODE_V_LOOKUP { Text = "VLOOKUP" ; }; String SC_OPCODE_H_LOOKUP { Text = "HLOOKUP" ; }; @@ -570,6 +571,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_COUNT_EMPTY_CELLS { Text = "COUNTBLANK" ; }; String SC_OPCODE_COUNT_IF { Text = "COUNTIF" ; }; String SC_OPCODE_SUM_IF { Text = "SUMIF" ; }; + String SC_OPCODE_AVERAGE_IF { Text = "AVERAGEIF" ; }; String SC_OPCODE_LOOKUP { Text = "LOOKUP" ; }; String SC_OPCODE_V_LOOKUP { Text = "VLOOKUP" ; }; String SC_OPCODE_H_LOOKUP { Text = "HLOOKUP" ; }; @@ -1473,6 +1475,10 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "SUMIF" ; }; + String SC_OPCODE_AVERAGE_IF + { + Text [ en-US ] = "AVERAGEIF" ; + }; String SC_OPCODE_LOOKUP { Text [ en-US ] = "LOOKUP" ; |