[Libreoffice-commits] core.git: Branch 'feature/pivot_median' - 3 commits - sc/inc sc/source

[Tamás Zolnai]

 sc/inc/dpglobal.hxx                            |    2 -
 sc/inc/globstr.hrc                             |   11 ------
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |   30 ++++++++++-------
 sc/source/ui/src/globstr.src                   |   44 -------------------------
 4 files changed, 18 insertions(+), 69 deletions(-)

New commits:
commit e80451233e87c18c8f4d47b50355fc156a9bf4f6
Author: Tamás Zolnai <zolnaitamas2000 at gmail.com>
Date:   Thu Nov 3 11:33:24 2016 +0100

    Display localized function names in Pivot Layout dialog
    
    Same names which are displayed for pivot table
    placed on a sheet.
    
    Change-Id: Ic05d0dddea7d17101f253874dff15b8a49b87287

diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
index dc24b80..71e48c1 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
@@ -16,6 +16,7 @@
 #include <svtools/treelistentry.hxx>
 #include "pivot.hxx"
 #include "scabstdlg.hxx"
+#include "globstr.hrc"
 
 using namespace std;
 
@@ -28,23 +29,28 @@ namespace
 
 OUString lclGetFunctionMaskName(const PivotFunc nFunctionMask)
 {
+    sal_uInt16 nStrId = 0;
     switch (nFunctionMask)
     {
-        case PivotFunc::Sum:       return OUString("Sum");
-        case PivotFunc::Count:     return OUString("Count");
-        case PivotFunc::Average:   return OUString("Mean");
-        case PivotFunc::Max:       return OUString("Max");
-        case PivotFunc::Min:       return OUString("Min");
-        case PivotFunc::Product:   return OUString("Product");
-        case PivotFunc::CountNum: return OUString("Count");
-        case PivotFunc::StdDev:   return OUString("StDev");
-        case PivotFunc::StdDevP:  return OUString("StDevP");
-        case PivotFunc::StdVar:   return OUString("Var");
-        case PivotFunc::StdVarP:  return OUString("VarP");
+        case PivotFunc::Sum:        nStrId = STR_FUN_TEXT_SUM;      break;
+        case PivotFunc::Count:      nStrId = STR_FUN_TEXT_COUNT;    break;
+        case PivotFunc::Average:    nStrId = STR_FUN_TEXT_AVG;      break;
+        case PivotFunc::Max:        nStrId = STR_FUN_TEXT_MAX;      break;
+        case PivotFunc::Min:        nStrId = STR_FUN_TEXT_MIN;      break;
+        case PivotFunc::Product:    nStrId = STR_FUN_TEXT_PRODUCT;  break;
+        case PivotFunc::CountNum:   nStrId = STR_FUN_TEXT_COUNT;    break;
+        case PivotFunc::StdDev:     nStrId = STR_FUN_TEXT_STDDEV;   break;
+        case PivotFunc::StdDevP:    nStrId = STR_FUN_TEXT_STDDEV;   break;
+        case PivotFunc::StdVar:     nStrId = STR_FUN_TEXT_VAR;      break;
+        case PivotFunc::StdVarP:    nStrId = STR_FUN_TEXT_VAR;      break;
         default:
+            assert(false);
             break;
     }
-    return OUString();
+    if (nStrId != 0)
+        return ScGlobal::GetRscString(nStrId);
+    else
+        return OUString();
 }
 
 OUString lclCreateDataItemName(const PivotFunc nFunctionMask, const OUString& rName, const sal_uInt8 nDuplicationCount)
commit f9e88b916701e78556ffc3271eb2a54ada972b36
Author: Tamás Zolnai <zolnaitamas2000 at gmail.com>
Date:   Thu Nov 3 11:32:25 2016 +0100

    Remove some unused resource strings
    
    Change-Id: I8529aa491d37aef5e732909357ddf93372dde6d2

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 9c94a7c..5833436 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -106,17 +106,6 @@
 #define STR_BOX_YNI                 66
 #define STR_NO_REF_TABLE            67
 
-#define STR_PIVOTFUNC_SUM           68  // pivot.cxx
-#define STR_PIVOTFUNC_COUNT         69
-#define STR_PIVOTFUNC_AVG           70
-#define STR_PIVOTFUNC_MAX           71
-#define STR_PIVOTFUNC_MIN           72
-#define STR_PIVOTFUNC_PROD          73
-#define STR_PIVOTFUNC_COUNT2        74
-#define STR_PIVOTFUNC_STDDEV        75
-#define STR_PIVOTFUNC_STDDEV2       76
-#define STR_PIVOTFUNC_VAR           77
-#define STR_PIVOTFUNC_VAR2          78
 #define STR_PIVOT_TOTAL             79
 #define STR_PIVOT_DATA              80
 
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 27ef036..241254b 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -533,50 +533,6 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "Group" ;
     };
-    String STR_PIVOTFUNC_SUM
-    {
-        Text [ en-US ] = "SUM" ;
-    };
-    String STR_PIVOTFUNC_COUNT
-    {
-        Text [ en-US ] = "COUNT" ;
-    };
-    String STR_PIVOTFUNC_AVG
-    {
-        Text [ en-US ] = "AVERAGE" ;
-    };
-    String STR_PIVOTFUNC_MAX
-    {
-        Text [ en-US ] = "MAX" ;
-    };
-    String STR_PIVOTFUNC_MIN
-    {
-        Text [ en-US ] = "MIN" ;
-    };
-    String STR_PIVOTFUNC_PROD
-    {
-        Text [ en-US ] = "PRODUCT" ;
-    };
-    String STR_PIVOTFUNC_COUNT2
-    {
-        Text [ en-US ] = "COUNTA" ;
-    };
-    String STR_PIVOTFUNC_STDDEV
-    {
-        Text [ en-US ] = "STDEV" ;
-    };
-    String STR_PIVOTFUNC_STDDEV2
-    {
-        Text [ en-US ] = "STDEVP" ;
-    };
-    String STR_PIVOTFUNC_VAR
-    {
-        Text [ en-US ] = "VAR" ;
-    };
-    String STR_PIVOTFUNC_VAR2
-    {
-        Text [ en-US ] = "VARP" ;
-    };
     String STR_TABLE
     {
         Text [ en-US ] = "Sheet" ;
commit 5b8d49854250c38ecc5a1bbd3f28a7507653c773
Author: Tamás Zolnai <zolnaitamas2000 at gmail.com>
Date:   Thu Nov 3 02:05:46 2016 +0100

    Remove unused macro
    
    Change-Id: I407217703d285fc858208cbcdfae0fe84a30fcee

diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index e6ca2c2..7c82541 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -22,8 +22,6 @@
 
 #include <o3tl/typed_flags_set.hxx>
 
-#define     PIVOT_MAXFUNC           11
-
 enum class PivotFunc {
     NONE         = 0x0000,
     Sum          = 0x0001,