[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Sun Jan 11 22:53:15 PST 2015
formula/source/core/api/FormulaCompiler.cxx | 2 +-
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/ui/src/scfuncs.src | 4 ++--
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 4a2fded15046f2c469c9c1723ccef4e517fc372a
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 12:07:44 2015 +0100
fdo#85818: rename GDA2 to DB
Change-Id: I2449645b47918325474109fc090ef34b009f26a8
Reviewed-on: https://gerrit.libreoffice.org/13826
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 4ece137..6d324e2 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -95,7 +95,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocPV:
case ocSYD:
case ocGDA:
- case ocGDA2:
+ case ocDB:
case ocVBD:
case ocLIA:
case ocRMZ:
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 31ca6e1..ccaba7a 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -213,7 +213,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_SYD { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
- String SC_OPCODE_GDA_2 { Text = "DB" ; };
+ String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
String SC_OPCODE_LAUFZ { Text = "PDURATION" ; };
String SC_OPCODE_LIA { Text = "SLN" ; };
@@ -620,7 +620,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_SYD { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
- String SC_OPCODE_GDA_2 { Text = "DB" ; };
+ String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
String SC_OPCODE_LAUFZ { Text = "_xlfn.PDURATION" ; };
String SC_OPCODE_LIA { Text = "SLN" ; };
@@ -1029,7 +1029,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_SYD { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
- String SC_OPCODE_GDA_2 { Text = "DB" ; };
+ String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
String SC_OPCODE_LAUFZ { Text = "DURATION" ; };
String SC_OPCODE_LIA { Text = "SLN" ; };
@@ -1935,7 +1935,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "DDB" ;
};
- String SC_OPCODE_GDA_2
+ String SC_OPCODE_DB
{
Text [ en-US ] = "DB" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index ea177ba..42bba26 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -244,7 +244,7 @@
#define SC_OPCODE_PV 244
#define SC_OPCODE_SYD 245
#define SC_OPCODE_GDA 246
-#define SC_OPCODE_GDA_2 247
+#define SC_OPCODE_DB 247
#define SC_OPCODE_VBD 248
#define SC_OPCODE_LAUFZ 249
#define SC_OPCODE_LIA 250
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index df2452b..8f891db 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -248,7 +248,7 @@ enum OpCode : sal_uInt16
ocPV = SC_OPCODE_PV,
ocSYD = SC_OPCODE_SYD,
ocGDA = SC_OPCODE_GDA,
- ocGDA2 = SC_OPCODE_GDA_2,
+ ocDB = SC_OPCODE_DB,
ocVBD = SC_OPCODE_VBD,
ocLaufz = SC_OPCODE_LAUFZ,
ocLIA = SC_OPCODE_LIA,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4ce3313..7b0da5c 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -665,7 +665,7 @@ void ScSYD();
double ScGetGDA(double fWert, double fRest, double fDauer,
double fPeriode, double fFactor);
void ScGDA();
-void ScGDA2();
+void ScDB();
double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1,
double fPeriode,double fFactor);
void ScVDB();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 870b1fb..fa7b986 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2454,7 +2454,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpIntercept, nResultSize));
break;
- case ocGDA2:
+ case ocDB:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i],
new OpDB, nResultSize));
break;
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 7e9410c..51c84f2 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1254,7 +1254,7 @@ void ScInterpreter::ScGDA()
}
}
-void ScInterpreter::ScGDA2()
+void ScInterpreter::ScDB()
{
nFuncFmtType = NUMBERFORMAT_CURRENCY;
sal_uInt8 nParamCount = GetByte();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e6e5162..21ea241 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4024,7 +4024,7 @@ StackVar ScInterpreter::Interpret()
case ocPV : ScPV(); break;
case ocSYD : ScSYD(); break;
case ocGDA : ScGDA(); break;
- case ocGDA2 : ScGDA2(); break;
+ case ocDB : ScDB(); break;
case ocVBD : ScVDB(); break;
case ocLaufz : ScLaufz(); break;
case ocLIA : ScLIA(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f59b0ef..58e2f0e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1220,7 +1220,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocIpmt:
case ocConfidence:
case ocIntercept:
- case ocGDA2:
+ case ocDB:
case ocLogInv:
case ocArcCot:
case ocCosHyp:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index f37e72d..76aa228 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -256,7 +256,7 @@ static const XclFunctionInfo saFuncTable_4[] =
{ ocAsc, 214, 1, 1, V, { VR }, 0, 0 },
{ ocJis, 215, 1, 1, V, { VR }, 0, 0 },
{ ocRank, 216, 2, 3, V, { VR, RO, VR }, 0, 0 },
- { ocGDA2, 247, 4, 5, V, { VR }, 0, 0 },
+ { ocDB, 247, 4, 5, V, { VR }, 0, 0 },
{ ocFrequency, 252, 2, 2, A, { RA }, 0, 0 },
{ ocErrorType, 261, 1, 1, V, { VR }, 0, 0 },
{ ocAveDev, 269, 1, MX, V, { RX }, 0, 0 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d559a26..03cd602 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1852,8 +1852,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = "Factor. The factor for balance decline. F = 2 means a double declining balance factor" ;
};
};
- // -=*# Resource for function GDA2 #*=-
- Resource SC_OPCODE_GDA_2
+ // -=*# Resource for function DB #*=-
+ Resource SC_OPCODE_DB
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list