diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-08 09:42:50 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-09 12:45:55 +0000 |
| commit | b8359780a25b4e645236dd0238e4ef39cd8413ce (patch) | |
| tree | 52b5a31d8689b656e21eeedd6a820bc9bc00727d /sc | |
| parent | 5af576c2fcf8ebdc517b3919dd0ef808b09b04a1 (diff) | |
fdo#85818: rename Kapz to Ppmt
Rename OcKapz to OcPpmt, SC_OPCODE_KAPZ to SC_OPCODE_PPMT
ScInterpreter::ScKapz() to ScInterpreter::ScPpmt().
Change-Id: I5bc556e086970ea487e14b4663a9b3d2aaf9bb66
Reviewed-on: https://gerrit.libreoffice.org/13815
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-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/qpro/qproform.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/src/scfuncs.src | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index dd09464e0d55..b9513a330b7e 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -685,7 +685,7 @@ void ScRate(); double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw, double fZw, double fF, double& fRmz); void ScIpmt(); -void ScKapz(); +void ScPpmt(); void ScKumZinsZ(); void ScKumKapZ(); void ScEffektiv(); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 51e2e72d764b..72cf96685d7d 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2271,7 +2271,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments( case ocZGZ: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpRRI, nResultSize)); break; - case ocKapz: + case ocPpmt: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpPPMT, nResultSize)); break; case ocFisher: diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index ef519d4561c5..24a5e401b8d7 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1756,7 +1756,7 @@ void ScInterpreter::ScIpmt() } } -void ScInterpreter::ScKapz() +void ScInterpreter::ScPpmt() { double nInterest, nZr, 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 bf94a474a0b0..48b128e5d428 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4045,7 +4045,7 @@ StackVar ScInterpreter::Interpret() case ocErf_MS : ScErf(); break; case ocErfc_MS : ScErfc(); break; case ocIpmt : ScIpmt(); break; - case ocKapz : ScKapz(); break; + case ocPpmt : ScPpmt(); break; case ocKumZinsZ : ScKumZinsZ(); break; case ocKumKapZ : ScKumKapZ(); break; case ocEffektiv : ScEffektiv(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index dace254ee515..e8bfe415b4a3 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1173,7 +1173,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocRMZ: case ocRate: case ocZGZ: - case ocKapz: + case ocPpmt: case ocFisher: case ocFisherInv: case ocGamma: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index d822692680bc..9ea536c824ac 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -198,7 +198,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocMatInv, 164, 1, 1, A, { VA }, 0, 0 }, { ocMatMult, 165, 2, 2, A, { VA }, 0, 0 }, { ocIpmt, 167, 4, 6, V, { VR }, 0, 0 }, - { ocKapz, 168, 4, 6, V, { VR }, 0, 0 }, + { ocPpmt, 168, 4, 6, V, { VR }, 0, 0 }, { ocCount2, 169, 0, MX, V, { RX }, 0, 0 }, { ocProduct, 183, 0, MX, V, { RX }, 0, 0 }, { ocFact, 184, 1, 1, V, { VR }, 0, 0 }, diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index d38b70412b0c..32c2dc231fce 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -504,7 +504,7 @@ static const struct { ocZZR, FT_FuncFix5 }, { ocRate, FT_FuncFix5 }, { ocIpmt, FT_FuncFix4 }, - { ocKapz, FT_FuncFix6 }, + { ocPpmt, FT_FuncFix6 }, { ocSumProduct, FT_FuncFix2 }, { ocNoName, FT_NotImpl }, { ocNoName, FT_NotImpl }, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 6fd6d2ffb134..beff92d8b24c 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1517,7 +1517,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 }; }; // -=*# Resource for function KAPZ #*=- - Resource SC_OPCODE_KAPZ + Resource SC_OPCODE_PPMT { String 1 // Description { |