summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorLaurent Charrière <lcharriere@gmail.com>2015-01-09 12:01:16 +0100
committerNoel Grandin <noelgrandin@gmail.com>2015-01-12 06:52:04 +0000
commitb2fcd4f7c7133f10bde8df3b7544023a3719d2b2 (patch)
treeb74d0ad35eefba9d3632de81753f4c0813558f70 /sc/source
parent8416ac2b532673f2b64be102d77c805fe5e81720 (diff)
fdo#85818: rename DIA to SYD
Change-Id: I3510403521668c00f44d462b288716f5f7b60115 Reviewed-on: https://gerrit.libreoffice.org/13825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/core/inc/interpre.hxx2
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx2
-rw-r--r--sc/source/core/tool/interpr2.cxx2
-rw-r--r--sc/source/core/tool/interpr4.cxx2
-rw-r--r--sc/source/core/tool/token.cxx2
-rw-r--r--sc/source/filter/excel/xlformula.cxx2
-rw-r--r--sc/source/filter/lotus/lotform.cxx4
-rw-r--r--sc/source/filter/qpro/qproform.cxx2
-rw-r--r--sc/source/ui/src/scfuncs.src4
9 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 2cf46e86ff83..4ce3313ea1ec 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 859327dd0991..870b1fbd375a 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 81b33d24a8c3..7e9410c4ff4d 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 51df509cad9d..e6e5162f8fad 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 7cf89883e56d..f59b0ef85612 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 2fed0b555f19..f37e72d8825a 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 9b048482d744..303919d22f81 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 bdd6f34ec8b2..92b2713d370d 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 fd54ccd6d27f..d559a262ed1e 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
{