[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Sun Jan 11 22:54:25 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/filter/lotus/lotform.cxx | 4 ++--
sc/source/filter/qpro/qproform.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 4 ++--
13 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit fd66d3749e286d8e1b40429ea04e33d7266c1132
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 12:12:59 2015 +0100
fdo#85818: rename GDA to DDB
Change-Id: Ic73225a34ca3339216c11bd72116e55d6a098257
Reviewed-on: https://gerrit.libreoffice.org/13827
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 6d324e2..ec53ee6 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -94,7 +94,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocNPV:
case ocPV:
case ocSYD:
- case ocGDA:
+ case ocDDB:
case ocDB:
case ocVBD:
case ocLIA:
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 8a65301..6ed8e2d 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -212,7 +212,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; };
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_SYD { Text = "SYD" ; };
- String SC_OPCODE_GDA { Text = "DDB" ; };
+ String SC_OPCODE_DDB { Text = "DDB" ; };
String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
String SC_OPCODE_DURATION { Text = "PDURATION" ; };
@@ -619,7 +619,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PERMUTATION_A { Text = "_xlfn.PERMUTATIONA" ; };
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_SYD { Text = "SYD" ; };
- String SC_OPCODE_GDA { Text = "DDB" ; };
+ 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" ; };
@@ -1028,7 +1028,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; };
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_SYD { Text = "SYD" ; };
- String SC_OPCODE_GDA { Text = "DDB" ; };
+ String SC_OPCODE_DDB { Text = "DDB" ; };
String SC_OPCODE_DB { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
String SC_OPCODE_DURATION { Text = "DURATION" ; };
@@ -1931,7 +1931,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "SYD" ;
};
- String SC_OPCODE_GDA
+ String SC_OPCODE_DDB
{
Text [ en-US ] = "DDB" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 86ff639..7e9facb 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -243,7 +243,7 @@
#define SC_OPCODE_PERMUTATION_A 243
#define SC_OPCODE_PV 244
#define SC_OPCODE_SYD 245
-#define SC_OPCODE_GDA 246
+#define SC_OPCODE_DDB 246
#define SC_OPCODE_DB 247
#define SC_OPCODE_VBD 248
#define SC_OPCODE_DURATION 249
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index f566507..2fed555 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -247,7 +247,7 @@ enum OpCode : sal_uInt16
ocPermutationA = SC_OPCODE_PERMUTATION_A,
ocPV = SC_OPCODE_PV,
ocSYD = SC_OPCODE_SYD,
- ocGDA = SC_OPCODE_GDA,
+ ocDDB = SC_OPCODE_DDB,
ocDB = SC_OPCODE_DB,
ocVBD = SC_OPCODE_VBD,
ocDuration = SC_OPCODE_DURATION,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 53615bd..2e7e325 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 32d9010..1116e96 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 48aeab1..78ce44c 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 9c0ddef..27309a7 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 a491bfd..7edd0d1 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 25004e4..af5ed56 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 303919d..c2dd7a7 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 7e02a36..bde978e 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 bb65b45..24ff46f 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
{
More information about the Libreoffice-commits
mailing list