diff options
| author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 07:01:11 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:50:57 +0000 |
| commit | c7d23291ea9ae7a3a2c055b09fce9c29bb7f58d3 (patch) | |
| tree | c5f61c484a4493567f943e9f22d3d95641bffb84 /sc | |
| parent | 6dc1c9de5ddb5ab8789b691378bbcf7ee41cd988 (diff) | |
fdo#85818: rename Effektiv to Effective
Change-Id: I55a863f7d7068de9abc468676ecf2e54ecd3c06c
Reviewed-on: https://gerrit.libreoffice.org/13823
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/tool/interpr2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/src/scfuncs.src | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 60ef2a9d9201..bc57d19b67ee 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -688,7 +688,7 @@ void ScIpmt(); void ScPpmt(); void ScCumIpmt(); void ScCumPrinc(); -void ScEffektiv(); +void ScEffective(); void ScNominal(); void ScMod(); void ScIntercept(); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 83748edfb3a7..b90e0566df7b 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1862,7 +1862,7 @@ void ScInterpreter::ScCumPrinc() } } -void ScInterpreter::ScEffektiv() +void ScInterpreter::ScEffective() { nFuncFmtType = NUMBERFORMAT_PERCENT; if ( MustHaveParamCount( GetByte(), 2 ) ) diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index c882fc18b8d1..1b7f50cc75a9 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4048,7 +4048,7 @@ StackVar ScInterpreter::Interpret() case ocPpmt : ScPpmt(); break; case ocCumIpmt : ScCumIpmt(); break; case ocCumPrinc : ScCumPrinc(); break; - case ocEffektiv : ScEffektiv(); break; + case ocEffective : ScEffective(); break; case ocNominal : ScNominal(); break; case ocSubTotal : ScSubTotal(); break; case ocAggregate : ScAggregate(); break; diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 90e8de3edd43..699d9fb4dbc4 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -333,7 +333,7 @@ static const XclFunctionInfo saFuncTable_4[] = { ocIsOdd, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getIsodd" ) }, { 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" ) }, + { ocEffective, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getEffect" ) }, { 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 a51cdd9c5b20..efa107ef9f52 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1980,8 +1980,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ en-US ] = "Do not alter. Type = 1 denotes switch to linear depreciation, type = 0 do not switch." ; }; }; - // -=*# Resource for function EFFEKTIV #*=- - Resource SC_OPCODE_EFFEKTIV + // -=*# Resource for function EFFECTIVE #*=- + Resource SC_OPCODE_EFFECTIVE { String 1 // Description { |