[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:53:27 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/parclass.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 +-
10 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit d6be636b19aea636ea5ba1007fd27eee61fb0dab
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Mon Jan 12 20:23:29 2015 +0100
fdo#85818: rename Schiefe to Skew
Change-Id: Ie8da01e3062e380070672406e1dcd9227bf75f95
Reviewed-on: https://gerrit.libreoffice.org/13891
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 e11ec36..88b6e28 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -313,7 +313,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_GEO_MEAN { Text = "GEOMEAN" ; };
String SC_OPCODE_STANDARD { Text = "STANDARDIZE" ; };
String SC_OPCODE_AVE_DEV { Text = "AVEDEV" ; };
- String SC_OPCODE_SCHIEFE { Text = "SKEW" ; };
+ String SC_OPCODE_SKEW { Text = "SKEW" ; };
String SC_OPCODE_SKEWP { Text = "SKEWP" ; };
String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; };
String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; };
@@ -721,7 +721,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_GEO_MEAN { Text = "GEOMEAN" ; };
String SC_OPCODE_STANDARD { Text = "STANDARDIZE" ; };
String SC_OPCODE_AVE_DEV { Text = "AVEDEV" ; };
- String SC_OPCODE_SCHIEFE { Text = "SKEW" ; };
+ String SC_OPCODE_SKEW { Text = "SKEW" ; };
String SC_OPCODE_SKEWP { Text = "_xlfn.SKEW.P" ; };
String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; };
String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; };
@@ -1131,7 +1131,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_GEO_MEAN { Text = "GEOMEAN" ; };
String SC_OPCODE_STANDARD { Text = "STANDARDIZE" ; };
String SC_OPCODE_AVE_DEV { Text = "AVEDEV" ; };
- String SC_OPCODE_SCHIEFE { Text = "SKEW" ; };
+ String SC_OPCODE_SKEW { Text = "SKEW" ; };
String SC_OPCODE_SKEWP { Text = "SKEWP" ; };
String SC_OPCODE_DEV_SQ { Text = "DEVSQ" ; };
String SC_OPCODE_MEDIAN { Text = "MEDIAN" ; };
@@ -2339,7 +2339,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "AVEDEV" ;
};
- String SC_OPCODE_SCHIEFE
+ String SC_OPCODE_SKEW
{
Text [ en-US ] = "SKEW" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index a7618f6..61ec34c 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -323,7 +323,7 @@
#define SC_OPCODE_GEO_MEAN 322
#define SC_OPCODE_STANDARD 323
#define SC_OPCODE_AVE_DEV 324
-#define SC_OPCODE_SCHIEFE 325
+#define SC_OPCODE_SKEW 325
#define SC_OPCODE_DEV_SQ 326
#define SC_OPCODE_MEDIAN 327
#define SC_OPCODE_MODAL_VALUE 328
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 454242d..c6b0a0a 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -358,7 +358,7 @@ enum OpCode : sal_uInt16
ocGeoMean = SC_OPCODE_GEO_MEAN,
ocStandard = SC_OPCODE_STANDARD,
ocAveDev = SC_OPCODE_AVE_DEV,
- ocSchiefe = SC_OPCODE_SCHIEFE,
+ ocSkew = SC_OPCODE_SKEW,
ocSkewp = SC_OPCODE_SKEWP,
ocDevSq = SC_OPCODE_DEV_SQ,
ocMedian = SC_OPCODE_MEDIAN,
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index dd844bd..06d3417 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2951,7 +2951,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpTrunc, nResultSize));
break;
- case ocSchiefe:
+ case ocSkew:
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpSkew, nResultSize));
break;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c2afa5b..d2fa09a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4133,7 +4133,7 @@ StackVar ScInterpreter::Interpret()
case ocAveDev : ScAveDev(); break;
case ocDevSq : ScDevSq(); break;
case ocKurt : ScKurt(); break;
- case ocSchiefe : ScSkew(); break;
+ case ocSkew : ScSkew(); break;
case ocSkewp : ScSkewp(); break;
case ocModalValue : ScModalValue(); break;
case ocModalValue_MS : ScModalValue(); break;
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 1f56407..b072ef0 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -172,7 +172,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
{ ocRow, {{ Reference }, 0 }},
{ ocRows, {{ Reference }, 1 }},
{ ocRSQ, {{ ForceArray, ForceArray }, 0 }},
- { ocSchiefe, {{ Reference }, 1 }},
+ { ocSkew, {{ Reference }, 1 }},
{ ocSkewp, {{ Reference }, 1 }},
{ ocSlope, {{ ForceArray, ForceArray }, 0 }},
{ ocSmall, {{ Reference, Value }, 0 }},
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index b84eb38..4312f55 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1261,7 +1261,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocLog:
case ocMod:
case ocTrunc:
- case ocSchiefe:
+ case ocSkew:
case ocArcTan2:
case ocBitOr:
case ocBitLshift:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 732472a..1842909 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -313,7 +313,7 @@ static const XclFunctionInfo saFuncTable_4[] =
{ ocHarMean, 320, 1, MX, V, { RX }, 0, 0 },
{ ocSumSQ, 321, 0, MX, V, { RX }, 0, 0 },
{ ocKurt, 322, 1, MX, V, { RX }, 0, 0 },
- { ocSchiefe, 323, 1, MX, V, { RX }, 0, 0 },
+ { ocSkew, 323, 1, MX, V, { RX }, 0, 0 },
{ ocZTest, 324, 2, 3, V, { RX, VR }, 0, 0 },
{ ocLarge, 325, 2, 2, V, { RX, VR }, 0, 0 },
{ ocSmall, 326, 2, 2, V, { RX, VR }, 0, 0 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index f7951d7..d08715e 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -2032,7 +2032,7 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
else if (rTest == "COV")
eId=ocCovar;
else if (rTest == "SKEWNESS")
- eId=ocSchiefe;
+ eId=ocSkew;
else if (rTest == "CHITEST")
eId=ocChiTest;
else if (rTest == "FTEST")
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 8a8e554..d823e63 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5688,7 +5688,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
};
// -=*# Resource for function SKEW #*=-
- Resource SC_OPCODE_SCHIEFE
+ Resource SC_OPCODE_SKEW
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list