[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Sun Jan 11 22:52:32 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 b2fcd4f7c7133f10bde8df3b7544023a3719d2b2
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 12:01:16 2015 +0100
fdo#85818: rename DIA to SYD
Change-Id: I3510403521668c00f44d462b288716f5f7b60115
Reviewed-on: https://gerrit.libreoffice.org/13825
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 858fe06..4ece137 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -93,7 +93,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
return NUMBERFORMAT_TIME;
case ocNPV:
case ocPV:
- case ocDIA:
+ case ocSYD:
case ocGDA:
case ocGDA2:
case ocVBD:
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 2434ead..31ca6e1 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -211,7 +211,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PERMUT { Text = "PERMUT" ; };
String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; };
String SC_OPCODE_PV { Text = "PV" ; };
- String SC_OPCODE_DIA { Text = "SYD" ; };
+ String SC_OPCODE_SYD { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_GDA_2 { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
@@ -618,7 +618,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PERMUT { Text = "PERMUT" ; };
String SC_OPCODE_PERMUTATION_A { Text = "_xlfn.PERMUTATIONA" ; };
String SC_OPCODE_PV { Text = "PV" ; };
- String SC_OPCODE_DIA { Text = "SYD" ; };
+ String SC_OPCODE_SYD { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_GDA_2 { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
@@ -1027,7 +1027,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PERMUT { Text = "PERMUT" ; };
String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; };
String SC_OPCODE_PV { Text = "PV" ; };
- String SC_OPCODE_DIA { Text = "SYD" ; };
+ String SC_OPCODE_SYD { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_GDA_2 { Text = "DB" ; };
String SC_OPCODE_VBD { Text = "VDB" ; };
@@ -1927,7 +1927,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "PV" ;
};
- String SC_OPCODE_DIA
+ String SC_OPCODE_SYD
{
Text [ en-US ] = "SYD" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 3ffd2ba..ea177ba 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -242,7 +242,7 @@
#define SC_OPCODE_PERMUT 242
#define SC_OPCODE_PERMUTATION_A 243
#define SC_OPCODE_PV 244
-#define SC_OPCODE_DIA 245
+#define SC_OPCODE_SYD 245
#define SC_OPCODE_GDA 246
#define SC_OPCODE_GDA_2 247
#define SC_OPCODE_VBD 248
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 6a68339..df2452b 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -246,7 +246,7 @@ enum OpCode : sal_uInt16
ocPermut = SC_OPCODE_PERMUT,
ocPermutationA = SC_OPCODE_PERMUTATION_A,
ocPV = SC_OPCODE_PV,
- ocDIA = SC_OPCODE_DIA,
+ ocSYD = SC_OPCODE_SYD,
ocGDA = SC_OPCODE_GDA,
ocGDA2 = SC_OPCODE_GDA_2,
ocVBD = SC_OPCODE_VBD,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 2cf46e8..4ce3313 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -661,7 +661,7 @@ void ScISPMT();
double ScGetBw(double fZins, double fZzr, double fRmz,
double fZw, double fF);
void ScPV();
-void ScDIA();
+void ScSYD();
double ScGetGDA(double fWert, double fRest, double fDauer,
double fPeriode, double fFactor);
void ScGDA();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 859327d..870b1fb 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2310,7 +2310,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
case ocGreater:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpGreater, nResultSize));
break;
- case ocDIA:
+ case ocSYD:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new OpSYD, nResultSize));
break;
case ocCorrel:
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 81b33d2..7e9410c 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1190,7 +1190,7 @@ void ScInterpreter::ScPV()
PushDouble(ScGetBw(nInterest, nZzr, nRmz, nZw, nFlag));
}
-void ScInterpreter::ScDIA()
+void ScInterpreter::ScSYD()
{
nFuncFmtType = NUMBERFORMAT_CURRENCY;
if ( MustHaveParamCount( GetByte(), 4 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 51df509..e6e5162 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4022,7 +4022,7 @@ StackVar ScInterpreter::Interpret()
case ocStDevP_MS : ScStDevP( false ); break;
case ocStDevPA : ScStDevP( true ); break;
case ocPV : ScPV(); break;
- case ocDIA : ScDIA(); break;
+ case ocSYD : ScSYD(); break;
case ocGDA : ScGDA(); break;
case ocGDA2 : ScGDA2(); break;
case ocVBD : ScVDB(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 7cf8988..f59b0ef 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1182,7 +1182,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocGauss:
case ocGeoMean:
case ocHarMean:
- case ocDIA:
+ case ocSYD:
case ocCorrel:
case ocNegBinomVert:
case ocPearson:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 2fed0b5..f37e72d 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -190,7 +190,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocGetDateValue, 140, 1, 1, V, { VR }, 0, 0 },
{ ocGetTimeValue, 141, 1, 1, V, { VR }, 0, 0 },
{ ocLIA, 142, 3, 3, V, { VR }, 0, 0 },
- { ocDIA, 143, 4, 4, V, { VR }, 0, 0 },
+ { ocSYD, 143, 4, 4, V, { VR }, 0, 0 },
{ ocGDA, 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 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 9b04848..303919d 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1046,7 +1046,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocNoName, // 117 Term()
ocNoName, // 118 Cterm()
ocLIA, // 119 Sln()
- ocDIA, // 120 Syd(), Soy()
+ ocSYD, // 120 Syd(), Soy()
ocGDA, // 121 Ddb()
ocNoName, // 122
ocNoName, // 123
@@ -1575,7 +1575,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocNoName, // 117 Term()
ocNoName, // 118 Cterm()
ocLIA, // 119 Sln()
- ocDIA, // 120 Syd(), Soy()
+ ocSYD, // 120 Syd(), Soy()
ocGDA, // 121 Ddb()
ocNoName, // 122 Splfunc
ocNoName, // 123 Sheets
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index bdd6f34..92b2713 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -492,7 +492,7 @@ static const struct
{ ocNoName, FT_NotImpl },
{ ocNoName, FT_NotImpl },
{ ocLIA, FT_FuncFix3 },
- { ocDIA, FT_FuncFix4 },
+ { ocSYD, FT_FuncFix4 },
{ ocGDA, FT_FuncFix4 },
{ ocStDevP, FT_FuncVar },
{ ocVarP, FT_FuncVar },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index fd54ccd..d559a26 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1708,8 +1708,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = "Type = 1 denotes due at the beginning of the period, = 0 at the end." ;
};
};
- // -=*# Resource for function DIA #*=-
- Resource SC_OPCODE_DIA
+ // -=*# Resource for function SYD #*=-
+ Resource SC_OPCODE_SYD
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list