diff options
author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 12:54:01 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:53:23 +0000 |
commit | febb2102a692480df0c82b58a792f4b3a447fb37 (patch) | |
tree | 4d14fce3665b6b5711518405422b0c27c18d961f /sc | |
parent | 4a2fded15046f2c469c9c1723ccef4e517fc372a (diff) |
fdo#85818: rename Laufz to Duration
Change-Id: I7f2f91c7d6702f9e7f22e27e08142c34c557e043
Reviewed-on: https://gerrit.libreoffice.org/13828
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/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 | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 7b0da5c507fc..53615bdf34ea 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -669,7 +669,7 @@ void ScDB(); double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, double fPeriode,double fFactor); void ScVDB(); -void ScLaufz(); +void ScDuration(); void ScLIA(); double ScGetRmz(double fZins, double fZzr, double fBw, double fZw, double fF); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index fa7b986739a8..32d9010a9256 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2334,7 +2334,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments( case ocISPMT: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpISPMT, nResultSize)); break; - case ocLaufz: + case ocDuration: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpDuration, nResultSize)); break; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 51c84f290bb0..48aeab1692c0 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1423,7 +1423,7 @@ void ScInterpreter::ScVDB() } } -void ScInterpreter::ScLaufz() +void ScInterpreter::ScDuration() { if ( MustHaveParamCount( GetByte(), 3 ) ) { diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 21ea241b3dd4..9c0ddefda811 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4026,7 +4026,7 @@ StackVar ScInterpreter::Interpret() case ocGDA : ScGDA(); break; case ocDB : ScDB(); break; case ocVBD : ScVDB(); break; - case ocLaufz : ScLaufz(); break; + case ocDuration : ScDuration(); break; case ocLIA : ScLIA(); break; case ocRMZ : ScRMZ(); break; case ocColumns : ScColumns(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 58e2f0ee0f04..a491bfd3d82d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1191,7 +1191,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocCosecant: case ocCosecantHyp: case ocISPMT: - case ocLaufz: + case ocDuration: case ocSinHyp: case ocAbs: case ocPV: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 76aa228664f7..25004e492c59 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -554,7 +554,7 @@ static const XclFunctionInfo saFuncTable_2013[] = EXC_FUNCENTRY_V_VR( ocWeek, 1, 2, 0, "ISOWEEKNUM" ), EXC_FUNCENTRY_A_VR( ocMatrixUnit, 1, 1, 0, "MUNIT" ), EXC_FUNCENTRY_V_VR( ocNumberValue, 1, 3, 0, "NUMBERVALUE" ), - EXC_FUNCENTRY_V_VR( ocLaufz, 3, 3, 0, "PDURATION" ), + EXC_FUNCENTRY_V_VR( ocDuration, 3, 3, 0, "PDURATION" ), EXC_FUNCENTRY_V_VR( ocPermutationA, 2, 2, 0, "PERMUTATIONA" ), EXC_FUNCENTRY_V_VR( ocPhi, 1, 1, 0, "PHI" ), EXC_FUNCENTRY_V_VR( ocZGZ, 3, 3, 0, "RRI" ), diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 92b2713d370d..7e02a363011b 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -606,7 +606,7 @@ DefTokenId QProToSc::IndexToDLLId( sal_uInt16 nIndex ) break; case 0x003d: - eId = ocLaufz; + eId = ocDuration; break; case 0x0019: diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 03cd60292948..bb65b456f024 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -2196,8 +2196,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ en-US ] = "Amount of the investment."; }; }; - // -=*# Resource for function LAUFZEIT #*=- - Resource SC_OPCODE_LAUFZ + // -=*# Resource for function DURATION #*=- + Resource SC_OPCODE_DURATION { String 1 // Description { |