[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Sun Jan 11 22:53:51 PST 2015
formula/source/core/resource/core_resource.src | 8 ++++----
include/formula/compiler.hrc | 2 +-
include/formula/opcode.hxx | 2 +-
sc/source/core/inc/interpre.hxx | 2 +-
sc/source/core/opencl/formulagroupcl.cxx | 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 ++--
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit febb2102a692480df0c82b58a792f4b3a447fb37
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 12:54:01 2015 +0100
fdo#85818: rename Laufz to Duration
Change-Id: I7f2f91c7d6702f9e7f22e27e08142c34c557e043
Reviewed-on: https://gerrit.libreoffice.org/13828
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index ccaba7a..8a65301 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -215,7 +215,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
- String SC_OPCODE_LAUFZ { Text = "PDURATION" ; };
+ String SC_OPCODE_DURATION { Text = "PDURATION" ; };
String SC_OPCODE_LIA { Text = "SLN" ; };
String SC_OPCODE_RMZ { Text = "PMT" ; };
String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; };
@@ -622,7 +622,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
- String SC_OPCODE_LAUFZ { Text = "_xlfn.PDURATION" ; };
+ String SC_OPCODE_DURATION { Text = "_xlfn.PDURATION" ; };
String SC_OPCODE_LIA { Text = "SLN" ; };
String SC_OPCODE_RMZ { Text = "PMT" ; };
String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; };
@@ -1031,7 +1031,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
- String SC_OPCODE_LAUFZ { Text = "DURATION" ; };
+ String SC_OPCODE_DURATION { Text = "DURATION" ; };
String SC_OPCODE_LIA { Text = "SLN" ; };
String SC_OPCODE_RMZ { Text = "PMT" ; };
String SC_OPCODE_COLUMNS { Text = "COLUMNS" ; };
@@ -1943,7 +1943,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "VDB" ;
};
- String SC_OPCODE_LAUFZ
+ String SC_OPCODE_DURATION
{
Text [ en-US ] = "DURATION" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 42bba26..86ff639 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -246,7 +246,7 @@
#define SC_OPCODE_GDA 246
#define SC_OPCODE_DB 247
#define SC_OPCODE_VBD 248
-#define SC_OPCODE_LAUFZ 249
+#define SC_OPCODE_DURATION 249
#define SC_OPCODE_LIA 250
#define SC_OPCODE_RMZ 251
#define SC_OPCODE_COLUMNS 252
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 8f891db..f566507 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -250,7 +250,7 @@ enum OpCode : sal_uInt16
ocGDA = SC_OPCODE_GDA,
ocDB = SC_OPCODE_DB,
ocVBD = SC_OPCODE_VBD,
- ocLaufz = SC_OPCODE_LAUFZ,
+ ocDuration = SC_OPCODE_DURATION,
ocLIA = SC_OPCODE_LIA,
ocRMZ = SC_OPCODE_RMZ,
ocColumns = SC_OPCODE_COLUMNS,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 7b0da5c..53615bd 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 fa7b986..32d9010 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 51c84f2..48aeab1 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 21ea241..9c0ddef 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 58e2f0e..a491bfd 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 76aa228..25004e4 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 92b2713..7e02a36 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 03cd602..bb65b45 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
{
More information about the Libreoffice-commits
mailing list