[Libreoffice-commits] core.git: sc/source
Johnny_M
klasse at partyheld.de
Mon Oct 23 11:59:52 UTC 2017
sc/source/core/inc/interpre.hxx | 8 ++++----
sc/source/core/tool/interpr2.cxx | 38 +++++++++++++++++++-------------------
2 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit a67d2aa67401e31bea3b3ad82cb19bbecf071e50
Author: Johnny_M <klasse at partyheld.de>
Date: Sun Oct 22 15:28:53 2017 +0200
Translate German function names in Calc (financial)
The affected parts of names of functions correspond to German function names
in Calc and were translated to their English equivalents. For used translations,
see, e.g., https://translations.documentfoundation.org/de/libo54_help/translate/#search=GDA&sfields=target&soptions=exact,case
Note: The translation here is equal to the translation of variables done
on https://gerrit.libreoffice.org/43078 , etc.
Change-Id: If3043a9a10366dbf11269d72708404e350d58166
Reviewed-on: https://gerrit.libreoffice.org/43691
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index bd9008d47bde..c50f65078e81 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -771,11 +771,11 @@ private:
void ScMIRR();
void ScISPMT();
- static double ScGetBw(double fInterest, double fNper, double fPmt,
+ static double ScGetPV(double fInterest, double fNper, double fPmt,
double fFv, bool bPayInAdvance);
void ScPV();
void ScSYD();
- static double ScGetGDA(double fValue, double fRest, double fTimeLength,
+ static double ScGetDDB(double fValue, double fRest, double fTimeLength,
double fPeriod, double fFactor);
void ScDDB();
void ScDB();
@@ -784,11 +784,11 @@ private:
void ScVDB();
void ScPDuration();
void ScSLN();
- static double ScGetRmz(double fInterest, double fNper, double fPv,
+ static double ScGetPMT(double fInterest, double fNper, double fPv,
double fFv, bool bPayInAdvance);
void ScPMT();
void ScRRI();
- static double ScGetZw(double fInterest, double fNper, double fPmt,
+ static double ScGetFV(double fInterest, double fNper, double fPmt,
double fPv, bool bFlag);
void ScFV();
void ScNper();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 1a29ed2ddbc3..24e1ca148f7e 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1592,7 +1592,7 @@ void ScInterpreter::ScISPMT()
}
// financial functions
-double ScInterpreter::ScGetBw(double fInterest, double fNper, double fPmt,
+double ScInterpreter::ScGetPV(double fInterest, double fNper, double fPmt,
double fFv, bool bPayInAdvance)
{
double fPv;
@@ -1626,7 +1626,7 @@ void ScInterpreter::ScPV()
nPmt = GetDouble();
nNper = GetDouble();
nInterest = GetDouble();
- PushDouble(ScGetBw(nInterest, nNper, nPmt, nFv, bPayInAdvance));
+ PushDouble(ScGetPV(nInterest, nNper, nPmt, nFv, bPayInAdvance));
}
void ScInterpreter::ScSYD()
@@ -1644,7 +1644,7 @@ void ScInterpreter::ScSYD()
}
}
-double ScInterpreter::ScGetGDA(double fValue, double fRest, double fTimeLength,
+double ScInterpreter::ScGetDDB(double fValue, double fRest, double fTimeLength,
double fPeriod, double fFactor)
{
double fDdb, fInterest, fOldValue, fNewValue;
@@ -1689,7 +1689,7 @@ void ScInterpreter::ScDDB()
|| nPeriod < 1.0 || nPeriod > nTimeLength)
PushIllegalArgument();
else
- PushDouble(ScGetGDA(nValue, nRest, nTimeLength, nPeriod, nFactor));
+ PushDouble(ScGetDDB(nValue, nRest, nTimeLength, nPeriod, nFactor));
}
}
@@ -1756,7 +1756,7 @@ double ScInterpreter::ScInterVDB(double fValue,double fRest,double fTimeLength,
{
if(!bNowSln)
{
- fDdb = ScGetGDA(fValue, fRest, fTimeLength, (double) i, fFactor);
+ fDdb = ScGetDDB(fValue, fRest, fTimeLength, (double) i, fFactor);
fSln = fSalvageValue/ (fTimeLength1 - (double) (i-1));
if (fSln > fDdb)
@@ -1824,7 +1824,7 @@ void ScInterpreter::ScVDB()
{
for (sal_uLong i = nLoopStart + 1; i <= nLoopEnd; i++)
{
- double fTerm = ScGetGDA(fValue, fRest, fTimeLength, (double) i, fFactor);
+ double fTerm = ScGetDDB(fValue, fRest, fTimeLength, (double) i, fFactor);
//respect partial period in the Beginning/ End:
if ( i == nLoopStart+1 )
@@ -1900,7 +1900,7 @@ void ScInterpreter::ScSLN()
}
}
-double ScInterpreter::ScGetRmz(double fRate, double fNper, double fPv,
+double ScInterpreter::ScGetPMT(double fRate, double fNper, double fPv,
double fFv, bool bPayInAdvance)
{
double fPayment;
@@ -1933,7 +1933,7 @@ void ScInterpreter::ScPMT()
nPv = GetDouble();
nNper = GetDouble();
nInterest = GetDouble();
- PushDouble(ScGetRmz(nInterest, nNper, nPv, nFv, bFlag));
+ PushDouble(ScGetPMT(nInterest, nNper, nPv, nFv, bFlag));
}
void ScInterpreter::ScRRI()
@@ -1951,7 +1951,7 @@ void ScInterpreter::ScRRI()
}
}
-double ScInterpreter::ScGetZw(double fInterest, double fNper, double fPmt,
+double ScInterpreter::ScGetFV(double fInterest, double fNper, double fPmt,
double fPv, bool bFlag)
{
double fFv;
@@ -1983,7 +1983,7 @@ void ScInterpreter::ScFV()
nPmt = GetDouble();
nNper = GetDouble();
nInterest = GetDouble();
- PushDouble(ScGetZw(nInterest, nNper, nPmt, nPv, bFlag));
+ PushDouble(ScGetFV(nInterest, nNper, nPmt, nPv, bFlag));
}
void ScInterpreter::ScNper()
@@ -2176,7 +2176,7 @@ void ScInterpreter::ScRate()
double ScInterpreter::ScGetCompoundInterest(double fInterest, double fPer, double fNper, double fPv,
double fFv, bool bPayInAdvance, double& fPmt)
{
- fPmt = ScGetRmz(fInterest, fNper, fPv, fFv, bPayInAdvance); // for PPMT also if fPer == 1
+ fPmt = ScGetPMT(fInterest, fNper, fPv, fFv, bPayInAdvance); // for PPMT also if fPer == 1
double fCompoundInterest;
nFuncFmtType = css::util::NumberFormat::CURRENCY;
if (fPer == 1.0)
@@ -2189,9 +2189,9 @@ double ScInterpreter::ScGetCompoundInterest(double fInterest, double fPer, doubl
else
{
if (bPayInAdvance)
- fCompoundInterest = ScGetZw(fInterest, fPer-2.0, fPmt, fPv, true) - fPmt;
+ fCompoundInterest = ScGetFV(fInterest, fPer-2.0, fPmt, fPv, true) - fPmt;
else
- fCompoundInterest = ScGetZw(fInterest, fPer-1.0, fPmt, fPv, false);
+ fCompoundInterest = ScGetFV(fInterest, fPer-1.0, fPmt, fPv, false);
}
return fCompoundInterest * fInterest;
}
@@ -2268,7 +2268,7 @@ void ScInterpreter::ScCumIpmt()
bool bPayInAdvance = ( bool ) fFlag;
sal_uLong nStart = (sal_uLong) fStart;
sal_uLong nEnd = (sal_uLong) fEnd ;
- double fPmt = ScGetRmz(fInterest, fNper, fPv, 0.0, bPayInAdvance);
+ double fPmt = ScGetPMT(fInterest, fNper, fPv, 0.0, bPayInAdvance);
double fCompoundInterest = 0.0;
if (nStart == 1)
{
@@ -2279,9 +2279,9 @@ void ScInterpreter::ScCumIpmt()
for (sal_uLong i = nStart; i <= nEnd; i++)
{
if (bPayInAdvance)
- fCompoundInterest += ScGetZw(fInterest, (double)(i-2), fPmt, fPv, true) - fPmt;
+ fCompoundInterest += ScGetFV(fInterest, (double)(i-2), fPmt, fPv, true) - fPmt;
else
- fCompoundInterest += ScGetZw(fInterest, (double)(i-1), fPmt, fPv, false);
+ fCompoundInterest += ScGetFV(fInterest, (double)(i-1), fPmt, fPv, false);
}
fCompoundInterest *= fInterest;
PushDouble(fCompoundInterest);
@@ -2308,7 +2308,7 @@ void ScInterpreter::ScCumPrinc()
else
{
bool bPayInAdvance = ( bool ) fFlag;
- double fPmt = ScGetRmz(fInterest, fNper, fPv, 0.0, bPayInAdvance);
+ double fPmt = ScGetPMT(fInterest, fNper, fPv, 0.0, bPayInAdvance);
double fPpmt = 0.0;
sal_uLong nStart = (sal_uLong) fStart;
sal_uLong nEnd = (sal_uLong) fEnd;
@@ -2323,9 +2323,9 @@ void ScInterpreter::ScCumPrinc()
for (sal_uLong i = nStart; i <= nEnd; i++)
{
if (bPayInAdvance)
- fPpmt += fPmt - (ScGetZw(fInterest, (double)(i-2), fPmt, fPv, true) - fPmt) * fInterest;
+ fPpmt += fPmt - (ScGetFV(fInterest, (double)(i-2), fPmt, fPv, true) - fPmt) * fInterest;
else
- fPpmt += fPmt - ScGetZw(fInterest, (double)(i-1), fPmt, fPv, false) * fInterest;
+ fPpmt += fPmt - ScGetFV(fInterest, (double)(i-1), fPmt, fPv, false) * fInterest;
}
PushDouble(fPpmt);
}
More information about the Libreoffice-commits
mailing list