diff options
author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 13:26:48 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:55:28 +0000 |
commit | c6d3405d9cf75adc8ae9f8b2cca2dfd2c9de7d7d (patch) | |
tree | 44f54228c8a3c314ec8b1129f2ecf53a996cfe10 /sc | |
parent | 294b1e93f4a9e70e0699b2b42eba03eed630ec0c (diff) |
fdo#85818: rename RMZ to PMT
Change-Id: I952d4cee42c9a6256589a32f4acb6a6fc70ef443
Reviewed-on: https://gerrit.libreoffice.org/13830
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/inc/interpre.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/opencl/formulagroupcl.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr2.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/token.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/lotus/lotform.cxx | 10 | ||||
-rw-r--r-- | sc/source/filter/qpro/qproform.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/src/scfuncs.src | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index d761a3f680e0..6f6b75cc6548 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -673,7 +673,7 @@ void ScDuration(); void ScSLN(); double ScGetRmz(double fZins, double fZzr, double fBw, double fZw, double fF); -void ScRMZ(); +void ScPMT(); void ScZGZ(); double ScGetZw(double fZins, double fZzr, double fRmz, double fBw, double fF); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index e3704bd0cfbe..d9295bfc3d3b 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2262,7 +2262,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments( case ocMIRR: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpMIRR, nResultSize)); break; - case ocRMZ: + case ocPMT: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpPMT, nResultSize)); break; case ocRate: diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 4cfc8baafffb..5a62b449e326 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1464,7 +1464,7 @@ double ScInterpreter::ScGetRmz(double fRate, double fNper, double fPv, return -fPayment; } -void ScInterpreter::ScRMZ() +void ScInterpreter::ScPMT() { double nInterest, nZzr, nBw, nZw = 0, nFlag = 0; nFuncFmtType = NUMBERFORMAT_CURRENCY; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index badbd9a7cfe5..ea532ae5aaf6 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4028,7 +4028,7 @@ StackVar ScInterpreter::Interpret() case ocVBD : ScVDB(); break; case ocDuration : ScDuration(); break; case ocSLN : ScSLN(); break; - case ocRMZ : ScRMZ(); break; + case ocPMT : ScPMT(); break; case ocColumns : ScColumns(); break; case ocRows : ScRows(); break; case ocTables : ScTables(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index b305b8a67c6e..8d01d042f060 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1170,7 +1170,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocSLN: case ocIRR: case ocMIRR: - case ocRMZ: + case ocPMT: case ocRate: case ocZGZ: case ocPpmt: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 4deb1253f50e..01f54c8ade0d 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -137,7 +137,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocPV, 56, 3, 5, V, { VR }, 0, 0 }, { ocZW, 57, 3, 5, V, { VR }, 0, 0 }, { ocZZR, 58, 3, 5, V, { VR }, 0, 0 }, - { ocRMZ, 59, 3, 5, V, { VR }, 0, 0 }, + { ocPMT, 59, 3, 5, V, { VR }, 0, 0 }, { ocRate, 60, 3, 6, V, { VR }, 0, 0 }, { ocMIRR, 61, 3, 3, V, { RA, VR }, 0, 0 }, { ocIRR, 62, 1, 2, V, { RA, VR }, 0, 0 }, diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 550f66aa5ee0..60b874a384bd 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -188,11 +188,11 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri sal_Int16 nLast = nAnz - 1; - if( eOc == ocRMZ ) - { // special case ocRMZ, ignore (negate?) last parameter! + if( eOc == ocPMT ) + { // special case ocPMT, ignore (negate?) last parameter! // zusaetzlich: 1. -> 3., 3. -> 2., 2. -> 1. OSL_ENSURE( nAnz == 3, - "+LotusToSc::DoFunc(): ocRMZ needs 3 parameters!" ); + "+LotusToSc::DoFunc(): ocPMT needs 3 parameters!" ); aPool << eParam[ 1 ] << ocSep << eParam[ 0 ] << ocSep << ocNegSub << eParam[ 2 ]; } @@ -982,7 +982,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) ocRandom, // 53 Random number ocGetDate, // 54 Date ocGetActDate, // 55 Today - ocRMZ, // 56 Payment + ocPMT, // 56 Payment ocPV, // 57 Present Value ocZW, // 58 Future Value ocIf, // 59 If ... then ... else ... @@ -1511,7 +1511,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocRandom, // 53 Random number ocGetDate, // 54 Date ocGetActDate, // 55 Today - ocRMZ, // 56 Payment + ocPMT, // 56 Payment ocPV, // 57 Present Value ocZW, // 58 Future Value ocIf, // 59 If... then... else... diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 91f854d3517d..2372b6aa8339 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -499,7 +499,7 @@ static const struct { ocDBStdDevP, FT_FuncVar }, { ocDBVarP, FT_FuncVar }, { ocPV, FT_FuncFix3 }, // QPro Pval - { ocRMZ, FT_FuncFix5 }, // QPro Paymt + { ocPMT, FT_FuncFix5 }, // QPro Paymt { ocZW, FT_FuncFix3 }, // QPro Fval // 0x80 { ocZZR, FT_FuncFix5 }, { ocRate, FT_FuncFix5 }, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 86b7608c60be..4b040fece52c 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1332,8 +1332,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ en-US ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ; }; }; - // -=*# Resource for function RMZ #*=- - Resource SC_OPCODE_RMZ + // -=*# Resource for function PMT #*=- + Resource SC_OPCODE_PMT { String 1 // Description { |