diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 05:41:25 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:50:24 +0000 |
| commit | 6dc1c9de5ddb5ab8789b691378bbcf7ee41cd988 (patch) | |
| tree | d025d6580285800f1ad85e59dd981cb6affa524c /sc | |
| parent | d5f48d742ac1fea9fd341244bbcea09bcd78b476 (diff) | |
fdo#85818: rename KumKapZ to CumPrinc
Change-Id: I8e68a4a80418fe32e53123432257aec3c2fc28a4
Reviewed-on: https://gerrit.libreoffice.org/13822
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/tool/interpr2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/src/scfuncs.src | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 13652290bb49..60ef2a9d9201 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -687,7 +687,7 @@ double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw, void ScIpmt(); void ScPpmt(); void ScCumIpmt(); -void ScKumKapZ(); +void ScCumPrinc(); void ScEffektiv(); void ScNominal(); void ScMod(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 8cfb77e6ecb7..83748edfb3a7 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1821,7 +1821,7 @@ void ScInterpreter::ScCumIpmt() } } -void ScInterpreter::ScKumKapZ() +void ScInterpreter::ScCumPrinc() { nFuncFmtType = NUMBERFORMAT_CURRENCY; if ( MustHaveParamCount( GetByte(), 6 ) ) diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 9a2a2870c446..c882fc18b8d1 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4046,8 +4046,8 @@ StackVar ScInterpreter::Interpret() case ocErfc_MS : ScErfc(); break; case ocIpmt : ScIpmt(); break; case ocPpmt : ScPpmt(); break; - case ocCumIpmt : ScCumIpmt(); break; - case ocKumKapZ : ScKumKapZ(); break; + case ocCumIpmt : ScCumIpmt(); break; + case ocCumPrinc : ScCumPrinc(); break; case ocEffektiv : ScEffektiv(); break; case ocNominal : ScNominal(); break; case ocSubTotal : ScSubTotal(); break; diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 87182a7fdada..90e8de3edd43 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -334,7 +334,7 @@ static const XclFunctionInfo saFuncTable_4[] = { ocGCD, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getGcd" ) }, { ocLCM, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getLcm" ) }, { ocEffektiv, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getEffect" ) }, - { ocKumKapZ, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumprinc" ) }, + { ocCumPrinc, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumprinc" ) }, { ocCumIpmt, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumipmt" ) }, { ocNominal, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getNominal" ) } }; diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 266936552402..a51cdd9c5b20 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1580,8 +1580,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 KUMKAPITAL #*=- - Resource SC_OPCODE_KUM_KAP_Z + // -=*# Resource for function CUMPRINC #*=- + Resource SC_OPCODE_CUM_PRINC { String 1 // Description { |