diff options
author | Laurent Charrière <lcharriere@gmail.com> | 2015-01-09 12:12:59 +0100 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-01-12 06:53:54 +0000 |
commit | fd66d3749e286d8e1b40429ea04e33d7266c1132 (patch) | |
tree | b8f0f3eb0896bdd0c99ad71284984751328c30be /sc | |
parent | febb2102a692480df0c82b58a792f4b3a447fb37 (diff) |
fdo#85818: rename GDA to DDB
Change-Id: Ic73225a34ca3339216c11bd72116e55d6a098257
Reviewed-on: https://gerrit.libreoffice.org/13827
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/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/lotus/lotform.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/qpro/qproform.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/src/scfuncs.src | 4 |
9 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 53615bdf34ea..2e7e32519ef9 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -664,7 +664,7 @@ void ScPV(); void ScSYD(); double ScGetGDA(double fWert, double fRest, double fDauer, double fPeriode, double fFactor); -void ScGDA(); +void ScDDB(); void ScDB(); double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, double fPeriode,double fFactor); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 32d9010a9256..1116e969de87 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2374,7 +2374,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments( mvSubArguments.push_back(SoPHelper(ts, ft->Children[i],new OpMedian)); break;*/ - case ocGDA: + case ocDDB: mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpDDB, nResultSize)); break; diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 48aeab1692c0..78ce44c54e58 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1231,7 +1231,7 @@ double ScInterpreter::ScGetGDA(double fValue, double fRest, double fTimeLength, return fGda; } -void ScInterpreter::ScGDA() +void ScInterpreter::ScDDB() { nFuncFmtType = NUMBERFORMAT_CURRENCY; sal_uInt8 nParamCount = GetByte(); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 9c0ddefda811..27309a7c42a8 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4023,7 +4023,7 @@ StackVar ScInterpreter::Interpret() case ocStDevPA : ScStDevP( true ); break; case ocPV : ScPV(); break; case ocSYD : ScSYD(); break; - case ocGDA : ScGDA(); break; + case ocDDB : ScDDB(); break; case ocDB : ScDB(); break; case ocVBD : ScVDB(); break; case ocDuration : ScDuration(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index a491bfd3d82d..7edd0d182a91 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1201,7 +1201,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocStandard: case ocWeibull: case ocMedian: - case ocGDA: + case ocDDB: case ocZW: case ocVBD: case ocKurt: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 25004e492c59..af5ed568b640 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -191,7 +191,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocGetTimeValue, 141, 1, 1, V, { VR }, 0, 0 }, { ocLIA, 142, 3, 3, V, { VR }, 0, 0 }, { ocSYD, 143, 4, 4, V, { VR }, 0, 0 }, - { ocGDA, 144, 4, 5, V, { VR }, 0, 0 }, + { ocDDB, 144, 4, 5, V, { VR }, 0, 0 }, { ocIndirect, 148, 1, 2, R, { VR }, EXC_FUNCFLAG_VOLATILE, 0 }, { ocClean, 162, 1, 1, V, { VR }, 0, 0 }, { ocMatDet, 163, 1, 1, V, { VA }, 0, 0 }, diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 303919d22f81..c2dd7a75841b 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -1047,7 +1047,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) ocNoName, // 118 Cterm() ocLIA, // 119 Sln() ocSYD, // 120 Syd(), Soy() - ocGDA, // 121 Ddb() + ocDDB, // 121 Ddb() ocNoName, // 122 ocNoName, // 123 ocNoName, // 124 @@ -1576,7 +1576,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocNoName, // 118 Cterm() ocLIA, // 119 Sln() ocSYD, // 120 Syd(), Soy() - ocGDA, // 121 Ddb() + ocDDB, // 121 Ddb() ocNoName, // 122 Splfunc ocNoName, // 123 Sheets ocNoName, // 124 Info diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 7e02a363011b..bde978e96eb6 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -493,7 +493,7 @@ static const struct { ocNoName, FT_NotImpl }, { ocLIA, FT_FuncFix3 }, { ocSYD, FT_FuncFix4 }, - { ocGDA, FT_FuncFix4 }, + { ocDDB, FT_FuncFix4 }, { ocStDevP, FT_FuncVar }, { ocVarP, FT_FuncVar }, { ocDBStdDevP, FT_FuncVar }, diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index bb65b456f024..24ff46f2b793 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -1796,8 +1796,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ en-US ] = "Useful life. The number of periods in the useful life of the asset." ; }; }; - // -=*# Resource for function GDA #*=- - Resource SC_OPCODE_GDA + // -=*# Resource for function DDB #*=- + Resource SC_OPCODE_DDB { String 1 // Description { |