diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index d1ef9a958188..55a1063b1f75 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 82cdcf210718..0ae70594c2db 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 8a90a9cee238..ecdccb557df4 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 1d6b901f15ab..709fc1ff6021 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 33cf54ce5427..596d6863e0ce 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 d7710edb35c6..3ae3fb67c7d8 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 581bd24ac162..22a59863df1d 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 fa840ff517d3..f7224ae8e237 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 b276bf904195..0cdc0519430f 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 0e6e3113fbb1..8b4925bccd5d 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 e4d28491c9cb..9742a538311c 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 60b874a384bd..cc7f2b23fe6b 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 3121eb262e5e..1aae32125cab 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 d6950dc9c798..dad0a043b1fd 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 {