fdo#85818: rename Kombin, Kombin2, Variationen, Variationen2

Rename OcKombin to OcCombin, SC_OPCODE_KOMBIN to SC_OPCODE_COMBIN,
ScInterpreter::ScKombin() to ScInterpreter::ScCombin(), OpKombin to
OpCombin.

Rename OcKombin2 to OcCombinA, SC_OPCODE_KOMBIN_2 to
SC_OPCODE_COMBIN_A, ScInterpreter::ScKombin2() to
ScInterpreter::ScCombinA(), OpKombin2 to OpCombinA.

Rename OcVariationen to OcPermut, SC_OPCODE_VARIATIONEN to
SC_OPCODE_PERMUT, ScInterpreter::ScVariationen() to
ScInterpreter::ScPermut(), OpVariationen to OpPermut.

Rename OcVariationen2 to OcPermutationA, SC_OPCODE_VARIATIONEN_2 to
SC_OPCODE_PERMUTATION_A, ScInterpreter::ScVariationen2() to
ScInterpreter::ScPermutationA(), OpVariationen2 to OpPermutationA.

Change-Id: I2efa01e9b160e98058879d08e2e2313284a5ec91
Reviewed-on: https://gerrit.libreoffice.org/13814
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

12 files changed, 45 insertions, 45 deletions

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index c5bdadee0558..dd09464e0d55 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -769,10 +769,10 @@ void ScGammaInv();
 void ScExpDist();
 void ScBinomDist();
 void ScPoissonDist();
-void ScKombin();
-void ScKombin2();
-void ScVariationen();
-void ScVariationen2();
+void ScCombin();
+void ScCombinA();
+void ScPermut();
+void ScPermutationA();
 void ScB();
 void ScHypGeomDist();
 void ScHypGeomDist_MS();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index e57799de1629..51e2e72d764b 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2430,13 +2430,13 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
                 mvSubArguments.push_back(SoPHelper(ts,
                         ft->Children[i], new OpNormsinv, nResultSize));
                 break;
-            case ocVariationen:
+            case ocPermut:
                 mvSubArguments.push_back(SoPHelper(ts,
-                        ft->Children[i], new OpVariationen, nResultSize));
+                        ft->Children[i], new OpPermut, nResultSize));
                 break;
-            case ocVariationen2:
+            case ocPermutationA:
                 mvSubArguments.push_back(SoPHelper(ts,
-                        ft->Children[i], new OpVariationen2, nResultSize));
+                        ft->Children[i], new OpPermutationA, nResultSize));
                 break;
             case ocPhi:
                 mvSubArguments.push_back(SoPHelper(ts,
@@ -2603,9 +2603,9 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
                 mvSubArguments.push_back(SoPHelper(ts,
                         ft->Children[i], new OpCountIfs, nResultSize));
                 break;
-            case ocKombin2:
+            case ocCombinA:
                 mvSubArguments.push_back(SoPHelper(ts,
-                        ft->Children[i], new OpCombina, nResultSize));
+                        ft->Children[i], new OpCombinA, nResultSize));
                 break;
             case ocEven:
                 mvSubArguments.push_back(SoPHelper(ts,
@@ -2675,9 +2675,9 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
                 mvSubArguments.push_back(SoPHelper(ts,
                         ft->Children[i], new OpCeil, nResultSize));
                 break;
-            case ocKombin:
+            case ocCombin:
                 mvSubArguments.push_back(SoPHelper(ts,
-                        ft->Children[i], new OpKombin, nResultSize));
+                        ft->Children[i], new OpCombin, nResultSize));
                 break;
             case ocDevSq:
                 mvSubArguments.push_back(SoPHelper(ts,
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index 557a92683a17..a68cfa8d14fc 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -321,14 +321,14 @@ void OpCoth::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "}";
 }
 
-void OpCombina::BinInlineFun(std::set<std::string>& decls,
+void OpCombinA::BinInlineFun(std::set<std::string>& decls,
     std::set<std::string>& funs)
 {
     decls.insert(bikDecl);
     funs.insert(bik);
 }
 
-void OpCombina::GenSlidingWindowFunction(std::stringstream &ss,
+void OpCombinA::GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments)
 {
     ss << "\ndouble " << sSymName;
@@ -2739,7 +2739,7 @@ void OpCeil::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "*significance;\n";
     ss << "}";
 }
-void OpKombin::GenSlidingWindowFunction(std::stringstream &ss,
+void OpCombin::GenSlidingWindowFunction(std::stringstream &ss,
     const std::string &sSymName, SubArguments &vSubArguments)
 {
     ss << "\ndouble " << sSymName;
diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx
index e839cf37b8d1..3929154c698b 100644
--- a/sc/source/core/opencl/op_math.hxx
+++ b/sc/source/core/opencl/op_math.hxx
@@ -412,7 +412,7 @@ public:
     virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SqrtPi"; }
 };
 
-class OpCombina: public Normal
+class OpCombinA: public Normal
 {
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
@@ -429,12 +429,12 @@ public:
 
     virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log"; }
 };
-class OpKombin: public Normal{
+class OpCombin: public Normal{
 public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
         const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
     virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; }
-    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScKombin"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCombin"; }
 };
 class OpAverageIf: public CheckVariables
 {
diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index 7fe8eedd56bb..1f667f5e107d 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -4962,7 +4962,7 @@ void OpNormsdist::GenSlidingWindowFunction(
     ss << "}\n";
 }
 
-void OpVariationen::GenSlidingWindowFunction(
+void OpPermut::GenSlidingWindowFunction(
     std::stringstream &ss,const std::string &sSymName,
     SubArguments &vSubArguments)
 {
@@ -5035,7 +5035,7 @@ void OpVariationen::GenSlidingWindowFunction(
     ss << "      return tmp;\n";
     ss << "}\n";
 }
-void OpVariationen2::GenSlidingWindowFunction(
+void OpPermutationA::GenSlidingWindowFunction(
     std::stringstream &ss,const std::string &sSymName,
     SubArguments &vSubArguments)
 {
diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx
index eff8990777e5..792c486ea6be 100644
--- a/sc/source/core/opencl/op_statistical.hxx
+++ b/sc/source/core/opencl/op_statistical.hxx
@@ -277,17 +277,17 @@ public:
     virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Covar"; }
 };
 
-class OpVariationen:public Normal{
+class OpPermut:public Normal{
     public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
-    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVariationen"; }
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermut"; }
 };
-class OpVariationen2:public Normal{
+class OpPermutationA:public Normal{
     public:
     virtual void GenSlidingWindowFunction(std::stringstream &ss,
             const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;
-    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVariationen2";}
+    virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermutationA";}
 };
 
 class OpConfidence: public Normal
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 90b5cf7dca1a..2ab14289a56c 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -1172,7 +1172,7 @@ void ScInterpreter::ScFact()
         PushDouble(Fakultaet(nVal));
 }
 
-void ScInterpreter::ScKombin()
+void ScInterpreter::ScCombin()
 {
     if ( MustHaveParamCount( GetByte(), 2 ) )
     {
@@ -1185,7 +1185,7 @@ void ScInterpreter::ScKombin()
     }
 }
 
-void ScInterpreter::ScKombin2()
+void ScInterpreter::ScCombinA()
 {
     if ( MustHaveParamCount( GetByte(), 2 ) )
     {
@@ -1198,7 +1198,7 @@ void ScInterpreter::ScKombin2()
     }
 }
 
-void ScInterpreter::ScVariationen()
+void ScInterpreter::ScPermut()
 {
     if ( MustHaveParamCount( GetByte(), 2 ) )
     {
@@ -1218,7 +1218,7 @@ void ScInterpreter::ScVariationen()
     }
 }
 
-void ScInterpreter::ScVariationen2()
+void ScInterpreter::ScPermutationA()
 {
     if ( MustHaveParamCount( GetByte(), 2 ) )
     {
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 917d9e4b131b..bf94a474a0b0 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4110,10 +4110,10 @@ StackVar ScInterpreter::Interpret()
                 case ocBinomDist_MS     : ScBinomDist();                break;
                 case ocPoissonDist      :
                 case ocPoissonDist_MS   : ScPoissonDist();              break;
-                case ocKombin           : ScKombin();                   break;
-                case ocKombin2          : ScKombin2();                  break;
-                case ocVariationen      : ScVariationen();              break;
-                case ocVariationen2     : ScVariationen2();             break;
+                case ocCombin           : ScCombin();                   break;
+                case ocCombinA          : ScCombinA();                  break;
+                case ocPermut           : ScPermut();                   break;
+                case ocPermutationA     : ScPermutationA();             break;
                 case ocHypGeomDist      : ScHypGeomDist();              break;
                 case ocHypGeomDist_MS   : ScHypGeomDist_MS();           break;
                 case ocLogNormDist      : ScLogNormDist( 1 );           break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 906d7820ccbd..dace254ee515 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1214,8 +1214,8 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             case ocStdNormDist:
             case ocNormInv:
             case ocSNormInv:
-            case ocVariationen:
-            case ocVariationen2:
+            case ocPermut:
+            case ocPermutationA:
             case ocPhi:
             case ocIpmt:
             case ocConfidence:
@@ -1256,7 +1256,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             case ocExpDist:
             case ocAverageIfs:
             case ocCountIfs:
-            case ocKombin2:
+            case ocCombinA:
             case ocEven:
             case ocLog:
             case ocMod:
@@ -1274,7 +1274,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
             case ocBinomDist:
             case ocVarP:
             case ocCeil:
-            case ocKombin:
+            case ocCombin:
             case ocDevSq:
             case ocStDev:
             case ocSlope:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index ce8c3dd95c27..d822692680bc 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -266,7 +266,7 @@ static const XclFunctionInfo saFuncTable_4[] =
     { ocBinomDist,          273,    4,  4,  V, { VR }, 0, 0 },
     { ocChiDist,            274,    2,  2,  V, { VR }, 0, 0 },
     { ocChiInv,             275,    2,  2,  V, { VR }, 0, 0 },
-    { ocKombin,             276,    2,  2,  V, { VR }, 0, 0 },
+    { ocCombin,             276,    2,  2,  V, { VR }, 0, 0 },
     { ocConfidence,         277,    3,  3,  V, { VR }, 0, 0 },
     { ocKritBinom,          278,    3,  3,  V, { VR }, 0, 0 },
     { ocEven,               279,    1,  1,  V, { VR }, 0, 0 },
@@ -289,7 +289,7 @@ static const XclFunctionInfo saFuncTable_4[] =
     { ocSNormInv,           296,    1,  1,  V, { VR }, 0, 0 },
     { ocStandard,           297,    3,  3,  V, { VR }, 0, 0 },
     { ocOdd,                298,    1,  1,  V, { VR }, 0, 0 },
-    { ocVariationen,        299,    2,  2,  V, { VR }, 0, 0 },
+    { ocPermut,             299,    2,  2,  V, { VR }, 0, 0 },
     { ocPoissonDist,        300,    3,  3,  V, { VR }, 0, 0 },
     { ocTDist,              301,    3,  3,  V, { VR }, 0, 0 },
     { ocWeibull,            302,    4,  4,  V, { VR }, 0, 0 },
@@ -527,7 +527,7 @@ static const XclFunctionInfo saFuncTable_2013[] =
      * for the weird Excel CEILING behavior, check that and unify or diversify.
      * */
     EXC_FUNCENTRY_V_VR(         ocNoName,        1,  3,  0,  "CEILING.MATH" ),
-    EXC_FUNCENTRY_V_VR(         ocKombin2,       2,  2,  0,  "COMBINA" ),
+    EXC_FUNCENTRY_V_VR(         ocCombinA,       2,  2,  0,  "COMBINA" ),
     EXC_FUNCENTRY_V_VR_IMPORT(  ocCot,           1,  1,  0,  "COT" ),
     EXC_FUNCENTRY_V_VR_IMPORT(  ocCotHyp,        1,  1,  0,  "COTH" ),
     EXC_FUNCENTRY_V_VR_IMPORT(  ocCosecant,      1,  1,  0,  "CSC" ),
@@ -555,7 +555,7 @@ static const XclFunctionInfo saFuncTable_2013[] =
     EXC_FUNCENTRY_A_VR(         ocMatrixUnit,    1,  1,  0,  "MUNIT" ),
     EXC_FUNCENTRY_V_VR(         ocNumberValue,   1,  3,  0,  "NUMBERVALUE" ),
     EXC_FUNCENTRY_V_VR(         ocLaufz,         3,  3,  0,  "PDURATION" ),
-    EXC_FUNCENTRY_V_VR(         ocVariationen2,  2,  2,  0,  "PERMUTATIONA" ),
+    EXC_FUNCENTRY_V_VR(         ocPermutationA,  2,  2,  0,  "PERMUTATIONA" ),
     EXC_FUNCENTRY_V_VR(         ocPhi,           1,  1,  0,  "PHI" ),
     EXC_FUNCENTRY_V_VR(         ocZGZ,           3,  3,  0,  "RRI" ),
     EXC_FUNCENTRY_V_VR_IMPORT(  ocSecant,        1,  1,  0,  "SEC" ),
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 9f6f2a5432c6..7faf36397a1a 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -2042,7 +2042,7 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
     else if (rTest == "PRODUCT")
             eId=ocProduct;
     else if (rTest == "PERMUT")
-            eId=ocVariationen;
+            eId=ocPermut;
     else if (rTest == "GAMMALN")
             eId=ocGammaLn;
     else if (rTest =="POISSON")
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 069b42ba0676..6fd6d2ffb134 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -3369,7 +3369,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         };
     };
      // -=*# Resource for function KOMBINATIONEN #*=-
-    Resource SC_OPCODE_KOMBIN
+    Resource SC_OPCODE_COMBIN
     {
         String 1 // Description
         {
@@ -3401,7 +3401,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         };
     };
      // -=*# Resource for function KOMBINATIONEN2 #*=-
-    Resource SC_OPCODE_KOMBIN_2
+    Resource SC_OPCODE_COMBIN_A
     {
         String 1 // Description
         {
@@ -9001,7 +9001,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         };
     };
      // -=*# Resource for function VARIATIONEN #*=-
-    Resource SC_OPCODE_VARIATIONEN
+    Resource SC_OPCODE_PERMUT
     {
         String 1 // Description
         {
@@ -9033,7 +9033,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
         };
     };
      // -=*# Resource for function VARIATIONEN2 #*=-
-    Resource SC_OPCODE_VARIATIONEN_2
+    Resource SC_OPCODE_PERMUTATION_A
     {
         String 1 // Description
         {