[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Fri Jan 9 04:46:52 PST 2015
formula/source/core/api/FormulaCompiler.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/tool/interpr2.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit ee6c4df8d695384abefa57c27180cbe873046bd8
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Thu Jan 8 10:27:31 2015 +0100
fdo#85818: rename KumZinsZ to CumIpmt
Rename OcKumZinsZ to ocCumIpmt, SC_OPCODE_KUM_ZINS_Z to SC_OPCODE_IPMT,
ScInterpreter::ScKumZinsZ() to ScInterpreter::ScCumIpmt().
Change-Id: I7a062374fa0dad375c9277ca7e1c23f6d6855013
Reviewed-on: https://gerrit.libreoffice.org/13816
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2649e34..5225742 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -102,7 +102,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocZW:
case ocIpmt:
case ocPpmt:
- case ocKumZinsZ:
+ case ocCumIpmt:
case ocKumKapZ:
return NUMBERFORMAT_CURRENCY;
case ocRate:
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 1e540a2..a8d2a48 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -230,7 +230,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
- String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
+ String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECT" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
@@ -637,7 +637,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
- String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
+ String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
@@ -1046,7 +1046,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_RATE { Text = "RATE" ; };
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
- String SC_OPCODE_KUM_ZINS_Z { Text = "CUMIPMT" ; };
+ String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
@@ -2003,7 +2003,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "PPMT" ;
};
- String SC_OPCODE_KUM_ZINS_Z
+ String SC_OPCODE_CUM_IPMT
{
Text [ en-US ] = "CUMIPMT" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index c760755..7be2dba 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -259,7 +259,7 @@
#define SC_OPCODE_RATE 259
#define SC_OPCODE_IPMT 260
#define SC_OPCODE_PPMT 261
-#define SC_OPCODE_KUM_ZINS_Z 262
+#define SC_OPCODE_CUM_IPMT 262
#define SC_OPCODE_KUM_KAP_Z 263
#define SC_OPCODE_EFFEKTIV 264
#define SC_OPCODE_NOMINAL 265
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index bd64dd5..2196fd8 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -263,7 +263,7 @@ enum OpCode : sal_uInt16
ocRate = SC_OPCODE_RATE,
ocIpmt = SC_OPCODE_IPMT,
ocPpmt = SC_OPCODE_PPMT,
- ocKumZinsZ = SC_OPCODE_KUM_ZINS_Z,
+ ocCumIpmt = SC_OPCODE_CUM_IPMT,
ocKumKapZ = SC_OPCODE_KUM_KAP_Z,
ocEffektiv = SC_OPCODE_EFFEKTIV,
ocNominal = SC_OPCODE_NOMINAL,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index b9513a3..1365229 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -686,7 +686,7 @@ double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw,
double fZw, double fF, double& fRmz);
void ScIpmt();
void ScPpmt();
-void ScKumZinsZ();
+void ScCumIpmt();
void ScKumKapZ();
void ScEffektiv();
void ScNominal();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 24a5e40..8cfb77e 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1781,7 +1781,7 @@ void ScInterpreter::ScPpmt()
}
}
-void ScInterpreter::ScKumZinsZ()
+void ScInterpreter::ScCumIpmt()
{
nFuncFmtType = NUMBERFORMAT_CURRENCY;
if ( MustHaveParamCount( GetByte(), 6 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 48b128e..9a2a287 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4046,7 +4046,7 @@ StackVar ScInterpreter::Interpret()
case ocErfc_MS : ScErfc(); break;
case ocIpmt : ScIpmt(); break;
case ocPpmt : ScPpmt(); break;
- case ocKumZinsZ : ScKumZinsZ(); break;
+ case ocCumIpmt : ScCumIpmt(); break;
case ocKumKapZ : ScKumKapZ(); break;
case ocEffektiv : ScEffektiv(); break;
case ocNominal : ScNominal(); break;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 9ea536c..87182a7 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -335,7 +335,7 @@ static const XclFunctionInfo saFuncTable_4[] =
{ ocLCM, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getLcm" ) },
{ ocEffektiv, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getEffect" ) },
{ ocKumKapZ, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumprinc" ) },
- { ocKumZinsZ, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumipmt" ) },
+ { ocCumIpmt, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumipmt" ) },
{ ocNominal, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getNominal" ) }
};
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index beff92d..2669365 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1645,7 +1645,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function KUMZINSZ #*=-
- Resource SC_OPCODE_KUM_ZINS_Z
+ Resource SC_OPCODE_CUM_IPMT
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list