[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Sun Jan 11 22:52:03 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 8416ac2b532673f2b64be102d77c805fe5e81720
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 11:36:49 2015 +0100
fdo#85818: rename BW to PV
Change-Id: I3b319a4074c549daaa1d6befaca79dab93e61df6
Reviewed-on: https://gerrit.libreoffice.org/13824
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index de527e4..858fe06 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -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:
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 3b16cc3..c6f4a2f 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -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
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index a5bf5d8..2434ead 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -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" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index be61ed8..3ffd2ba 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -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
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index f6de536..6a68339 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -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,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index bc57d19..2cf46e8 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -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);
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 72cf966..859327d 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -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;
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index b90e056..81b33d2 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -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;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 1b7f50c..51df509 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -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;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index e8bfe41..7cf8988 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -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:
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 699d9fb..2fed0b5 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -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 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 7faf363..9b04848 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -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
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 32c2dc2..bdd6f34 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -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 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index efa107e..fd54ccd 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -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
{
More information about the Libreoffice-commits
mailing list