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

10 files changed, 12 insertions, 12 deletions

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 33386b7a9b6b..6dcab800ba56 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 ef46c4826a2d..859d9e32b80f 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 e968deea2f09..69a4aacf51a4 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 32466f3a427b..9da038591e12 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 a8d632fe6788..3d7c036cd505 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 34fcfa88c0a5..49bc50faa641 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 37838f0eb8c0..1e68576423e7 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 665dd94c78c8..6e6635e02977 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 667cd4a1b2b3..6a567dec3d59 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 d5a2394691e6..af30bb5967ff 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
         {