[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Sun Jan 11 22:50:50 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 | 4 ++--
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 6dc1c9de5ddb5ab8789b691378bbcf7ee41cd988
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Fri Jan 9 05:41:25 2015 +0100
fdo#85818: rename KumKapZ to CumPrinc
Change-Id: I8e68a4a80418fe32e53123432257aec3c2fc28a4
Reviewed-on: https://gerrit.libreoffice.org/13822
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 5225742..c91a50a 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -103,7 +103,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocIpmt:
case ocPpmt:
case ocCumIpmt:
- case ocKumKapZ:
+ case ocCumPrinc:
return NUMBERFORMAT_CURRENCY;
case ocRate:
case ocIRR:
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index a8d2a48..e2a3ed5 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -231,7 +231,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
- String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
+ String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECT" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
@@ -638,7 +638,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
- String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
+ String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
@@ -1047,7 +1047,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_IPMT { Text = "IPMT" ; };
String SC_OPCODE_PPMT { Text = "PPMT" ; };
String SC_OPCODE_CUM_IPMT { Text = "CUMIPMT" ; };
- String SC_OPCODE_KUM_KAP_Z { Text = "CUMPRINC" ; };
+ String SC_OPCODE_CUM_PRINC { Text = "CUMPRINC" ; };
String SC_OPCODE_EFFEKTIV { Text = "EFFECTIVE" ; };
String SC_OPCODE_NOMINAL { Text = "NOMINAL" ; };
String SC_OPCODE_SUB_TOTAL { Text = "SUBTOTAL" ; };
@@ -2007,7 +2007,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "CUMIPMT" ;
};
- String SC_OPCODE_KUM_KAP_Z
+ String SC_OPCODE_CUM_PRINC
{
Text [ en-US ] = "CUMPRINC" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 7be2dba..d420fbd 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -260,7 +260,7 @@
#define SC_OPCODE_IPMT 260
#define SC_OPCODE_PPMT 261
#define SC_OPCODE_CUM_IPMT 262
-#define SC_OPCODE_KUM_KAP_Z 263
+#define SC_OPCODE_CUM_PRINC 263
#define SC_OPCODE_EFFEKTIV 264
#define SC_OPCODE_NOMINAL 265
#define SC_OPCODE_SUB_TOTAL 266
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 2196fd8..e6260ce 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -264,7 +264,7 @@ enum OpCode : sal_uInt16
ocIpmt = SC_OPCODE_IPMT,
ocPpmt = SC_OPCODE_PPMT,
ocCumIpmt = SC_OPCODE_CUM_IPMT,
- ocKumKapZ = SC_OPCODE_KUM_KAP_Z,
+ ocCumPrinc = SC_OPCODE_CUM_PRINC,
ocEffektiv = SC_OPCODE_EFFEKTIV,
ocNominal = SC_OPCODE_NOMINAL,
ocSubTotal = SC_OPCODE_SUB_TOTAL,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 1365229..60ef2a9 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -687,7 +687,7 @@ double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw,
void ScIpmt();
void ScPpmt();
void ScCumIpmt();
-void ScKumKapZ();
+void ScCumPrinc();
void ScEffektiv();
void ScNominal();
void ScMod();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 8cfb77e..83748ed 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1821,7 +1821,7 @@ void ScInterpreter::ScCumIpmt()
}
}
-void ScInterpreter::ScKumKapZ()
+void ScInterpreter::ScCumPrinc()
{
nFuncFmtType = NUMBERFORMAT_CURRENCY;
if ( MustHaveParamCount( GetByte(), 6 ) )
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 9a2a287..c882fc1 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4046,8 +4046,8 @@ StackVar ScInterpreter::Interpret()
case ocErfc_MS : ScErfc(); break;
case ocIpmt : ScIpmt(); break;
case ocPpmt : ScPpmt(); break;
- case ocCumIpmt : ScCumIpmt(); break;
- case ocKumKapZ : ScKumKapZ(); break;
+ case ocCumIpmt : ScCumIpmt(); break;
+ case ocCumPrinc : ScCumPrinc(); break;
case ocEffektiv : ScEffektiv(); break;
case ocNominal : ScNominal(); break;
case ocSubTotal : ScSubTotal(); break;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 87182a7..90e8de3 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -334,7 +334,7 @@ static const XclFunctionInfo saFuncTable_4[] =
{ ocGCD, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getGcd" ) },
{ 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" ) },
+ { ocCumPrinc, 255, 1, MX, R, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY | EXC_FUNCFLAG_ADDINEQUIV, EXC_FUNCNAME_ADDIN( "Analysis.getCumprinc" ) },
{ 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 2669365..a51cdd9 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -1580,8 +1580,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 KUMKAPITAL #*=-
- Resource SC_OPCODE_KUM_KAP_Z
+ // -=*# Resource for function CUMPRINC #*=-
+ Resource SC_OPCODE_CUM_PRINC
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list