[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:50:50 PST 2015
formula/source/core/api/FormulaCompiler.cxx | 2 +-
formula/source/core/api/token.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 ++--
14 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit b08f87b62db81b498ea71e5e1049b96e3dc42da4
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 14:07:30 2015 +0100
fdo#85818: rename ZW to FV
Change-Id: I464cba72153ef70bbb14bf43a448a28d02095728
Reviewed-on: https://gerrit.libreoffice.org/13868
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index d1ef9a9..55a1063 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -99,7 +99,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocVBD:
case ocSLN:
case ocPMT:
- case ocZW:
+ case ocFV:
case ocIpmt:
case ocPpmt:
case ocCumIpmt:
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 82cdcf2..0ae7059 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1260,7 +1260,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin
case ocPpmt:
return AddDefaultArg( pNewArr, 4, 0.0 );
case ocPV:
- case ocZW: // FV
+ case ocFV:
bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
break;
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 8a90a9c..ecdccb5 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -226,7 +226,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ROW { Text = "ROW" ; };
String SC_OPCODE_TABLE { Text = "SHEET" ; };
String SC_OPCODE_RRI { Text = "RRI" ; };
- String SC_OPCODE_ZW { Text = "FV" ; };
+ String SC_OPCODE_FV { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
@@ -634,7 +634,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ROW { Text = "ROW" ; };
String SC_OPCODE_TABLE { Text = "_xlfn.SHEET" ; };
String SC_OPCODE_RRI { Text = "_xlfn.RRI" ; };
- String SC_OPCODE_ZW { Text = "FV" ; };
+ String SC_OPCODE_FV { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
@@ -1044,7 +1044,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_ROW { Text = "ROW" ; };
String SC_OPCODE_TABLE { Text = "SHEET" ; };
String SC_OPCODE_RRI { Text = "ZGZ" ; };
- String SC_OPCODE_ZW { Text = "FV" ; };
+ String SC_OPCODE_FV { Text = "FV" ; };
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
@@ -1990,7 +1990,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "RRI" ;
};
- String SC_OPCODE_ZW
+ String SC_OPCODE_FV
{
Text [ en-US ] = "FV" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 1d6b901..709fc1f 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -255,7 +255,7 @@
#define SC_OPCODE_COLUMN 254
#define SC_OPCODE_ROW 255
#define SC_OPCODE_RRI 256
-#define SC_OPCODE_ZW 257
+#define SC_OPCODE_FV 257
#define SC_OPCODE_ZZR 258
#define SC_OPCODE_RATE 259
#define SC_OPCODE_IPMT 260
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 33cf54c..596d686 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -259,7 +259,7 @@ enum OpCode : sal_uInt16
ocColumn = SC_OPCODE_COLUMN,
ocRow = SC_OPCODE_ROW,
ocRRI = SC_OPCODE_RRI,
- ocZW = SC_OPCODE_ZW,
+ ocFV = SC_OPCODE_FV,
ocZZR = SC_OPCODE_ZZR,
ocRate = SC_OPCODE_RATE,
ocIpmt = SC_OPCODE_IPMT,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index d7710ed..3ae3fb6 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -679,7 +679,7 @@ void ScPMT();
void ScRRI();
double ScGetZw(double fZins, double fZzr, double fRmz,
double fBw, double fF);
-void ScZW();
+void ScFV();
void ScZZR();
bool RateIteration(double fNper, double fPayment, double fPv,
double fFv, double fPayType, double& fGuess);
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 581bd24..22a5986 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2706,7 +2706,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpDDB, nResultSize));
break;
- case ocZW:
+ case ocFV:
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpFV, nResultSize));
break;
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index fa840ff..f7224ae 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1510,7 +1510,7 @@ double ScInterpreter::ScGetZw(double fInterest, double fZzr, double fRmz,
return -fZw;
}
-void ScInterpreter::ScZW()
+void ScInterpreter::ScFV()
{
double nInterest, nZzr, nRmz, nBw = 0, nFlag = 0;
nFuncFmtType = NUMBERFORMAT_CURRENCY;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b276bf9..0cdc051 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4036,7 +4036,7 @@ StackVar ScInterpreter::Interpret()
case ocRow : ScRow(); break;
case ocTable : ScTable(); break;
case ocRRI : ScRRI(); break;
- case ocZW : ScZW(); break;
+ case ocFV : ScFV(); break;
case ocZZR : ScZZR(); break;
case ocRate : ScRate(); break;
case ocFilterXML : ScFilterXML(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 0e6e311..8b4925b 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1202,7 +1202,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocWeibull:
case ocMedian:
case ocDDB:
- case ocZW:
+ case ocFV:
case ocVBD:
case ocKurt:
case ocZZR:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index e4d2849..9742a53 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -135,7 +135,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocRKP, 51, 1, 2, A, { RA, RA, C, C }, 0, 0 },
{ ocGrowth, 52, 1, 3, A, { RA, RA, RA, C }, 0, 0 },
{ ocPV, 56, 3, 5, V, { VR }, 0, 0 },
- { ocZW, 57, 3, 5, V, { VR }, 0, 0 },
+ { ocFV, 57, 3, 5, V, { VR }, 0, 0 },
{ ocZZR, 58, 3, 5, V, { VR }, 0, 0 },
{ ocPMT, 59, 3, 5, V, { VR }, 0, 0 },
{ ocRate, 60, 3, 6, V, { VR }, 0, 0 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 60b874a..cc7f2b2 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -984,7 +984,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocGetActDate, // 55 Today
ocPMT, // 56 Payment
ocPV, // 57 Present Value
- ocZW, // 58 Future Value
+ ocFV, // 58 Future Value
ocIf, // 59 If ... then ... else ...
ocGetDay, // 60 Day of month
ocGetMonth, // 61 Month
@@ -1513,7 +1513,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocGetActDate, // 55 Today
ocPMT, // 56 Payment
ocPV, // 57 Present Value
- ocZW, // 58 Future Value
+ ocFV, // 58 Future Value
ocIf, // 59 If... then... else...
ocGetDay, // 60 Day of Month
ocGetMonth, // 61 Month
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 3121eb2..1aae321 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -500,7 +500,7 @@ static const struct
{ ocDBVarP, FT_FuncVar },
{ ocPV, FT_FuncFix3 }, // QPro Pval
{ ocPMT, FT_FuncFix5 }, // QPro Paymt
- { ocZW, FT_FuncFix3 }, // QPro Fval // 0x80
+ { ocFV, FT_FuncFix3 }, // QPro Fval // 0x80
{ ocZZR, FT_FuncFix5 },
{ ocRate, FT_FuncFix5 },
{ ocIpmt, FT_FuncFix4 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d6950dc..dad0a04 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1220,8 +1220,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 ZW #*=-
- Resource SC_OPCODE_ZW
+ // -=*# Resource for function FV #*=-
+ Resource SC_OPCODE_FV
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list