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 /formula | |
| 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 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/api/token.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index b8380b8ba695..2649e3487a71 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -101,7 +101,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocRMZ: case ocZW: case ocIpmt: - case ocKapz: + case ocPpmt: case ocKumZinsZ: case ocKumKapZ: return NUMBERFORMAT_CURRENCY; diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 1403dfac6d8e..3b16cc369e4a 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1257,7 +1257,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin case ocRMZ: // PMT return AddDefaultArg( pNewArr, 3, 0.0 ); case ocIpmt: - case ocKapz: // PPMT + case ocPpmt: return AddDefaultArg( pNewArr, 4, 0.0 ); case ocBW: // PV case ocZW: // FV diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index f704d0cebb0d..1e540a238b0b 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -229,7 +229,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; String SC_OPCODE_IPMT { Text = "IPMT" ; }; - String SC_OPCODE_KAPZ { Text = "PPMT" ; }; + String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; String SC_OPCODE_EFFEKTIV { Text = "EFFECT" ; }; @@ -636,7 +636,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; String SC_OPCODE_IPMT { Text = "IPMT" ; }; - String SC_OPCODE_KAPZ { Text = "PPMT" ; }; + String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; }; @@ -1045,7 +1045,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; String SC_OPCODE_IPMT { Text = "IPMT" ; }; - String SC_OPCODE_KAPZ { Text = "PPMT" ; }; + String SC_OPCODE_PPMT { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; }; @@ -1999,7 +1999,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "IPMT" ; }; - String SC_OPCODE_KAPZ + String SC_OPCODE_PPMT { Text [ en-US ] = "PPMT" ; }; |