diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-13 10:44:35 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-14 19:53:39 +0000 |
| commit | e613c9fba449fda0db163de413eeda50f521db41 (patch) | |
| tree | d207ab156789a393b4893b67b2ad4b81dce14fec /sc/source | |
| parent | be2e6ea58b0025d1bcf7a901c89532737efcbe09 (diff) | |
fdo#85818: rename RGP to Linest
Change-Id: I4bdf934730a54a76f5762fd079dc6270fa135840
Reviewed-on: https://gerrit.libreoffice.org/13893
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source')
| -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 222e7b9c6aa3..07e1cce4c049 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 879367b01ce5..acb1002906d8 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 359ed13840e0..fe87c0457eed 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 a2019eca072f..81e3deb79456 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 326b6fff4933..690834417fca 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 7c581b062fb8..64c4780f64e5 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 { |