[Libreoffice-commits] core.git: sc/qa sc/source

Joel Madero jmadero.dev at gmail.com
Mon Sep 23 16:59:16 PDT 2013


 sc/qa/unit/ucalc.cxx         |    4 ++--
 sc/source/ui/src/scfuncs.src |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4547d8c42e5b0bb456ac02fbea67059a8a1cadd7
Author: Joel Madero <jmadero.dev at gmail.com>
Date:   Thu Sep 19 22:37:39 2013 -0700

    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 at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 324400b..e5e6198 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 7c3922e..b054a6d 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;


More information about the Libreoffice-commits mailing list