strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#85818: rename BW to PV

Browse source 
Change-Id: I3b319a4074c549daaa1d6befaca79dab93e61df6
Reviewed-on: https://gerrit.libreoffice.org/13824
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Laurent Charrière 2015-01-09 11:36:49 +01:00 committed by Noel Grandin
parent c7d23291ea
commit 8416ac2b53
14 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
formula/source/core/api/FormulaCompiler.cxx
View file

@ -92,7 +92,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocGetTime:
return NUMBERFORMAT_TIME;
case ocNPV:
case ocBW:
case ocPV:
case ocDIA:
case ocGDA:
case ocGDA2:

2
formula/source/core/api/token.cxx
View file

@ -1259,7 +1259,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin
case ocIpmt:
case ocPpmt:
return AddDefaultArg( pNewArr, 4, 0.0 );
case ocBW: // PV
case ocPV:
case ocZW: // FV
bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v

8
formula/source/core/resource/core_resource.src
View file

@ -210,7 +210,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_COMBIN_A { Text = "COMBINA" ; };
String SC_OPCODE_PERMUT { Text = "PERMUT" ; };
String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; };
String SC_OPCODE_BW { Text = "PV" ; };
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_DIA { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_GDA_2 { Text = "DB" ; };
@ -617,7 +617,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_COMBIN_A { Text = "_xlfn.COMBINA" ; };
String SC_OPCODE_PERMUT { Text = "PERMUT" ; };
String SC_OPCODE_PERMUTATION_A { Text = "_xlfn.PERMUTATIONA" ; };
String SC_OPCODE_BW { Text = "PV" ; };
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_DIA { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_GDA_2 { Text = "DB" ; };
@ -1026,7 +1026,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_COMBIN_A { Text = "COMBINA" ; };
String SC_OPCODE_PERMUT { Text = "PERMUT" ; };
String SC_OPCODE_PERMUTATION_A { Text = "PERMUTATIONA" ; };
String SC_OPCODE_BW { Text = "PV" ; };
String SC_OPCODE_PV { Text = "PV" ; };
String SC_OPCODE_DIA { Text = "SYD" ; };
String SC_OPCODE_GDA { Text = "DDB" ; };
String SC_OPCODE_GDA_2 { Text = "DB" ; };
@ -1923,7 +1923,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "PERMUTATIONA" ;
};
String SC_OPCODE_BW
String SC_OPCODE_PV
{
Text [ en-US ] = "PV" ;
};

2
include/formula/compiler.hrc
View file

@ -241,7 +241,7 @@
#define SC_OPCODE_COMBIN_A 241
#define SC_OPCODE_PERMUT 242
#define SC_OPCODE_PERMUTATION_A 243
#define SC_OPCODE_BW 244
#define SC_OPCODE_PV 244
#define SC_OPCODE_DIA 245
#define SC_OPCODE_GDA 246
#define SC_OPCODE_GDA_2 247

2
include/formula/opcode.hxx
View file

@ -245,7 +245,7 @@ enum OpCode : sal_uInt16
ocCombinA = SC_OPCODE_COMBIN_A,
ocPermut = SC_OPCODE_PERMUT,
ocPermutationA = SC_OPCODE_PERMUTATION_A,
ocBW = SC_OPCODE_BW,
ocPV = SC_OPCODE_PV,
ocDIA = SC_OPCODE_DIA,
ocGDA = SC_OPCODE_GDA,
ocGDA2 = SC_OPCODE_GDA_2,

2
sc/source/core/inc/interpre.hxx
View file

@ -660,7 +660,7 @@ void ScISPMT();
double ScGetBw(double fZins, double fZzr, double fRmz,
double fZw, double fF);
void ScBW();
void ScPV();
void ScDIA();
double ScGetGDA(double fWert, double fRest, double fDauer,
double fPeriode, double fFactor);

2
sc/source/core/opencl/formulagroupcl.cxx
View file

@ -2346,7 +2346,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpAbs, nResultSize));
break;
case ocBW:
case ocPV:
mvSubArguments.push_back(SoPHelper(ts,
ft->Children[i], new OpPV, nResultSize));
break;

2
sc/source/core/tool/interpr2.cxx
View file

@ -1173,7 +1173,7 @@ double ScInterpreter::ScGetBw(double fInterest, double fZzr, double fRmz,
return -fBw;
}
void ScInterpreter::ScBW()
void ScInterpreter::ScPV()
{
nFuncFmtType = NUMBERFORMAT_CURRENCY;
double nRmz, nZzr, nInterest, nZw = 0, nFlag = 0;

2
sc/source/core/tool/interpr4.cxx
View file

@ -4021,7 +4021,7 @@ StackVar ScInterpreter::Interpret()
case ocStDevP :
case ocStDevP_MS : ScStDevP( false ); break;
case ocStDevPA : ScStDevP( true ); break;
case ocBW : ScBW(); break;
case ocPV : ScPV(); break;
case ocDIA : ScDIA(); break;
case ocGDA : ScGDA(); break;
case ocGDA2 : ScGDA2(); break;

2
sc/source/core/tool/token.cxx
View file

@ -1194,7 +1194,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocLaufz:
case ocSinHyp:
case ocAbs:
case ocBW:
case ocPV:
case ocSin:
case ocTan:
case ocTanHyp:

2
sc/source/filter/excel/xlformula.cxx
View file

@ -134,7 +134,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocTrend, 50, 1, 3, A, { RA, RA, RA, C }, 0, 0 },
{ ocRKP, 51, 1, 2, A, { RA, RA, C, C }, 0, 0 },
{ ocGrowth, 52, 1, 3, A, { RA, RA, RA, C }, 0, 0 },
{ ocBW, 56, 3, 5, V, { VR }, 0, 0 },
{ ocPV, 56, 3, 5, V, { VR }, 0, 0 },
{ ocZW, 57, 3, 5, V, { VR }, 0, 0 },
{ ocZZR, 58, 3, 5, V, { VR }, 0, 0 },
{ ocRMZ, 59, 3, 5, V, { VR }, 0, 0 },

4
sc/source/filter/lotus/lotform.cxx
View file

@ -983,7 +983,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocGetDate, // 54 Date
ocGetActDate, // 55 Today
ocRMZ, // 56 Payment
ocBW, // 57 Present Value
ocPV, // 57 Present Value
ocZW, // 58 Future Value
ocIf, // 59 If ... then ... else ...
ocGetDay, // 60 Day of month
@ -1512,7 +1512,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocGetDate, // 54 Date
ocGetActDate, // 55 Today
ocRMZ, // 56 Payment
ocBW, // 57 Present Value
ocPV, // 57 Present Value
ocZW, // 58 Future Value
ocIf, // 59 If... then... else...
ocGetDay, // 60 Day of Month

2
sc/source/filter/qpro/qproform.cxx
View file

@ -498,7 +498,7 @@ static const struct
{ ocVarP, FT_FuncVar },
{ ocDBStdDevP, FT_FuncVar },
{ ocDBVarP, FT_FuncVar },
{ ocBW, FT_FuncFix3 }, // QPro Pval
{ ocPV, FT_FuncFix3 }, // QPro Pval
{ ocRMZ, FT_FuncFix5 }, // QPro Paymt
{ ocZW, FT_FuncFix3 }, // QPro Fval // 0x80
{ ocZZR, FT_FuncFix5 },

4
sc/source/ui/src/scfuncs.src
View file

@ -1164,8 +1164,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = "An integer between 1583 and 9956, or 0 and 99 (19xx or 20xx depending on the option set).";
};
};
// -=*# Resource for function BW #*=-
Resource SC_OPCODE_BW
// -=*# Resource for function PV #*=-
Resource SC_OPCODE_PV
{
String 1 // Description
{