diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-07 10:36:27 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-09 12:43:52 +0000 |
| commit | 2963dbb5ce65a141051cb3e4e3ed06a6ed31574c (patch) | |
| tree | 370b97deae8259d79e49fd537925d19a915e159f /formula | |
| parent | 201f99919253b370437d754137964d2757852079 (diff) | |
fdo#85818: rename ZinsZ enum name, constant, function to Ipmt
Rename OcZinsZ to OcIpmt, SC_OPCODE_ZINS_Z to SC_OPCODE_IPMT,
ScInterpreter::ScZinsZ() to ScInterpreter::ScIpmt()
Change-Id: I6ed671aff85b7d2ec06dd66cd7ec9390776008b1
Reviewed-on: https://gerrit.libreoffice.org/13813
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 | 4 | ||||
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 69afa63d4764..b8380b8ba695 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -100,7 +100,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocLIA: case ocRMZ: case ocZW: - case ocZinsZ: + case ocIpmt: case ocKapz: case ocKumZinsZ: case ocKumKapZ: diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ec9f4d37ad53..1403dfac6d8e 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1256,7 +1256,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin case ocBetaInv: case ocRMZ: // PMT return AddDefaultArg( pNewArr, 3, 0.0 ); - case ocZinsZ: // IPMT + case ocIpmt: case ocKapz: // PPMT return AddDefaultArg( pNewArr, 4, 0.0 ); case ocBW: // PV @@ -1264,7 +1264,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v break; - case ocRate: // RATE + case ocRate: bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 408d0835b4f3..af7279872e72 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -228,7 +228,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; - String SC_OPCODE_ZINS_Z { Text = "IPMT" ; }; + String SC_OPCODE_IPMT { Text = "IPMT" ; }; String SC_OPCODE_KAPZ { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; @@ -635,7 +635,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; - String SC_OPCODE_ZINS_Z { Text = "IPMT" ; }; + String SC_OPCODE_IPMT { Text = "IPMT" ; }; String SC_OPCODE_KAPZ { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; @@ -1044,7 +1044,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_RATE { Text = "RATE" ; }; - String SC_OPCODE_ZINS_Z { Text = "IPMT" ; }; + String SC_OPCODE_IPMT { Text = "IPMT" ; }; String SC_OPCODE_KAPZ { Text = "PPMT" ; }; String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; }; String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; }; @@ -1995,7 +1995,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "RATE" ; }; - String SC_OPCODE_ZINS_Z + String SC_OPCODE_IPMT { Text [ en-US ] = "IPMT" ; }; |