[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:51:24 PST 2015
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 | 6 +++---
sc/source/filter/qpro/qproform.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 4 ++--
12 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 7d7a16b9d3f9e45cb147e79d192ff9a20e59f0fe
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 14:38:54 2015 +0100
fdo#85818: translate ZZR to Nper
Change-Id: Ib118d92a026526483da87dfe04871de25caa8ac1
Reviewed-on: https://gerrit.libreoffice.org/13869
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index ecdccb5..2f79b48 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -227,7 +227,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_TABLE { Text = "SHEET" ; };
String SC_OPCODE_RRI { Text = "RRI" ; };
String SC_OPCODE_FV { Text = "FV" ; };
- String SC_OPCODE_ZZR { Text = "NPER" ; };
+ String SC_OPCODE_NPER { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
@@ -635,7 +635,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_TABLE { Text = "_xlfn.SHEET" ; };
String SC_OPCODE_RRI { Text = "_xlfn.RRI" ; };
String SC_OPCODE_FV { Text = "FV" ; };
- String SC_OPCODE_ZZR { Text = "NPER" ; };
+ String SC_OPCODE_NPER { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
@@ -1045,7 +1045,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_TABLE { Text = "SHEET" ; };
String SC_OPCODE_RRI { Text = "ZGZ" ; };
String SC_OPCODE_FV { Text = "FV" ; };
- String SC_OPCODE_ZZR { Text = "NPER" ; };
+ String SC_OPCODE_NPER { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
@@ -1994,7 +1994,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "FV" ;
};
- String SC_OPCODE_ZZR
+ String SC_OPCODE_NPER
{
Text [ en-US ] = "NPER" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 709fc1f..e645fcb 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -256,7 +256,7 @@
#define SC_OPCODE_ROW 255
#define SC_OPCODE_RRI 256
#define SC_OPCODE_FV 257
-#define SC_OPCODE_ZZR 258
+#define SC_OPCODE_NPER 258
#define SC_OPCODE_RATE 259
#define SC_OPCODE_IPMT 260
#define SC_OPCODE_PPMT 261
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 596d686..57aa6a1 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -260,7 +260,7 @@ enum OpCode : sal_uInt16
ocRow = SC_OPCODE_ROW,
ocRRI = SC_OPCODE_RRI,
ocFV = SC_OPCODE_FV,
- ocZZR = SC_OPCODE_ZZR,
+ ocNper = SC_OPCODE_NPER,
ocRate = SC_OPCODE_RATE,
ocIpmt = SC_OPCODE_IPMT,
ocPpmt = SC_OPCODE_PPMT,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3ae3fb6..6c7cd09 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -680,7 +680,7 @@ void ScRRI();
double ScGetZw(double fZins, double fZzr, double fRmz,
double fBw, double fF);
void ScFV();
-void ScZZR();
+void ScNper();
bool RateIteration(double fNper, double fPayment, double fPv,
double fFv, double fPayType, double& fGuess);
void ScRate();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 22a5986..94b0b28 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2722,7 +2722,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpKurt, nResultSize));
break;
- /*case ocZZR:
+ /*case ocNper:
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpNper));
break;*/
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index f7224ae..1114444 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1527,7 +1527,7 @@ void ScInterpreter::ScFV()
PushDouble(ScGetZw(nInterest, nZzr, nRmz, nBw, nFlag));
}
-void ScInterpreter::ScZZR()
+void ScInterpreter::ScNper()
{
double nInterest, nRmz, nBw, nZw = 0, nFlag = 0;
sal_uInt8 nParamCount = GetByte();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 0cdc051..d1620fe 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4037,7 +4037,7 @@ StackVar ScInterpreter::Interpret()
case ocTable : ScTable(); break;
case ocRRI : ScRRI(); break;
case ocFV : ScFV(); break;
- case ocZZR : ScZZR(); break;
+ case ocNper : ScNper(); break;
case ocRate : ScRate(); break;
case ocFilterXML : ScFilterXML(); break;
case ocWebservice : ScWebservice(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8b4925b..0aa1f47 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1205,7 +1205,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocFV:
case ocVBD:
case ocKurt:
- case ocZZR:
+ case ocNper:
case ocNormDist:
case ocArcCos:
case ocSqrt:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 9742a53..5869f96 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -136,7 +136,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocGrowth, 52, 1, 3, A, { RA, RA, RA, C }, 0, 0 },
{ ocPV, 56, 3, 5, V, { VR }, 0, 0 },
{ ocFV, 57, 3, 5, V, { VR }, 0, 0 },
- { ocZZR, 58, 3, 5, V, { VR }, 0, 0 },
+ { ocNper, 58, 3, 5, V, { VR }, 0, 0 },
{ ocPMT, 59, 3, 5, V, { VR }, 0, 0 },
{ ocRate, 60, 3, 6, V, { VR }, 0, 0 },
{ ocMIRR, 61, 3, 3, V, { RA, VR }, 0, 0 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index cc7f2b2..5feee26 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -137,7 +137,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
eParam[ 2 ] = n0Token; // -> 2. as Default
}
break;
- case ocZZR:
+ case ocNper:
{
OSL_ENSURE( nAnz == 3,
"*LotusToSc::DoFunc(): TERM() or CTERM() need 3 parameters!" );
@@ -2052,9 +2052,9 @@ static DefTokenId lcl_KnownAddIn( const OString& rTest )
else if (rTest == "CRITBINOMIAL")
eId=ocKritBinom;
else if (rTest == "TERM")
- eId=ocZZR;
+ eId=ocNper;
else if (rTest == "CTERM")
- eId=ocZZR;
+ eId=ocNper;
else if (rTest == "SUMIF")
eId=ocSumIf;
else if (rTest == "COUNTIF")
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 1aae321..14bf6c1 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -501,7 +501,7 @@ static const struct
{ ocPV, FT_FuncFix3 }, // QPro Pval
{ ocPMT, FT_FuncFix5 }, // QPro Paymt
{ ocFV, FT_FuncFix3 }, // QPro Fval // 0x80
- { ocZZR, FT_FuncFix5 },
+ { ocNper, FT_FuncFix5 },
{ ocRate, FT_FuncFix5 },
{ ocIpmt, FT_FuncFix4 },
{ ocPpmt, FT_FuncFix6 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index dad0a04..cda12ba 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1276,8 +1276,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 ZZR #*=-
- Resource SC_OPCODE_ZZR
+ // -=*# Resource for function NPER #*=-
+ Resource SC_OPCODE_NPER
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list