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 be2e6ea58b0025d1bcf7a901c89532737efcbe09 Author: Laurent Charrière <lcharri...@gmail.com> Date: Mon Jan 12 20:50:49 2015 +0100 fdo#85818: rename RKP to Logest Change-Id: I35e4d80e3d7744c4c9c74b12856a603db8363dbc Reviewed-on: https://gerrit.libreoffice.org/13892 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 3908378..ebc5edd 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -848,7 +848,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode ) case ocDde : case ocGrowth : case ocTrend : - case ocRKP : + case ocLogest : case ocRGP : case ocFrequency : case ocMatTrans : diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 88b6e28..c929999 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -361,7 +361,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_TREND { Text = "TREND" ; }; String SC_OPCODE_GROWTH { Text = "GROWTH" ; }; String SC_OPCODE_RGP { Text = "LINEST" ; }; - String SC_OPCODE_RKP { Text = "LOGEST" ; }; + String SC_OPCODE_LOGEST { Text = "LOGEST" ; }; String SC_OPCODE_FORECAST { Text = "FORECAST" ; }; String SC_OPCODE_CHI_INV { Text = "LEGACY.CHIINV" ; }; String SC_OPCODE_CHI_INV_MS { Text = "COM.MICROSOFT.CHISQ.INV.RT" ; }; @@ -769,7 +769,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_TREND { Text = "TREND" ; }; String SC_OPCODE_GROWTH { Text = "GROWTH" ; }; String SC_OPCODE_RGP { Text = "LINEST" ; }; - String SC_OPCODE_RKP { Text = "LOGEST" ; }; + String SC_OPCODE_LOGEST { Text = "LOGEST" ; }; String SC_OPCODE_FORECAST { Text = "FORECAST" ; }; String SC_OPCODE_CHI_INV { Text = "CHIINV" ; }; String SC_OPCODE_CHI_INV_MS { Text = "_xlfn.CHISQ.INV.RT" ; }; @@ -1179,7 +1179,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_TREND { Text = "TREND" ; }; String SC_OPCODE_GROWTH { Text = "GROWTH" ; }; String SC_OPCODE_RGP { Text = "LINEST" ; }; - String SC_OPCODE_RKP { Text = "LOGEST" ; }; + String SC_OPCODE_LOGEST { Text = "LOGEST" ; }; String SC_OPCODE_FORECAST { Text = "FORECAST" ; }; String SC_OPCODE_CHI_INV { Text = "CHIINV" ; }; String SC_OPCODE_CHI_INV_MS { Text = "CHISQ.INV.RT" ; }; @@ -2531,7 +2531,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "LINEST" ; }; - String SC_OPCODE_RKP + String SC_OPCODE_LOGEST { Text [ en-US ] = "LOGEST" ; }; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 61ec34c..b09b756 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -351,7 +351,7 @@ #define SC_OPCODE_TREND 350 #define SC_OPCODE_GROWTH 351 #define SC_OPCODE_RGP 352 -#define SC_OPCODE_RKP 353 +#define SC_OPCODE_LOGEST 353 #define SC_OPCODE_FORECAST 354 #define SC_OPCODE_CHI_INV 355 #define SC_OPCODE_GAMMA_DIST 356 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index c6b0a0a..94756b4d 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -406,7 +406,7 @@ enum OpCode : sal_uInt16 ocTrend = SC_OPCODE_TREND, ocGrowth = SC_OPCODE_GROWTH, ocRGP = SC_OPCODE_RGP, - ocRKP = SC_OPCODE_RKP, + ocLogest = SC_OPCODE_LOGEST, ocForecast = SC_OPCODE_FORECAST, ocChiInv = SC_OPCODE_CHI_INV, ocChiInv_MS = SC_OPCODE_CHI_INV_MS, diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 1a59d10..222e7b9c 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -731,7 +731,7 @@ 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 ScRKP(); +void ScLogest(); void ScForecast(); void ScNoName(); void ScBadName(); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index d2fa09a..879367b 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4191,7 +4191,7 @@ StackVar ScInterpreter::Interpret() case ocTrend : ScTrend(); break; case ocGrowth : ScGrowth(); break; case ocRGP : ScRGP(); break; - case ocRKP : ScRKP(); break; + case ocLogest : ScLogest(); break; case ocForecast : ScForecast(); break; case ocGammaLn : case ocGammaLn_MS : ScLogGamma(); break; diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index b2d213d..359ed13 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -2344,7 +2344,7 @@ void ScInterpreter::ScRGP() } // LOGEST -void ScInterpreter::ScRKP() +void ScInterpreter::ScLogest() { CalculateRGPRKP(true); } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index b072ef0..a2019ec 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -168,7 +168,7 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] = { ocRank_Avg, {{ Value, Reference, Value }, 0 }}, { ocRank_Eq, {{ Value, Reference, Value }, 0 }}, { ocRGP, {{ Reference, Reference, Value, Value }, 0 }}, - { ocRKP, {{ Reference, Reference, Value, Value }, 0 }}, + { ocLogest, {{ Reference, Reference, Value, Value }, 0 }}, { ocRow, {{ Reference }, 0 }}, { ocRows, {{ Reference }, 1 }}, { ocRSQ, {{ ForceArray, ForceArray }, 0 }}, diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 1842909..326b6ff 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -132,7 +132,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocText, 48, 2, 2, V, { VR }, 0, 0 }, { ocRGP, 49, 1, 2, A, { RA, RA, C, C }, 0, 0 }, { ocTrend, 50, 1, 3, A, { RA, RA, RA, C }, 0, 0 }, - { ocRKP, 51, 1, 2, A, { RA, RA, C, 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 }, { ocPV, 56, 3, 5, V, { VR }, 0, 0 }, { ocFV, 57, 3, 5, V, { VR }, 0, 0 }, @@ -226,7 +226,7 @@ static const XclFunctionInfo saFuncTable_3[] = { { ocRGP, 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 - { ocRKP, 51, 1, 4, A, { RA, RA, VV }, 0, 0 }, // BIFF2: 1-2, 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 { ocTrunc, 197, 1, 2, V, { VR }, 0, 0 }, // BIFF2: 1, BIFF3: 1-2 { ocAddress, 219, 2, 5, V, { VR }, 0, 0 }, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index d823e63..7c581b0 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -5016,7 +5016,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2 }; }; // -=*# Resource for function LOGEST #*=- - Resource SC_OPCODE_RKP + Resource SC_OPCODE_LOGEST { String 1 // Description {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits