[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:52:56 PST 2015
formula/source/core/resource/core_resource.src | 8 ++++----
include/formula/compiler.hrc | 2 +-
include/formula/opcode.hxx | 2 +-
sc/source/core/opencl/formulagroupcl.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/core/tool/token.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/filter/lotus/lotform.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 0302305dd47b679e889746459d32725bd06ea5b0
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Mon Jan 12 20:19:06 2015 +0100
fdo#85818: rename KritBinom to CritBinom
Change-Id: I2fa011eea4263f005c3a22072a6144972e9f0bb7
Reviewed-on: https://gerrit.libreoffice.org/13890
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 3d28399..e11ec36 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -306,7 +306,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_WEIBULL_MS { Text = "COM.MICROSOFT.WEIBULL.DIST" ; };
String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; };
String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "COM.MICROSOFT.NEGBINOM.DIST" ; };
- String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; };
+ String SC_OPCODE_CRIT_BINOM { Text = "CRITBINOM" ; };
String SC_OPCODE_BINOM_INV { Text = "COM.MICROSOFT.BINOM.INV" ; };
String SC_OPCODE_KURT { Text = "KURT" ; };
String SC_OPCODE_HAR_MEAN { Text = "HARMEAN" ; };
@@ -714,7 +714,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_WEIBULL_MS { Text = "_xlfn.WEIBULL.DIST" ; };
String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; };
String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "_xlfn.NEGBINOM.DIST" ; };
- String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; };
+ String SC_OPCODE_CRIT_BINOM { Text = "CRITBINOM" ; };
String SC_OPCODE_BINOM_INV { Text = "_xlfn.BINOM.INV" ; };
String SC_OPCODE_KURT { Text = "KURT" ; };
String SC_OPCODE_HAR_MEAN { Text = "HARMEAN" ; };
@@ -1124,7 +1124,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_WEIBULL_MS { Text = "WEIBULL.DIST" ; };
String SC_OPCODE_NEG_BINOM_VERT { Text = "NEGBINOMDIST" ; };
String SC_OPCODE_NEG_BINOM_DIST_MS { Text = "NEGBINOM.DIST" ; };
- String SC_OPCODE_KRIT_BINOM { Text = "CRITBINOM" ; };
+ String SC_OPCODE_CRIT_BINOM { Text = "CRITBINOM" ; };
String SC_OPCODE_BINOM_INV { Text = "BINOM.INV" ; };
String SC_OPCODE_KURT { Text = "KURT" ; };
String SC_OPCODE_HAR_MEAN { Text = "HARMEAN" ; };
@@ -2311,7 +2311,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "NEGBINOM.DIST" ;
};
- String SC_OPCODE_KRIT_BINOM
+ String SC_OPCODE_CRIT_BINOM
{
Text [ en-US ] = "CRITBINOM" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index cc8b709..a7618f6 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -317,7 +317,7 @@
#define SC_OPCODE_CHI_DIST 316
#define SC_OPCODE_WEIBULL 317
#define SC_OPCODE_NEG_BINOM_VERT 318
-#define SC_OPCODE_KRIT_BINOM 319
+#define SC_OPCODE_CRIT_BINOM 319
#define SC_OPCODE_KURT 320
#define SC_OPCODE_HAR_MEAN 321
#define SC_OPCODE_GEO_MEAN 322
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index b7cdba5..454242d 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -352,7 +352,7 @@ enum OpCode : sal_uInt16
ocWeibull_MS = SC_OPCODE_WEIBULL_MS,
ocNegBinomVert = SC_OPCODE_NEG_BINOM_VERT,
ocNegBinomDist_MS = SC_OPCODE_NEG_BINOM_DIST_MS,
- ocKritBinom = SC_OPCODE_KRIT_BINOM,
+ ocCritBinom = SC_OPCODE_CRIT_BINOM,
ocKurt = SC_OPCODE_KURT,
ocHarMean = SC_OPCODE_HAR_MEAN,
ocGeoMean = SC_OPCODE_GEO_MEAN,
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 94b0b28..dd844bd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2798,7 +2798,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpCosh, nResultSize));
break;
- case ocKritBinom:
+ case ocCritBinom:
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpCritBinom, nResultSize));
break;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 18cbb93..c2afa5b 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4144,7 +4144,7 @@ StackVar ScInterpreter::Interpret()
case ocWeibull :
case ocWeibull_MS : ScWeibull(); break;
case ocBinomInv :
- case ocKritBinom : ScCritBinom(); break;
+ case ocCritBinom : ScCritBinom(); break;
case ocNegBinomVert : ScNegBinomDist(); break;
case ocNegBinomDist_MS : ScNegBinomDist_MS(); break;
case ocNoName : ScNoName(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1d1f916..b84eb38 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1224,7 +1224,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocLogInv:
case ocArcCot:
case ocCosHyp:
- case ocKritBinom:
+ case ocCritBinom:
case ocArcCotHyp:
case ocArcSin:
case ocArcSinHyp:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 5d721a5..732472a 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -268,7 +268,7 @@ static const XclFunctionInfo saFuncTable_4[] =
{ ocChiInv, 275, 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 },
+ { ocCritBinom, 278, 3, 3, V, { VR }, 0, 0 },
{ ocEven, 279, 1, 1, V, { VR }, 0, 0 },
{ ocExpDist, 280, 3, 3, V, { VR }, 0, 0 },
{ ocFDist, 281, 3, 3, V, { VR }, 0, 0 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 9e83d44..f7951d7 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -2050,7 +2050,7 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
else if (rTest == "NORMAL")
eId=ocNormDist;
else if (rTest == "CRITBINOMIAL")
- eId=ocKritBinom;
+ eId=ocCritBinom;
else if (rTest == "TERM")
eId=ocNper;
else if (rTest == "CTERM")
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 748d373..8a8e554 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -6808,7 +6808,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
};
// -=*# Resource for function CRITBINOM #*=-
- Resource SC_OPCODE_KRIT_BINOM
+ Resource SC_OPCODE_CRIT_BINOM
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list