formula/source/core/resource/core_resource.src | 12 ++++++------ include/formula/compiler.hrc | 2 +- include/formula/opcode.hxx | 2 +- sc/source/core/inc/interpre.hxx | 2 +- sc/source/core/opencl/formulagroupcl.cxx | 4 ++-- sc/source/core/opencl/op_financial.cxx | 2 +- sc/source/core/opencl/op_financial.hxx | 2 +- sc/source/core/tool/interpr2.cxx | 2 +- sc/source/core/tool/interpr4.cxx | 2 +- sc/source/core/tool/token.cxx | 2 +- sc/source/filter/excel/xlformula.cxx | 2 +- sc/source/filter/qpro/qproform.cxx | 2 +- sc/source/ui/src/scfuncs.src | 4 ++-- 13 files changed, 20 insertions(+), 20 deletions(-)
New commits: commit 3bc16f4a476f22935bd128cef797fb2d69758294 Author: Eike Rathke <[email protected]> Date: Wed Aug 3 16:38:24 2016 +0200 rename ocDuration to ocPDuration and related ... to clarify that these belong to PDURATION (currently DURATION in UI) instead of DURATION (currently DURATION_ADD in UI). The confusing UI name situation will be resolved separately. Change-Id: I09a7bc8437be1c4c9e72f94e61c877111fb48806 diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 1cb0f35..d8cd84f 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -226,7 +226,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_DURATION { Text = "PDURATION" ; }; + String SC_OPCODE_PDURATION { Text = "PDURATION" ; }; String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -664,7 +664,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_DURATION { Text = "_xlfn.PDURATION" ; }; + String SC_OPCODE_PDURATION { Text = "_xlfn.PDURATION" ; }; String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -1106,7 +1106,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_DURATION { Text = "DURATION" ; }; + String SC_OPCODE_PDURATION { Text = "DURATION" ; }; String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -1548,7 +1548,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_API String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_DURATION { Text = "DURATION" ; }; + String SC_OPCODE_PDURATION { Text = "DURATION" ; }; String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -1989,7 +1989,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_DDB { Text = "DDB" ; }; String SC_OPCODE_DB { Text = "DB" ; }; String SC_OPCODE_VBD { Text = "VDB" ; }; - String SC_OPCODE_DURATION { Text = "DURATION" ; }; + String SC_OPCODE_PDURATION { Text = "DURATION" ; }; String SC_OPCODE_SLN { Text = "SLN" ; }; String SC_OPCODE_PMT { Text = "PMT" ; }; String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; }; @@ -2967,7 +2967,7 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = "VDB" ; }; - String SC_OPCODE_DURATION + String SC_OPCODE_PDURATION { Text [ en-US ] = "DURATION" ; }; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index ccba5df..915cea4 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -257,7 +257,7 @@ #define SC_OPCODE_DDB 246 #define SC_OPCODE_DB 247 #define SC_OPCODE_VBD 248 -#define SC_OPCODE_DURATION 249 +#define SC_OPCODE_PDURATION 249 #define SC_OPCODE_SLN 250 #define SC_OPCODE_PMT 251 #define SC_OPCODE_COLUMNS 252 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index c06a992..bfc7ac6 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -263,7 +263,7 @@ enum OpCode : sal_uInt16 ocDDB = SC_OPCODE_DDB, ocDB = SC_OPCODE_DB, ocVBD = SC_OPCODE_VBD, - ocDuration = SC_OPCODE_DURATION, + ocPDuration = SC_OPCODE_PDURATION, ocSLN = SC_OPCODE_SLN, ocPMT = SC_OPCODE_PMT, ocColumns = SC_OPCODE_COLUMNS, diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 33386b7..6dcab80 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -749,7 +749,7 @@ void ScDB(); static double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, double fPeriode,double fFactor); void ScVDB(); -void ScDuration(); +void ScPDuration(); void ScSLN(); static double ScGetRmz(double fZins, double fZzr, double fBw, double fZw, bool bPayInAdvance); diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index ef46c48..859d9e3 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -2878,9 +2878,9 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config, case ocISPMT: mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, ft->Children[i], new OpISPMT, nResultSize)); break; - case ocDuration: + case ocPDuration: mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, - ft->Children[i], new OpDuration, nResultSize)); + ft->Children[i], new OpPDuration, nResultSize)); break; case ocSinHyp: mvSubArguments.push_back(SoPHelper(mCalcConfig, ts, diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index e968dee..69a4aac 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -572,7 +572,7 @@ void OpISPMT::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } -void OpDuration::GenSlidingWindowFunction(std::stringstream& ss, +void OpPDuration::GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) { ss << "\ndouble " << sSymName; diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 32466f3..9da0385 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -125,7 +125,7 @@ public: virtual std::string BinFuncName() const override { return "ISPMT"; } }; -class OpDuration: public Normal +class OpPDuration: public Normal { public: virtual std::string GetBottom() override { return "0"; } diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index a8d632f..3d7c036 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1840,7 +1840,7 @@ void ScInterpreter::ScVDB() } } -void ScInterpreter::ScDuration() +void ScInterpreter::ScPDuration() { if ( MustHaveParamCount( GetByte(), 3 ) ) { diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 34fcfa8..49bc50f 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4072,7 +4072,7 @@ StackVar ScInterpreter::Interpret() case ocDDB : ScDDB(); break; case ocDB : ScDB(); break; case ocVBD : ScVDB(); break; - case ocDuration : ScDuration(); break; + case ocPDuration : ScPDuration(); break; case ocSLN : ScSLN(); break; case ocPMT : ScPMT(); break; case ocColumns : ScColumns(); break; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 37838f0..1e68576 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1392,7 +1392,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) case ocCosecant: case ocCosecantHyp: case ocISPMT: - case ocDuration: + case ocPDuration: case ocSinHyp: case ocAbs: case ocPV: diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 665dd94..6e6635e 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -550,7 +550,7 @@ static const XclFunctionInfo saFuncTable_2013[] = EXC_FUNCENTRY_V_VR( ocIsoWeeknum, 1, 1, 0, "ISOWEEKNUM" ), EXC_FUNCENTRY_A_VR( ocMatrixUnit, 1, 1, 0, "MUNIT" ), EXC_FUNCENTRY_V_VR( ocNumberValue, 1, 3, 0, "NUMBERVALUE" ), - EXC_FUNCENTRY_V_VR( ocDuration, 3, 3, 0, "PDURATION" ), + EXC_FUNCENTRY_V_VR( ocPDuration, 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( ocRRI, 3, 3, 0, "RRI" ), diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 667cd4a..6a567dec 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -610,7 +610,7 @@ DefTokenId QProToSc::IndexToDLLId( sal_uInt16 nIndex ) break; case 0x003d: - eId = ocDuration; + eId = ocPDuration; break; case 0x0019: diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index d5a2394..af30bb5 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -2297,8 +2297,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1 Text [ en-US ] = "Amount of the investment."; }; }; - // -=*# Resource for function DURATION #*=- - Resource SC_OPCODE_DURATION + // -=*# Resource for function PDURATION #*=- + Resource SC_OPCODE_PDURATION { String 1 // Description { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
