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/qpro/qproform.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 2 +-
13 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit b8359780a25b4e645236dd0238e4ef39cd8413ce
Author: Laurent Charrière <lcharri...@gmail.com>
Date: Thu Jan 8 09:42:50 2015 +0100
fdo#85818: rename Kapz to Ppmt
Rename OcKapz to OcPpmt, SC_OPCODE_KAPZ to SC_OPCODE_PPMT
ScInterpreter::ScKapz() to ScInterpreter::ScPpmt().
Change-Id: I5bc556e086970ea487e14b4663a9b3d2aaf9bb66
Reviewed-on: https://gerrit.libreoffice.org/13815
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index b8380b8..2649e34 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -101,7 +101,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocRMZ:
case ocZW:
case ocIpmt:
- case ocKapz:
+ case ocPpmt:
case ocKumZinsZ:
case ocKumKapZ:
return NUMBERFORMAT_CURRENCY;
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 1403dfa..3b16cc3 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1257,7 +1257,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
case ocRMZ: // PMT
return AddDefaultArg( pNewArr, 3, 0.0 );
case ocIpmt:
- case ocKapz: // PPMT
+ case ocPpmt:
return AddDefaultArg( pNewArr, 4, 0.0 );
case ocBW: // PV
case ocZW: // FV
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index f704d0c..1e540a2 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -229,7 +229,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
- String SC_OPCODE_KAPZ { Text = "PPMT" ; };
+ String SC_OPCODE_PPMT { Text = "PPMT" ; };
String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECT" ; };
@@ -636,7 +636,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
- String SC_OPCODE_KAPZ { Text = "PPMT" ; };
+ String SC_OPCODE_PPMT { Text = "PPMT" ; };
String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
@@ -1045,7 +1045,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_ZZR { Text = "NPER" ; };
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
- String SC_OPCODE_KAPZ { Text = "PPMT" ; };
+ String SC_OPCODE_PPMT { Text = "PPMT" ; };
String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
@@ -1999,7 +1999,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "IPMT" ;
};
- String SC_OPCODE_KAPZ
+ String SC_OPCODE_PPMT
{
Text [ en-US ] = "PPMT" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index aca7b92..c760755 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -258,7 +258,7 @@
#define SC_OPCODE_ZZR 258
#define SC_OPCODE_RATE 259
#define SC_OPCODE_IPMT 260
-#define SC_OPCODE_KAPZ 261
+#define SC_OPCODE_PPMT 261
#define SC_OPCODE_KUM_ZINS_Z 262
#define SC_OPCODE_KUM_KAP_Z 263
#define SC_OPCODE_EFFEKTIV 264
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index a122e2b..bd64dd5 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -262,7 +262,7 @@ enum OpCode : sal_uInt16
ocZZR = SC_OPCODE_ZZR,
ocRate = SC_OPCODE_RATE,
ocIpmt = SC_OPCODE_IPMT,
- ocKapz = SC_OPCODE_KAPZ,
+ ocPpmt = SC_OPCODE_PPMT,
ocKumZinsZ = SC_OPCODE_KUM_ZINS_Z,
ocKumKapZ = SC_OPCODE_KUM_KAP_Z,
ocEffektiv = SC_OPCODE_EFFEKTIV,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index dd09464..b9513a3 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -685,7 +685,7 @@ void ScRate();
double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw,
double fZw, double fF, double& fRmz);
void ScIpmt();
-void ScKapz();
+void ScPpmt();
void ScKumZinsZ();
void ScKumKapZ();
void ScEffektiv();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 51e2e72..72cf966 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2271,7 +2271,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
case ocZGZ:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new
OpRRI, nResultSize));
break;
- case ocKapz:
+ case ocPpmt:
mvSubArguments.push_back(SoPHelper(ts, ft->Children[i], new
OpPPMT, nResultSize));
break;
case ocFisher:
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ef519d4..24a5e40 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1756,7 +1756,7 @@ void ScInterpreter::ScIpmt()
}
}
-void ScInterpreter::ScKapz()
+void ScInterpreter::ScPpmt()
{
double nInterest, nZr, nZzr, nBw, nZw = 0, nFlag = 0;
nFuncFmtType = NUMBERFORMAT_CURRENCY;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index bf94a47..48b128e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4045,7 +4045,7 @@ StackVar ScInterpreter::Interpret()
case ocErf_MS : ScErf(); break;
case ocErfc_MS : ScErfc(); break;
case ocIpmt : ScIpmt(); break;
- case ocKapz : ScKapz(); break;
+ case ocPpmt : ScPpmt(); break;
case ocKumZinsZ : ScKumZinsZ(); break;
case ocKumKapZ : ScKumKapZ(); break;
case ocEffektiv : ScEffektiv(); break;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index dace254..e8bfe41 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1173,7 +1173,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocRMZ:
case ocRate:
case ocZGZ:
- case ocKapz:
+ case ocPpmt:
case ocFisher:
case ocFisherInv:
case ocGamma:
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index d822692..9ea536c 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -198,7 +198,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocMatInv, 164, 1, 1, A, { VA }, 0, 0 },
{ ocMatMult, 165, 2, 2, A, { VA }, 0, 0 },
{ ocIpmt, 167, 4, 6, V, { VR }, 0, 0 },
- { ocKapz, 168, 4, 6, V, { VR }, 0, 0 },
+ { ocPpmt, 168, 4, 6, V, { VR }, 0, 0 },
{ ocCount2, 169, 0, MX, V, { RX }, 0, 0 },
{ ocProduct, 183, 0, MX, V, { RX }, 0, 0 },
{ ocFact, 184, 1, 1, V, { VR }, 0, 0 },
diff --git a/sc/source/filter/qpro/qproform.cxx
b/sc/source/filter/qpro/qproform.cxx
index d38b704..32c2dc2 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -504,7 +504,7 @@ static const struct
{ ocZZR, FT_FuncFix5 },
{ ocRate, FT_FuncFix5 },
{ ocIpmt, FT_FuncFix4 },
- { ocKapz, FT_FuncFix6 },
+ { ocPpmt, FT_FuncFix6 },
{ ocSumProduct, FT_FuncFix2 },
{ ocNoName, FT_NotImpl },
{ ocNoName, FT_NotImpl },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 6fd6d2f..beff92d 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1517,7 +1517,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function KAPZ #*=-
- Resource SC_OPCODE_KAPZ
+ Resource SC_OPCODE_PPMT
{
String 1 // Description
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
