[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:54:09 PST 2015
formula/source/core/api/FormulaCompiler.cxx | 2 +-
formula/source/core/resource/core_resource.src | 8 ++++----
include/formula/compiler.hrc | 2 +-
include/formula/opcode.hxx | 2 +-
sc/source/core/inc/interpre.hxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/core/tool/interpr5.cxx | 2 +-
sc/source/core/tool/parclass.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 4 ++--
sc/source/ui/src/scfuncs.src | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit e613c9fba449fda0db163de413eeda50f521db41
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Tue Jan 13 10:44:35 2015 +0100
fdo#85818: rename RGP to Linest
Change-Id: I4bdf934730a54a76f5762fd079dc6270fa135840
Reviewed-on: https://gerrit.libreoffice.org/13893
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index ebc5edd..0109587 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -849,7 +849,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode )
case ocGrowth :
case ocTrend :
case ocLogest :
- case ocRGP :
+ case ocLinest :
case ocFrequency :
case ocMatTrans :
case ocMatMult :
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index c929999..9d22494 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -360,7 +360,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_INTERCEPT { Text = "INTERCEPT" ; };
String SC_OPCODE_TREND { Text = "TREND" ; };
String SC_OPCODE_GROWTH { Text = "GROWTH" ; };
- String SC_OPCODE_RGP { Text = "LINEST" ; };
+ String SC_OPCODE_LINEST { Text = "LINEST" ; };
String SC_OPCODE_LOGEST { Text = "LOGEST" ; };
String SC_OPCODE_FORECAST { Text = "FORECAST" ; };
String SC_OPCODE_CHI_INV { Text = "LEGACY.CHIINV" ; };
@@ -768,7 +768,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_INTERCEPT { Text = "INTERCEPT" ; };
String SC_OPCODE_TREND { Text = "TREND" ; };
String SC_OPCODE_GROWTH { Text = "GROWTH" ; };
- String SC_OPCODE_RGP { Text = "LINEST" ; };
+ String SC_OPCODE_LINEST { Text = "LINEST" ; };
String SC_OPCODE_LOGEST { Text = "LOGEST" ; };
String SC_OPCODE_FORECAST { Text = "FORECAST" ; };
String SC_OPCODE_CHI_INV { Text = "CHIINV" ; };
@@ -1178,7 +1178,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_INTERCEPT { Text = "INTERCEPT" ; };
String SC_OPCODE_TREND { Text = "TREND" ; };
String SC_OPCODE_GROWTH { Text = "GROWTH" ; };
- String SC_OPCODE_RGP { Text = "LINEST" ; };
+ String SC_OPCODE_LINEST { Text = "LINEST" ; };
String SC_OPCODE_LOGEST { Text = "LOGEST" ; };
String SC_OPCODE_FORECAST { Text = "FORECAST" ; };
String SC_OPCODE_CHI_INV { Text = "CHIINV" ; };
@@ -2527,7 +2527,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "GROWTH" ;
};
- String SC_OPCODE_RGP
+ String SC_OPCODE_LINEST
{
Text [ en-US ] = "LINEST" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index b09b756..6ace741 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -350,7 +350,7 @@
#define SC_OPCODE_INTERCEPT 349
#define SC_OPCODE_TREND 350
#define SC_OPCODE_GROWTH 351
-#define SC_OPCODE_RGP 352
+#define SC_OPCODE_LINEST 352
#define SC_OPCODE_LOGEST 353
#define SC_OPCODE_FORECAST 354
#define SC_OPCODE_CHI_INV 355
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 94756b4d..039aaaa 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -405,7 +405,7 @@ enum OpCode : sal_uInt16
ocIntercept = SC_OPCODE_INTERCEPT,
ocTrend = SC_OPCODE_TREND,
ocGrowth = SC_OPCODE_GROWTH,
- ocRGP = SC_OPCODE_RGP,
+ ocLinest = SC_OPCODE_LINEST,
ocLogest = SC_OPCODE_LOGEST,
ocForecast = SC_OPCODE_FORECAST,
ocChiInv = SC_OPCODE_CHI_INV,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 222e7b9c..07e1cce 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -730,7 +730,7 @@ void CalculateRGPRKP(bool _bRKP);
void CalculateSumX2MY2SumX2DY2(bool _bSumX2DY2);
void CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE nR);
bool CheckMatrix(bool _bLOG,sal_uInt8& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY);
-void ScRGP();
+void ScLinest();
void ScLogest();
void ScForecast();
void ScNoName();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 879367b..acb1002 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4190,7 +4190,7 @@ StackVar ScInterpreter::Interpret()
case ocIntercept : ScIntercept(); break;
case ocTrend : ScTrend(); break;
case ocGrowth : ScGrowth(); break;
- case ocRGP : ScRGP(); break;
+ case ocLinest : ScLinest(); break;
case ocLogest : ScLogest(); break;
case ocForecast : ScForecast(); break;
case ocGammaLn :
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 359ed13..fe87c04 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -2338,7 +2338,7 @@ bool ScInterpreter::CheckMatrix(bool _bLOG, sal_uInt8& nCase, SCSIZE& nCX,
}
// LINEST
-void ScInterpreter::ScRGP()
+void ScInterpreter::ScLinest()
{
CalculateRGPRKP(false);
}
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index a2019ec..81e3deb 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -167,7 +167,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] =
{ ocRank, {{ Value, Reference, Value }, 0 }},
{ ocRank_Avg, {{ Value, Reference, Value }, 0 }},
{ ocRank_Eq, {{ Value, Reference, Value }, 0 }},
- { ocRGP, {{ Reference, Reference, Value, Value }, 0 }},
+ { ocLinest, {{ Reference, Reference, Value, Value }, 0 }},
{ ocLogest, {{ Reference, Reference, Value, Value }, 0 }},
{ ocRow, {{ Reference }, 0 }},
{ ocRows, {{ Reference }, 1 }},
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 326b6ff..6908344 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -130,7 +130,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocVar, 46, 1, MX, V, { RX }, 0, 0 },
{ ocDBVar, 47, 3, 3, V, { RO, RR }, 0, 0 },
{ ocText, 48, 2, 2, V, { VR }, 0, 0 },
- { ocRGP, 49, 1, 2, A, { RA, RA, C, C }, 0, 0 },
+ { ocLinest, 49, 1, 2, A, { RA, RA, C, C }, 0, 0 },
{ ocTrend, 50, 1, 3, A, { RA, RA, RA, C }, 0, 0 },
{ ocLogest, 51, 1, 2, A, { RA, RA, C, C }, 0, 0 },
{ ocGrowth, 52, 1, 3, A, { RA, RA, RA, C }, 0, 0 },
@@ -224,7 +224,7 @@ static const XclFunctionInfo saFuncTable_2[] =
/** Functions new in BIFF3. */
static const XclFunctionInfo saFuncTable_3[] =
{
- { ocRGP, 49, 1, 4, A, { RA, RA, VV }, 0, 0 }, // BIFF2: 1-2, BIFF3: 1-4
+ { ocLinest, 49, 1, 4, A, { RA, RA, VV }, 0, 0 }, // BIFF2: 1-2, BIFF3: 1-4
{ ocTrend, 50, 1, 4, A, { RA, RA, RA, VV }, 0, 0 }, // BIFF2: 1-3, BIFF3: 1-4
{ ocLogest, 51, 1, 4, A, { RA, RA, VV }, 0, 0 }, // BIFF2: 1-2, BIFF3: 1-4
{ ocGrowth, 52, 1, 4, A, { RA, RA, RA, VV }, 0, 0 }, // BIFF2: 1-3, BIFF3: 1-4
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 7c581b0..64c4780 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -4968,7 +4968,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
};
// -=*# Resource for function LINEST #*=-
- Resource SC_OPCODE_RGP
+ Resource SC_OPCODE_LINEST
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list