summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJoel Madero <jmadero.dev@gmail.com>2013-09-19 22:37:39 -0700
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-09-23 23:58:56 +0000
commit4547d8c42e5b0bb456ac02fbea67059a8a1cadd7 (patch)
tree7117709c3278a4d82a55cc17d862801956214162 /sc
parentd269c92a74516081f277d427ab44dbe4ece00598 (diff)
fdo#69536 - Moved Averageif(s)
Moved averageif and averageifs to statistical category instead of mathematical Change-Id: Ibcf7f5a5e12b528c4877232e4c56d5167b1df40a Reviewed-on: https://gerrit.libreoffice.org/6010 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/ucalc.cxx4
-rw-r--r--sc/source/ui/src/scfuncs.src4
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 324400b7abdc..e5e6198d45a9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2119,8 +2119,6 @@ void Test::testFunctionLists()
"ATAN",
"ATAN2",
"ATANH",
- "AVERAGEIF",
- "AVERAGEIFS",
"BITAND",
"BITLSHIFT",
"BITOR",
@@ -2199,6 +2197,8 @@ void Test::testFunctionLists()
"AVEDEV",
"AVERAGE",
"AVERAGEA",
+ "AVERAGEIF",
+ "AVERAGEIFS",
"B",
"BETADIST",
"BETAINV",
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 7c3922ea5d89..b054a6d37b43 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -3007,7 +3007,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
ExtraData =
{
0;
- ID_FUNCTION_GRP_MATH;
+ ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_AVERAGEIF );
3; 0; 0; 1;
0;
@@ -3088,7 +3088,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
ExtraData =
{
0;
- ID_FUNCTION_GRP_MATH;
+ ID_FUNCTION_GRP_STATISTIC;
U2S( HID_FUNC_AVERAGEIFS );
PAIRED_VAR_ARGS+1; 0; 0; 0;
0;