diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-12 20:50:49 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-14 19:53:18 +0000 |
| commit | be2e6ea58b0025d1bcf7a901c89532737efcbe09 (patch) | |
| tree | f57a440f88b3d25b20fafb024741c6120c0f78de /sc | |
| parent | d6be636b19aea636ea5ba1007fd27eee61fb0dab (diff) | |
fdo#85818: rename RKP to Logest
Change-Id: I35e4d80e3d7744c4c9c74b12856a603db8363dbc
Reviewed-on: https://gerrit.libreoffice.org/13892
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/inc/interpre.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr5.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/parclass.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/src/scfuncs.src | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 1a59d10ec3f4..222e7b9c6aa3 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 d2fa09a07020..879367b01ce5 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 b2d213d2d183..359ed13840e0 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 b072ef0e579a..a2019eca072f 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 1842909c734b..326b6fff4933 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 d823e637c311..7c581b062fb8 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 { |