[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 b08f87b62db81b498ea71e5e1049b96e3dc42da4
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 14:07:30 2015 +0100
fdo#85818: rename ZW to FV
Change-Id: I464cba72153ef70bbb14bf43a448a28d02095728
Reviewed-on: https://gerrit.libreoffice.org/13868
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index d1ef9a9..55a1063 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -99,7 +99,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocVBD:
case ocSLN:
case ocPMT:
-case ocZW:
+case ocFV:
case ocIpmt:
case ocPpmt:
case ocCumIpmt:
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 82cdcf2..0ae7059 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1260,7 +1260,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
case ocPpmt:
return AddDefaultArg( pNewArr, 4, 0.0 );
case ocPV:
-case ocZW: // FV
+case ocFV:
bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
break;
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 8a90a9c..ecdccb5 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -226,7 +226,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = SHEET ; };
String SC_OPCODE_RRI { Text = RRI ; };
-String SC_OPCODE_ZW { Text = FV ; };
+String SC_OPCODE_FV { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_IPMT { Text = IPMT ; };
@@ -634,7 +634,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = _xlfn.SHEET ; };
String SC_OPCODE_RRI { Text = _xlfn.RRI ; };
-String SC_OPCODE_ZW { Text = FV ; };
+String SC_OPCODE_FV { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_IPMT { Text = IPMT ; };
@@ -1044,7 +1044,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = SHEET ; };
String SC_OPCODE_RRI { Text = ZGZ ; };
-String SC_OPCODE_ZW { Text = FV ; };
+String SC_OPCODE_FV { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_IPMT { Text = IPMT ; };
@@ -1990,7 +1990,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = RRI ;
};
-String SC_OPCODE_ZW
+String SC_OPCODE_FV
{
Text [ en-US ] = FV ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 1d6b901..709fc1f 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -255,7 +255,7 @@
#define SC_OPCODE_COLUMN254
#define SC_OPCODE_ROW 255
#define SC_OPCODE_RRI 256
-#define SC_OPCODE_ZW257
+#define SC_OPCODE_FV257
#define SC_OPCODE_ZZR 258
#define SC_OPCODE_RATE 259
#define SC_OPCODE_IPMT 260
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 33cf54c..596d686 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -259,7 +259,7 @@ enum OpCode : sal_uInt16
ocColumn= SC_OPCODE_COLUMN,
ocRow = SC_OPCODE_ROW,
ocRRI
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 |6 +++---
sc/source/filter/qpro/qproform.cxx |2 +-
sc/source/ui/src/scfuncs.src |4 ++--
12 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 7d7a16b9d3f9e45cb147e79d192ff9a20e59f0fe
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 14:38:54 2015 +0100
fdo#85818: translate ZZR to Nper
Change-Id: Ib118d92a026526483da87dfe04871de25caa8ac1
Reviewed-on: https://gerrit.libreoffice.org/13869
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index ecdccb5..2f79b48 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -227,7 +227,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_TABLE { Text = SHEET ; };
String SC_OPCODE_RRI { Text = RRI ; };
String SC_OPCODE_FV { Text = FV ; };
-String SC_OPCODE_ZZR { Text = NPER ; };
+String SC_OPCODE_NPER { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_IPMT { Text = IPMT ; };
String SC_OPCODE_PPMT { Text = PPMT ; };
@@ -635,7 +635,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_TABLE { Text = _xlfn.SHEET ; };
String SC_OPCODE_RRI { Text = _xlfn.RRI ; };
String SC_OPCODE_FV { Text = FV ; };
-String SC_OPCODE_ZZR { Text = NPER ; };
+String SC_OPCODE_NPER { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_IPMT { Text = IPMT ; };
String SC_OPCODE_PPMT { Text = PPMT ; };
@@ -1045,7 +1045,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_TABLE { Text = SHEET ; };
String SC_OPCODE_RRI { Text = ZGZ ; };
String SC_OPCODE_FV { Text = FV ; };
-String SC_OPCODE_ZZR { Text = NPER ; };
+String SC_OPCODE_NPER { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_IPMT { Text = IPMT ; };
String SC_OPCODE_PPMT { Text = PPMT ; };
@@ -1994,7 +1994,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = FV ;
};
-String SC_OPCODE_ZZR
+String SC_OPCODE_NPER
{
Text [ en-US ] = NPER ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 709fc1f..e645fcb 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -256,7 +256,7 @@
#define SC_OPCODE_ROW 255
#define SC_OPCODE_RRI 256
#define SC_OPCODE_FV257
-#define SC_OPCODE_ZZR 258
+#define SC_OPCODE_NPER 258
#define SC_OPCODE_RATE 259
#define SC_OPCODE_IPMT 260
#define SC_OPCODE_PPMT 261
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 596d686..57aa6a1 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -260,7 +260,7 @@ enum OpCode : sal_uInt16
ocRow = SC_OPCODE_ROW,
ocRRI = SC_OPCODE_RRI,
ocFV= SC_OPCODE_FV,
-ocZZR = SC_OPCODE_ZZR,
+ocNper = SC_OPCODE_NPER,
ocRate = SC_OPCODE_RATE,
ocIpmt = SC_OPCODE_IPMT,
ocPpmt = SC_OPCODE_PPMT,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3ae3fb6..6c7cd09 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -680,7 +680,7 @@ void ScRRI();
double ScGetZw(double fZins, double fZzr, double fRmz,
double fBw, double fF);
void ScFV();
-void ScZZR();
+void ScNper();
bool RateIteration(double fNper, double fPayment, double fPv,
double fFv, double fPayType, double fGuess);
void ScRate();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 22a5986..94b0b28 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2722,7 +2722,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft-Children[i], new OpKurt, nResultSize));
break;
-
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |8
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit ed20e81a886a13125a551ce24b6f9408d61e8e61
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 13 10:54:02 2015 +0100
fd0#85818: rename SC_OPCODE_NBW to SC_OPCODE_NPV
Change-Id: I1f7b51094acf0baf79160f65fdec67c9934930aa
Reviewed-on: https://gerrit.libreoffice.org/13897
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 062b432..1e9c312 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -182,7 +182,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_AVERAGE_A { Text = AVERAGEA ; };
String SC_OPCODE_COUNT { Text = COUNT ; };
String SC_OPCODE_COUNT_2 { Text = COUNTA ; };
-String SC_OPCODE_NBW { Text = NPV ; };
+String SC_OPCODE_NPV { Text = NPV ; };
String SC_OPCODE_IRR { Text = IRR ; };
String SC_OPCODE_MIRR { Text = MIRR ; };
String SC_OPCODE_ISPMT { Text = ISPMT ; };
@@ -590,7 +590,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_AVERAGE_A { Text = AVERAGEA ; };
String SC_OPCODE_COUNT { Text = COUNT ; };
String SC_OPCODE_COUNT_2 { Text = COUNTA ; };
-String SC_OPCODE_NBW { Text = NPV ; };
+String SC_OPCODE_NPV { Text = NPV ; };
String SC_OPCODE_IRR { Text = IRR ; };
String SC_OPCODE_MIRR { Text = MIRR ; };
String SC_OPCODE_ISPMT { Text = ISPMT ; };
@@ -1000,7 +1000,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_AVERAGE_A { Text = AVERAGEA ; };
String SC_OPCODE_COUNT { Text = COUNT ; };
String SC_OPCODE_COUNT_2 { Text = COUNTA ; };
-String SC_OPCODE_NBW { Text = NPV ; };
+String SC_OPCODE_NPV { Text = NPV ; };
String SC_OPCODE_IRR { Text = IRR ; };
String SC_OPCODE_MIRR { Text = MIRR ; };
String SC_OPCODE_ISPMT { Text = ISPMT ; };
@@ -1814,7 +1814,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = COUNTA ;
};
-String SC_OPCODE_NBW
+String SC_OPCODE_NPV
{
Text [ en-US ] = NPV ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 7cd6653..2d2dd36 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -227,7 +227,7 @@
#define SC_OPCODE_AVERAGE 226
#define SC_OPCODE_COUNT 227
#define SC_OPCODE_COUNT_2 228
-#define SC_OPCODE_NBW 229
+#define SC_OPCODE_NPV 229
#define SC_OPCODE_IRR 230
#define SC_OPCODE_VAR 231
#define SC_OPCODE_VAR_P 232
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 43f2467..a282dae 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -220,7 +220,7 @@ enum OpCode : sal_uInt16
ocAverage = SC_OPCODE_AVERAGE,
ocCount = SC_OPCODE_COUNT,
ocCount2= SC_OPCODE_COUNT_2,
-ocNPV = SC_OPCODE_NBW,
+ocNPV = SC_OPCODE_NPV,
ocIRR = SC_OPCODE_IRR,
ocMIRR = SC_OPCODE_MIRR,
ocISPMT = SC_OPCODE_ISPMT,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index b0c2182..2e5e960 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2045,7 +2045,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function NPV #*=-
-Resource SC_OPCODE_NBW
+Resource SC_OPCODE_NPV
{
String 1 // Description
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx |2 +-
sc/source/core/tool/interpr3.cxx |2 +-
sc/source/core/tool/interpr4.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e867843e76e1a8ce1a0fa85b122485a241dc2baf
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 13 10:58:28 2015 +0100
sc: rename ScSTEXY to ScSTEYX
The actual Calc function is STEYX.
Change-Id: I7c778a3b00e54aa97b61c00e2e7c40c2db48a08b
Reviewed-on: https://gerrit.libreoffice.org/13898
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 07e1cce..7f8d134 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -841,7 +841,7 @@ void ScCovarianceP();
void ScCovarianceS();
void ScPearson();
void ScRSQ();
-void ScSTEXY();
+void ScSTEYX();
void ScSlope();
void ScTrend();
void ScInfo();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 2ab1428..67a5b12 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -4254,7 +4254,7 @@ void ScInterpreter::ScRSQ()
}
}
-void ScInterpreter::ScSTEXY()
+void ScInterpreter::ScSTEYX()
{
CalculatePearsonCovar( true, true, false );
}
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index acb1002..f695ea8 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4185,7 +4185,7 @@ StackVar ScInterpreter::Interpret()
case ocCovarianceS : ScCovarianceS(); break;
case ocPearson : ScPearson(); break;
case ocRSQ : ScRSQ(); break;
-case ocSTEYX: ScSTEXY();break;
+case ocSTEYX: ScSTEYX();break;
case ocSlope: ScSlope();break;
case ocIntercept: ScIntercept();break;
case ocTrend: ScTrend();break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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/interpr4.cxx |2 +-
sc/source/core/tool/interpr5.cxx |2 +-
sc/source/core/tool/parclass.cxx |2 +-
sc/source/filter/excel/xlformula.cxx |4 ++--
sc/source/ui/src/scfuncs.src |2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit e613c9fba449fda0db163de413eeda50f521db41
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 13 10:44:35 2015 +0100
fdo#85818: rename RGP to Linest
Change-Id: I4bdf934730a54a76f5762fd079dc6270fa135840
Reviewed-on: https://gerrit.libreoffice.org/13893
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index ebc5edd..0109587 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -849,7 +849,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode )
case ocGrowth :
case ocTrend :
case ocLogest :
-case ocRGP :
+case ocLinest :
case ocFrequency :
case ocMatTrans :
case ocMatMult :
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index c92..9d22494 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -360,7 +360,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_INTERCEPT { Text = INTERCEPT ; };
String SC_OPCODE_TREND { Text = TREND ; };
String SC_OPCODE_GROWTH { Text = GROWTH ; };
-String SC_OPCODE_RGP { Text = LINEST ; };
+String SC_OPCODE_LINEST { Text = LINEST ; };
String SC_OPCODE_LOGEST { Text = LOGEST ; };
String SC_OPCODE_FORECAST { Text = FORECAST ; };
String SC_OPCODE_CHI_INV { Text = LEGACY.CHIINV ; };
@@ -768,7 +768,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_INTERCEPT { Text = INTERCEPT ; };
String SC_OPCODE_TREND { Text = TREND ; };
String SC_OPCODE_GROWTH { Text = GROWTH ; };
-String SC_OPCODE_RGP { Text = LINEST ; };
+String SC_OPCODE_LINEST { Text = LINEST ; };
String SC_OPCODE_LOGEST { Text = LOGEST ; };
String SC_OPCODE_FORECAST { Text = FORECAST ; };
String SC_OPCODE_CHI_INV { Text = CHIINV ; };
@@ -1178,7 +1178,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_INTERCEPT { Text = INTERCEPT ; };
String SC_OPCODE_TREND { Text = TREND ; };
String SC_OPCODE_GROWTH { Text = GROWTH ; };
-String SC_OPCODE_RGP { Text = LINEST ; };
+String SC_OPCODE_LINEST { Text = LINEST ; };
String SC_OPCODE_LOGEST { Text = LOGEST ; };
String SC_OPCODE_FORECAST { Text = FORECAST ; };
String SC_OPCODE_CHI_INV { Text = CHIINV ; };
@@ -2527,7 +2527,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = GROWTH ;
};
-String SC_OPCODE_RGP
+String SC_OPCODE_LINEST
{
Text [ en-US ] = LINEST ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index b09b756..6ace741 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -350,7 +350,7 @@
#define SC_OPCODE_INTERCEPT 349
#define SC_OPCODE_TREND 350
#define SC_OPCODE_GROWTH351
-#define SC_OPCODE_RGP 352
+#define SC_OPCODE_LINEST352
#define SC_OPCODE_LOGEST353
#define SC_OPCODE_FORECAST 354
#define SC_OPCODE_CHI_INV 355
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 94756b4d..039 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -405,7 +405,7 @@ enum OpCode : sal_uInt16
ocIntercept = SC_OPCODE_INTERCEPT,
ocTrend = SC_OPCODE_TREND,
ocGrowth= SC_OPCODE_GROWTH,
-ocRGP = SC_OPCODE_RGP,
+ocLinest= SC_OPCODE_LINEST,
ocLogest= SC_OPCODE_LOGEST,
ocForecast = SC_OPCODE_FORECAST,
ocChiInv= SC_OPCODE_CHI_INV,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 222e7b9c..07e1cce 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -730,7 +730,7 @@ void CalculateRGPRKP(bool _bRKP);
void CalculateSumX2MY2SumX2DY2(bool _bSumX2DY2);
void CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE nR);
bool CheckMatrix(bool _bLOG,sal_uInt8 nCase,SCSIZE nCX,SCSIZE nCY,SCSIZE
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |8
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 3fe6a6b3ca3bc0c7d46fabf66f11f1ef6b4cd4cc
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 13 10:46:38 2015 +0100
fdo#85818: rename SC_OPCODE_KGV to SC_OPCODE_LCM
Change-Id: I4a49a00a8cc74c7ff0752ef0bffbf855fecb232c
Reviewed-on: https://gerrit.libreoffice.org/13894
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 9d22494..2a548b3 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -160,7 +160,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_LOG { Text = LOG ; };
String SC_OPCODE_POWER { Text = POWER ; };
String SC_OPCODE_GGT { Text = GCD ; };
-String SC_OPCODE_KGV { Text = LCM ; };
+String SC_OPCODE_LCM { Text = LCM ; };
String SC_OPCODE_MOD { Text = MOD ; };
String SC_OPCODE_SUM_PRODUCT { Text = SUMPRODUCT ; };
String SC_OPCODE_SUM_SQ { Text = SUMSQ ; };
@@ -568,7 +568,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_LOG { Text = LOG ; };
String SC_OPCODE_POWER { Text = POWER ; };
String SC_OPCODE_GGT { Text = GCD ; };
-String SC_OPCODE_KGV { Text = LCM ; };
+String SC_OPCODE_LCM { Text = LCM ; };
String SC_OPCODE_MOD { Text = MOD ; };
String SC_OPCODE_SUM_PRODUCT { Text = SUMPRODUCT ; };
String SC_OPCODE_SUM_SQ { Text = SUMSQ ; };
@@ -978,7 +978,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_LOG { Text = LOG ; };
String SC_OPCODE_POWER { Text = POWER ; };
String SC_OPCODE_GGT { Text = GCD ; };
-String SC_OPCODE_KGV { Text = LCM ; };
+String SC_OPCODE_LCM { Text = LCM ; };
String SC_OPCODE_MOD { Text = MOD ; };
String SC_OPCODE_SUM_PRODUCT { Text = SUMPRODUCT ; };
String SC_OPCODE_SUM_SQ { Text = SUMSQ ; };
@@ -1726,7 +1726,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = GCD ;
};
-String SC_OPCODE_KGV
+String SC_OPCODE_LCM
{
Text [ en-US ] = LCM ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 6ace741..c69f4fa 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -209,7 +209,7 @@
#define SC_OPCODE_LOG 208
#define SC_OPCODE_POWER 209
#define SC_OPCODE_GGT 210
-#define SC_OPCODE_KGV 211
+#define SC_OPCODE_LCM 211
#define SC_OPCODE_MOD 212
#define SC_OPCODE_SUM_PRODUCT 213
#define SC_OPCODE_SUM_SQ214
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 039..9b7867e 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -201,7 +201,7 @@ enum OpCode : sal_uInt16
ocLog = SC_OPCODE_LOG,
ocPower = SC_OPCODE_POWER,
ocGCD = SC_OPCODE_GGT,
-ocLCM = SC_OPCODE_KGV,
+ocLCM = SC_OPCODE_LCM,
ocMod = SC_OPCODE_MOD,
ocSumProduct= SC_OPCODE_SUM_PRODUCT,
ocSumSQ = SC_OPCODE_SUM_SQ,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 64c4780..8c041d5 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -4660,7 +4660,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function LCM #*=-
-Resource SC_OPCODE_KGV
+Resource SC_OPCODE_LCM
{
String 1 // Description
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |8
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f7f8d82a25b0c55bcd2225ca0cac1d93c676f544
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 13 10:50:24 2015 +0100
fdo#85818: rename SC_OPCODE_GGT to SC_OPCODE_GCD
Change-Id: I65a79d4e88f82cb76d9b6ab39f06a11acd4f3e41
Reviewed-on: https://gerrit.libreoffice.org/13895
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 2a548b3..93d08f2 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -159,7 +159,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_TRUNC { Text = TRUNC ; };
String SC_OPCODE_LOG { Text = LOG ; };
String SC_OPCODE_POWER { Text = POWER ; };
-String SC_OPCODE_GGT { Text = GCD ; };
+String SC_OPCODE_GCD { Text = GCD ; };
String SC_OPCODE_LCM { Text = LCM ; };
String SC_OPCODE_MOD { Text = MOD ; };
String SC_OPCODE_SUM_PRODUCT { Text = SUMPRODUCT ; };
@@ -567,7 +567,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_TRUNC { Text = TRUNC ; };
String SC_OPCODE_LOG { Text = LOG ; };
String SC_OPCODE_POWER { Text = POWER ; };
-String SC_OPCODE_GGT { Text = GCD ; };
+String SC_OPCODE_GCD { Text = GCD ; };
String SC_OPCODE_LCM { Text = LCM ; };
String SC_OPCODE_MOD { Text = MOD ; };
String SC_OPCODE_SUM_PRODUCT { Text = SUMPRODUCT ; };
@@ -977,7 +977,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_TRUNC { Text = TRUNC ; };
String SC_OPCODE_LOG { Text = LOG ; };
String SC_OPCODE_POWER { Text = POWER ; };
-String SC_OPCODE_GGT { Text = GCD ; };
+String SC_OPCODE_GCD { Text = GCD ; };
String SC_OPCODE_LCM { Text = LCM ; };
String SC_OPCODE_MOD { Text = MOD ; };
String SC_OPCODE_SUM_PRODUCT { Text = SUMPRODUCT ; };
@@ -1722,7 +1722,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = POWER ;
};
-String SC_OPCODE_GGT
+String SC_OPCODE_GCD
{
Text [ en-US ] = GCD ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index c69f4fa..fc47ae8 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -208,7 +208,7 @@
#define SC_OPCODE_TRUNC 207
#define SC_OPCODE_LOG 208
#define SC_OPCODE_POWER 209
-#define SC_OPCODE_GGT 210
+#define SC_OPCODE_GCD 210
#define SC_OPCODE_LCM 211
#define SC_OPCODE_MOD 212
#define SC_OPCODE_SUM_PRODUCT 213
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 9b7867e..724667f 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -200,7 +200,7 @@ enum OpCode : sal_uInt16
ocTrunc = SC_OPCODE_TRUNC,
ocLog = SC_OPCODE_LOG,
ocPower = SC_OPCODE_POWER,
-ocGCD = SC_OPCODE_GGT,
+ocGCD = SC_OPCODE_GCD,
ocLCM = SC_OPCODE_LCM,
ocMod = SC_OPCODE_MOD,
ocSumProduct= SC_OPCODE_SUM_PRODUCT,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 8c041d5..0c0b310 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -4636,7 +4636,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function GCD #*=-
-Resource SC_OPCODE_GGT
+Resource SC_OPCODE_GCD
{
String 1 // Description
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |8
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit ed6c797d07f6e7f1afdb272046f9a02b973f97de
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 13 10:52:23 2015 +0100
fdo#85818: rename SC_OPCODE_IKV to SC_OPCODE_IRR
Change-Id: I8148081e2f2d89bdd319b5dc7346af672a8cf310
Reviewed-on: https://gerrit.libreoffice.org/13896
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 93d08f2..062b432 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -183,7 +183,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_COUNT { Text = COUNT ; };
String SC_OPCODE_COUNT_2 { Text = COUNTA ; };
String SC_OPCODE_NBW { Text = NPV ; };
-String SC_OPCODE_IKV { Text = IRR ; };
+String SC_OPCODE_IRR { Text = IRR ; };
String SC_OPCODE_MIRR { Text = MIRR ; };
String SC_OPCODE_ISPMT { Text = ISPMT ; };
String SC_OPCODE_VAR { Text = VAR ; };
@@ -591,7 +591,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_COUNT { Text = COUNT ; };
String SC_OPCODE_COUNT_2 { Text = COUNTA ; };
String SC_OPCODE_NBW { Text = NPV ; };
-String SC_OPCODE_IKV { Text = IRR ; };
+String SC_OPCODE_IRR { Text = IRR ; };
String SC_OPCODE_MIRR { Text = MIRR ; };
String SC_OPCODE_ISPMT { Text = ISPMT ; };
String SC_OPCODE_VAR { Text = VAR ; };
@@ -1001,7 +1001,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_COUNT { Text = COUNT ; };
String SC_OPCODE_COUNT_2 { Text = COUNTA ; };
String SC_OPCODE_NBW { Text = NPV ; };
-String SC_OPCODE_IKV { Text = IRR ; };
+String SC_OPCODE_IRR { Text = IRR ; };
String SC_OPCODE_MIRR { Text = MIRR ; };
String SC_OPCODE_ISPMT { Text = ISPMT ; };
String SC_OPCODE_VAR { Text = VAR ; };
@@ -1818,7 +1818,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = NPV ;
};
-String SC_OPCODE_IKV
+String SC_OPCODE_IRR
{
Text [ en-US ] = IRR ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index fc47ae8..7cd6653 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -228,7 +228,7 @@
#define SC_OPCODE_COUNT 227
#define SC_OPCODE_COUNT_2 228
#define SC_OPCODE_NBW 229
-#define SC_OPCODE_IKV 230
+#define SC_OPCODE_IRR 230
#define SC_OPCODE_VAR 231
#define SC_OPCODE_VAR_P 232
#define SC_OPCODE_ST_DEV233
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 724667f..43f2467 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -221,7 +221,7 @@ enum OpCode : sal_uInt16
ocCount = SC_OPCODE_COUNT,
ocCount2= SC_OPCODE_COUNT_2,
ocNPV = SC_OPCODE_NBW,
-ocIRR = SC_OPCODE_IKV,
+ocIRR = SC_OPCODE_IRR,
ocMIRR = SC_OPCODE_MIRR,
ocISPMT = SC_OPCODE_ISPMT,
ocVar = SC_OPCODE_VAR,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 0c0b310..b0c2182 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2077,7 +2077,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function IRR #*=-
-Resource SC_OPCODE_IKV
+Resource SC_OPCODE_IRR
{
String 1 // Description
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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/interpr4.cxx |2 +-
sc/source/core/tool/interpr5.cxx |2 +-
sc/source/core/tool/parclass.cxx |2 +-
sc/source/filter/excel/xlformula.cxx |4 ++--
sc/source/ui/src/scfuncs.src |2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit be2e6ea58b0025d1bcf7a901c89532737efcbe09
Author: Laurent Charrière lcharri...@gmail.com
Date: Mon Jan 12 20:50:49 2015 +0100
fdo#85818: rename RKP to Logest
Change-Id: I35e4d80e3d7744c4c9c74b12856a603db8363dbc
Reviewed-on: https://gerrit.libreoffice.org/13892
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 3908378..ebc5edd 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -848,7 +848,7 @@ bool FormulaCompiler::IsMatrixFunction( OpCode eOpCode )
case ocDde :
case ocGrowth :
case ocTrend :
-case ocRKP :
+case ocLogest :
case ocRGP :
case ocFrequency :
case ocMatTrans :
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 88b6e28..c92 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -361,7 +361,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_TREND { Text = TREND ; };
String SC_OPCODE_GROWTH { Text = GROWTH ; };
String SC_OPCODE_RGP { Text = LINEST ; };
-String SC_OPCODE_RKP { Text = LOGEST ; };
+String SC_OPCODE_LOGEST { Text = LOGEST ; };
String SC_OPCODE_FORECAST { Text = FORECAST ; };
String SC_OPCODE_CHI_INV { Text = LEGACY.CHIINV ; };
String SC_OPCODE_CHI_INV_MS { Text = COM.MICROSOFT.CHISQ.INV.RT ; };
@@ -769,7 +769,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_TREND { Text = TREND ; };
String SC_OPCODE_GROWTH { Text = GROWTH ; };
String SC_OPCODE_RGP { Text = LINEST ; };
-String SC_OPCODE_RKP { Text = LOGEST ; };
+String SC_OPCODE_LOGEST { Text = LOGEST ; };
String SC_OPCODE_FORECAST { Text = FORECAST ; };
String SC_OPCODE_CHI_INV { Text = CHIINV ; };
String SC_OPCODE_CHI_INV_MS { Text = _xlfn.CHISQ.INV.RT ; };
@@ -1179,7 +1179,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_TREND { Text = TREND ; };
String SC_OPCODE_GROWTH { Text = GROWTH ; };
String SC_OPCODE_RGP { Text = LINEST ; };
-String SC_OPCODE_RKP { Text = LOGEST ; };
+String SC_OPCODE_LOGEST { Text = LOGEST ; };
String SC_OPCODE_FORECAST { Text = FORECAST ; };
String SC_OPCODE_CHI_INV { Text = CHIINV ; };
String SC_OPCODE_CHI_INV_MS { Text = CHISQ.INV.RT ; };
@@ -2531,7 +2531,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = LINEST ;
};
-String SC_OPCODE_RKP
+String SC_OPCODE_LOGEST
{
Text [ en-US ] = LOGEST ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 61ec34c..b09b756 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -351,7 +351,7 @@
#define SC_OPCODE_TREND 350
#define SC_OPCODE_GROWTH351
#define SC_OPCODE_RGP 352
-#define SC_OPCODE_RKP 353
+#define SC_OPCODE_LOGEST353
#define SC_OPCODE_FORECAST 354
#define SC_OPCODE_CHI_INV 355
#define SC_OPCODE_GAMMA_DIST356
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index c6b0a0a..94756b4d 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -406,7 +406,7 @@ enum OpCode : sal_uInt16
ocTrend = SC_OPCODE_TREND,
ocGrowth= SC_OPCODE_GROWTH,
ocRGP = SC_OPCODE_RGP,
-ocRKP = SC_OPCODE_RKP,
+ocLogest= SC_OPCODE_LOGEST,
ocForecast = SC_OPCODE_FORECAST,
ocChiInv= SC_OPCODE_CHI_INV,
ocChiInv_MS = SC_OPCODE_CHI_INV_MS,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 1a59d10..222e7b9c 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -731,7 +731,7 @@ void CalculateSumX2MY2SumX2DY2(bool _bSumX2DY2);
void CalculateMatrixValue(const ScMatrix* pMat,SCSIZE nC,SCSIZE nR);
bool CheckMatrix(bool _bLOG,sal_uInt8 nCase,SCSIZE nCX,SCSIZE nCY,SCSIZE
nRX,SCSIZE nRY,SCSIZE
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |8
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
sc/source/core/opencl/formulagroupcl.cxx |2 +-
sc/source/core/tool/interpr4.cxx |2 +-
sc/source/core/tool/parclass.cxx |2 +-
sc/source/core/tool/token.cxx |2 +-
sc/source/filter/excel/xlformula.cxx |2 +-
sc/source/filter/lotus/lotform.cxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit d6be636b19aea636ea5ba1007fd27eee61fb0dab
Author: Laurent Charrière lcharri...@gmail.com
Date: Mon Jan 12 20:23:29 2015 +0100
fdo#85818: rename Schiefe to Skew
Change-Id: Ie8da01e3062e380070672406e1dcd9227bf75f95
Reviewed-on: https://gerrit.libreoffice.org/13891
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index e11ec36..88b6e28 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -313,7 +313,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_GEO_MEAN { Text = GEOMEAN ; };
String SC_OPCODE_STANDARD { Text = STANDARDIZE ; };
String SC_OPCODE_AVE_DEV { Text = AVEDEV ; };
-String SC_OPCODE_SCHIEFE { Text = SKEW ; };
+String SC_OPCODE_SKEW { Text = SKEW ; };
String SC_OPCODE_SKEWP { Text = SKEWP ; };
String SC_OPCODE_DEV_SQ { Text = DEVSQ ; };
String SC_OPCODE_MEDIAN { Text = MEDIAN ; };
@@ -721,7 +721,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_GEO_MEAN { Text = GEOMEAN ; };
String SC_OPCODE_STANDARD { Text = STANDARDIZE ; };
String SC_OPCODE_AVE_DEV { Text = AVEDEV ; };
-String SC_OPCODE_SCHIEFE { Text = SKEW ; };
+String SC_OPCODE_SKEW { Text = SKEW ; };
String SC_OPCODE_SKEWP { Text = _xlfn.SKEW.P ; };
String SC_OPCODE_DEV_SQ { Text = DEVSQ ; };
String SC_OPCODE_MEDIAN { Text = MEDIAN ; };
@@ -1131,7 +1131,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_GEO_MEAN { Text = GEOMEAN ; };
String SC_OPCODE_STANDARD { Text = STANDARDIZE ; };
String SC_OPCODE_AVE_DEV { Text = AVEDEV ; };
-String SC_OPCODE_SCHIEFE { Text = SKEW ; };
+String SC_OPCODE_SKEW { Text = SKEW ; };
String SC_OPCODE_SKEWP { Text = SKEWP ; };
String SC_OPCODE_DEV_SQ { Text = DEVSQ ; };
String SC_OPCODE_MEDIAN { Text = MEDIAN ; };
@@ -2339,7 +2339,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = AVEDEV ;
};
-String SC_OPCODE_SCHIEFE
+String SC_OPCODE_SKEW
{
Text [ en-US ] = SKEW ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index a7618f6..61ec34c 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -323,7 +323,7 @@
#define SC_OPCODE_GEO_MEAN 322
#define SC_OPCODE_STANDARD 323
#define SC_OPCODE_AVE_DEV 324
-#define SC_OPCODE_SCHIEFE 325
+#define SC_OPCODE_SKEW 325
#define SC_OPCODE_DEV_SQ326
#define SC_OPCODE_MEDIAN327
#define SC_OPCODE_MODAL_VALUE 328
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 454242d..c6b0a0a 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -358,7 +358,7 @@ enum OpCode : sal_uInt16
ocGeoMean = SC_OPCODE_GEO_MEAN,
ocStandard = SC_OPCODE_STANDARD,
ocAveDev= SC_OPCODE_AVE_DEV,
-ocSchiefe = SC_OPCODE_SCHIEFE,
+ocSkew = SC_OPCODE_SKEW,
ocSkewp = SC_OPCODE_SKEWP,
ocDevSq = SC_OPCODE_DEV_SQ,
ocMedian= SC_OPCODE_MEDIAN,
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index dd844bd..06d3417 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2951,7 +2951,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft-Children[i], new OpTrunc, nResultSize));
break;
-case ocSchiefe:
+case ocSkew:
mvSubArguments.push_back(SoPHelper(ts,
ft-Children[i], new OpSkew, nResultSize));
break;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c2afa5b..d2fa09a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4133,7 +4133,7 @@ StackVar ScInterpreter::Interpret()
case ocAveDev : ScAveDev();
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/api/FormulaCompiler.cxx| 10 +-
formula/source/core/api/token.cxx | 14 +++---
formula/source/core/resource/core_resource.src |8
include/formula/FormulaCompiler.hxx|2 +-
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
include/formula/tokenarray.hxx |2 +-
sc/source/core/inc/interpre.hxx|2 +-
sc/source/core/tool/interpr1.cxx |2 +-
sc/source/core/tool/interpr4.cxx |6 +++---
sc/source/core/tool/parclass.cxx |4 ++--
sc/source/core/tool/token.cxx |4 ++--
sc/source/filter/excel/xeformula.cxx |6 +++---
sc/source/filter/excel/xlformula.cxx |2 +-
sc/source/filter/lotus/lotform.cxx |6 +++---
sc/source/filter/qpro/qproform.cxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
sc/source/ui/unoobj/tokenuno.cxx |2 +-
18 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 1f56cbf8cc15f76131d1dc8801935bec92be05ea
Author: Laurent Charrière lcharri...@gmail.com
Date: Mon Jan 12 19:56:39 2015 +0100
sc: rename ocChose et al. to ocChoose et al.
Change-Id: I1aa8ee6c827a6d6a6c6beb190bdc9c3c91d82b22
Reviewed-on: https://gerrit.libreoffice.org/13889
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 55a1063..3908378 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -465,7 +465,7 @@ uno::Sequence sheet::FormulaOpCodeMapEntry
FormulaCompiler::OpCodeMap::create
SC_OPCODE_IF,
SC_OPCODE_IF_ERROR,
SC_OPCODE_IF_NA,
-SC_OPCODE_CHOSE,
+SC_OPCODE_CHOOSE,
SC_OPCODE_AND,
SC_OPCODE_OR,
SC_OPCODE_NOT,
@@ -814,7 +814,7 @@ bool FormulaCompiler::IsOpCodeJumpCommand( OpCode eOp )
case ocIf:
case ocIfError:
case ocIfNA:
-case ocChose:
+case ocChoose:
return true;
default:
;
@@ -1318,7 +1318,7 @@ void FormulaCompiler::Factor()
case ocIf:
pFacToken-GetJump()[ 0 ] = 3; // if, else, behind
break;
-case ocChose:
+case ocChoose:
pFacToken-GetJump()[ 0 ] = FORMULA_MAXJUMPCOUNT + 1;
break;
case ocIfError:
@@ -1348,7 +1348,7 @@ void FormulaCompiler::Factor()
case ocIf:
nJumpMax = 3;
break;
-case ocChose:
+case ocChoose:
nJumpMax = FORMULA_MAXJUMPCOUNT;
break;
case ocIfError:
@@ -1385,7 +1385,7 @@ void FormulaCompiler::Factor()
case ocIf:
bLimitOk = (nJumpCount = 3);
break;
-case ocChose:
+case ocChoose:
bLimitOk = (nJumpCount FORMULA_MAXJUMPCOUNT); /*
TODO: check, really , not =? */
break;
case ocIfError:
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 0ae7059..e033835 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -81,7 +81,7 @@ bool FormulaToken::IsFunction() const
eOp != ocColRowNameAuto eOp != ocName eOp != ocDBArea
(GetByte() != 0 //
x parameters
|| (SC_OPCODE_START_NO_PAR = eOp eOp SC_OPCODE_STOP_NO_PAR) //
no parameter
-|| (ocIf == eOp || ocIfError == eOp || ocIfNA == eOp || ocChose == eOp
) // @ jump commands
+|| (ocIf == eOp || ocIfError == eOp || ocIfNA == eOp || ocChoose ==
eOp ) // @ jump commands
|| (SC_OPCODE_START_1_PAR = eOp eOp SC_OPCODE_STOP_1_PAR) //
one parameter
|| (SC_OPCODE_START_2_PAR = eOp eOp SC_OPCODE_STOP_2_PAR) //
x parameters (cByte==0 in
//
FuncAutoPilot)
@@ -96,10 +96,10 @@ bool FormulaToken::IsFunction() const
sal_uInt8 FormulaToken::GetParamCount() const
{
if ( eOp SC_OPCODE_STOP_DIV eOp != ocExternal eOp != ocMacro
- eOp != ocIf eOp != ocIfError eOp != ocIfNA eOp != ocChose
+ eOp != ocIf eOp != ocIfError eOp != ocIfNA eOp != ocChoose
eOp != ocPercentSign )
return 0; // parameters and specials
-// ocIf, ocIfError, ocIfNA and ocChose not for FAP,
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |8
include/formula/compiler.hrc |2 +-
include/formula/opcode.hxx |2 +-
sc/source/core/opencl/formulagroupcl.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 |2 +-
sc/source/ui/src/scfuncs.src |2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 0302305dd47b679e889746459d32725bd06ea5b0
Author: Laurent Charrière lcharri...@gmail.com
Date: Mon Jan 12 20:19:06 2015 +0100
fdo#85818: rename KritBinom to CritBinom
Change-Id: I2fa011eea4263f005c3a22072a6144972e9f0bb7
Reviewed-on: https://gerrit.libreoffice.org/13890
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 3d28399..e11ec36 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -306,7 +306,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_WEIBULL_MS { Text = COM.MICROSOFT.WEIBULL.DIST ; };
String SC_OPCODE_NEG_BINOM_VERT { Text = NEGBINOMDIST ; };
String SC_OPCODE_NEG_BINOM_DIST_MS { Text = COM.MICROSOFT.NEGBINOM.DIST
; };
-String SC_OPCODE_KRIT_BINOM { Text = CRITBINOM ; };
+String SC_OPCODE_CRIT_BINOM { Text = CRITBINOM ; };
String SC_OPCODE_BINOM_INV { Text = COM.MICROSOFT.BINOM.INV ; };
String SC_OPCODE_KURT { Text = KURT ; };
String SC_OPCODE_HAR_MEAN { Text = HARMEAN ; };
@@ -714,7 +714,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_WEIBULL_MS { Text = _xlfn.WEIBULL.DIST ; };
String SC_OPCODE_NEG_BINOM_VERT { Text = NEGBINOMDIST ; };
String SC_OPCODE_NEG_BINOM_DIST_MS { Text = _xlfn.NEGBINOM.DIST ; };
-String SC_OPCODE_KRIT_BINOM { Text = CRITBINOM ; };
+String SC_OPCODE_CRIT_BINOM { Text = CRITBINOM ; };
String SC_OPCODE_BINOM_INV { Text = _xlfn.BINOM.INV ; };
String SC_OPCODE_KURT { Text = KURT ; };
String SC_OPCODE_HAR_MEAN { Text = HARMEAN ; };
@@ -1124,7 +1124,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_WEIBULL_MS { Text = WEIBULL.DIST ; };
String SC_OPCODE_NEG_BINOM_VERT { Text = NEGBINOMDIST ; };
String SC_OPCODE_NEG_BINOM_DIST_MS { Text = NEGBINOM.DIST ; };
-String SC_OPCODE_KRIT_BINOM { Text = CRITBINOM ; };
+String SC_OPCODE_CRIT_BINOM { Text = CRITBINOM ; };
String SC_OPCODE_BINOM_INV { Text = BINOM.INV ; };
String SC_OPCODE_KURT { Text = KURT ; };
String SC_OPCODE_HAR_MEAN { Text = HARMEAN ; };
@@ -2311,7 +2311,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = NEGBINOM.DIST ;
};
-String SC_OPCODE_KRIT_BINOM
+String SC_OPCODE_CRIT_BINOM
{
Text [ en-US ] = CRITBINOM ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index cc8b709..a7618f6 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -317,7 +317,7 @@
#define SC_OPCODE_CHI_DIST 316
#define SC_OPCODE_WEIBULL 317
#define SC_OPCODE_NEG_BINOM_VERT318
-#define SC_OPCODE_KRIT_BINOM319
+#define SC_OPCODE_CRIT_BINOM319
#define SC_OPCODE_KURT 320
#define SC_OPCODE_HAR_MEAN 321
#define SC_OPCODE_GEO_MEAN 322
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index b7cdba5..454242d 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -352,7 +352,7 @@ enum OpCode : sal_uInt16
ocWeibull_MS= SC_OPCODE_WEIBULL_MS,
ocNegBinomVert = SC_OPCODE_NEG_BINOM_VERT,
ocNegBinomDist_MS = SC_OPCODE_NEG_BINOM_DIST_MS,
-ocKritBinom = SC_OPCODE_KRIT_BINOM,
+ocCritBinom = SC_OPCODE_CRIT_BINOM,
ocKurt = SC_OPCODE_KURT,
ocHarMean = SC_OPCODE_HAR_MEAN,
ocGeoMean = SC_OPCODE_GEO_MEAN,
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 94b0b28..dd844bd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2798,7 +2798,7 @@ DynamicKernelSoPArguments::DynamicKernelSoPArguments(
mvSubArguments.push_back(SoPHelper(ts,
ft-Children[i], new OpCosh, nResultSize));
break;
-case ocKritBinom:
+case ocCritBinom:
mvSubArguments.push_back(SoPHelper(ts,
ft-Children[i], new OpCritBinom, nResultSize));
break;
diff --git a/sc/source/core/tool/interpr4.cxx
[Libreoffice-commits] core.git: sc/source
sc/source/ui/src/scfuncs.src | 382 +--
1 file changed, 191 insertions(+), 191 deletions(-)
New commits:
commit f0616e28126d0dbb859ab4e1c3442f02dbb82425
Author: Laurent Charrière lcharri...@gmail.com
Date: Mon Jan 12 14:09:27 2015 +0100
Translated and fixed function names in comments in scfuncs.src
Some names were still in German, some others were not the actual function
name. This revealed a few more opcodes to be translated as part of
fdo#85818. Patches forthcoming.
Conflicts:
sc/source/ui/src/scfuncs.src
Change-Id: I6635065b2a2df544ad7c631d45c2c0a815ea1968
Reviewed-on: https://gerrit.libreoffice.org/13887
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index cda12ba..b5e8fdc 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -78,7 +78,7 @@
Resource RID_SC_FUNCTION_DESCRIPTIONS1
{
- // -=*# Resource for function DBANZAHL #*=-
+ // -=*# Resource for function DCOUNT #*=-
Resource SC_OPCODE_DB_COUNT
{
String 1 // Description
@@ -118,7 +118,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBANZAHL2 #*=-
+ // -=*# Resource for function DCOUNTA #*=-
Resource SC_OPCODE_DB_COUNT_2
{
String 1 // Description
@@ -158,7 +158,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBMITTELWERT #*=-
+ // -=*# Resource for function DAVERAGE #*=-
Resource SC_OPCODE_DB_AVERAGE
{
String 1 // Description
@@ -198,7 +198,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBAUSZUG #*=-
+ // -=*# Resource for function DGET #*=-
Resource SC_OPCODE_DB_GET
{
String 1 // Description
@@ -238,7 +238,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBMAX #*=-
+ // -=*# Resource for function DMAX #*=-
Resource SC_OPCODE_DB_MAX
{
String 1 // Description
@@ -278,7 +278,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBMIN #*=-
+ // -=*# Resource for function DMIN #*=-
Resource SC_OPCODE_DB_MIN
{
String 1 // Description
@@ -318,7 +318,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBPRODUKT #*=-
+ // -=*# Resource for function DPRODUCT #*=-
Resource SC_OPCODE_DB_PRODUCT
{
String 1 // Description
@@ -358,7 +358,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBSTDABW #*=-
+ // -=*# Resource for function DSTDEV #*=-
Resource SC_OPCODE_DB_STD_DEV
{
String 1 // Description
@@ -398,7 +398,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBSTDABWN #*=-
+ // -=*# Resource for function DSTDEVP #*=-
Resource SC_OPCODE_DB_STD_DEV_P
{
String 1 // Description
@@ -438,7 +438,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBSUMME #*=-
+ // -=*# Resource for function DSUM #*=-
Resource SC_OPCODE_DB_SUM
{
String 1 // Description
@@ -478,7 +478,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBVARIANZ #*=-
+ // -=*# Resource for function DVAR #*=-
Resource SC_OPCODE_DB_VAR
{
String 1 // Description
@@ -518,7 +518,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
Text [ en-US ] = Defines the cell range containing the search
criteria. ;
};
};
- // -=*# Resource for function DBVARIANZEN #*=-
+ // -=*# Resource for function DVARP #*=-
Resource SC_OPCODE_DB_VAR_P
{
String 1 // Description
@@ -558,7 +558,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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/interpr1.cxx |2 +-
sc/source/core/tool/interpr4.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 |2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 975832d885ca5d185e91a975b157bf06bf9a7a0e
Author: Laurent Charrière lcharri...@gmail.com
Date: Mon Jan 12 17:58:29 2015 +0100
sc: rename ocPropper et al. to ocProper et al.
Change-Id: I245ad8f7418bed707953ecf80c71de07e0cc00d1
Reviewed-on: https://gerrit.libreoffice.org/13888
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 2f79b48..3dfec5c 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -122,7 +122,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_CODE { Text = CODE ; };
String SC_OPCODE_TRIM { Text = TRIM ; };
String SC_OPCODE_UPPER { Text = UPPER ; };
-String SC_OPCODE_PROPPER { Text = PROPER ; };
+String SC_OPCODE_PROPER { Text = PROPER ; };
String SC_OPCODE_LOWER { Text = LOWER ; };
String SC_OPCODE_LEN { Text = LEN ; };
String SC_OPCODE_T { Text = T ; };
@@ -530,7 +530,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_CODE { Text = CODE ; };
String SC_OPCODE_TRIM { Text = TRIM ; };
String SC_OPCODE_UPPER { Text = UPPER ; };
-String SC_OPCODE_PROPPER { Text = PROPER ; };
+String SC_OPCODE_PROPER { Text = PROPER ; };
String SC_OPCODE_LOWER { Text = LOWER ; };
String SC_OPCODE_LEN { Text = LEN ; };
String SC_OPCODE_T { Text = T ; };
@@ -940,7 +940,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_CODE { Text = CODE ; };
String SC_OPCODE_TRIM { Text = TRIM ; };
String SC_OPCODE_UPPER { Text = UPPER ; };
-String SC_OPCODE_PROPPER { Text = PROPER ; };
+String SC_OPCODE_PROPER { Text = PROPER ; };
String SC_OPCODE_LOWER { Text = LOWER ; };
String SC_OPCODE_LEN { Text = LEN ; };
String SC_OPCODE_T { Text = T ; };
@@ -1570,7 +1570,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = UPPER ;
};
-String SC_OPCODE_PROPPER
+String SC_OPCODE_PROPER
{
Text [ en-US ] = PROPER ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index e645fcb..9578a2a 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -166,7 +166,7 @@
#define SC_OPCODE_CODE 133
#define SC_OPCODE_TRIM 134
#define SC_OPCODE_UPPER 135
-#define SC_OPCODE_PROPPER 136
+#define SC_OPCODE_PROPER136
#define SC_OPCODE_LOWER 137
#define SC_OPCODE_LEN 138
#define SC_OPCODE_T 139 /* miscellaneous, part 21 */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 57aa6a1..25da573 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -158,7 +158,7 @@ enum OpCode : sal_uInt16
ocCode = SC_OPCODE_CODE,
ocTrim = SC_OPCODE_TRIM,
ocUpper = SC_OPCODE_UPPER,
-ocPropper = SC_OPCODE_PROPPER,
+ocProper= SC_OPCODE_PROPER,
ocLower = SC_OPCODE_LOWER,
ocLen = SC_OPCODE_LEN,
ocT = SC_OPCODE_T,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6c7cd09..e3b85a3 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -478,7 +478,7 @@ void ScN();
void ScCode();
void ScTrim();
void ScUpper();
-void ScPropper();
+void ScProper();
void ScLower();
void ScLen();
void ScT();
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 7d5975d..77dfcad 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2883,7 +2883,7 @@ void ScInterpreter::ScUpper()
PushString(aString);
}
-void ScInterpreter::ScPropper()
+void ScInterpreter::ScProper()
{
//2do: what to do with I18N-CJK ?!?
OUStringBuffer aStr(GetString().getString());
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d1620fe..311f86d 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3962,7 +3962,7 @@ StackVar ScInterpreter::Interpret()
[Libreoffice-commits] core.git: 2 commits - formula/source include/formula sc/source
formula/source/core/api/FormulaCompiler.cxx|4 ++--
formula/source/core/api/token.cxx |2 +-
formula/source/core/resource/core_resource.src | 16
include/formula/compiler.hrc |4 ++--
include/formula/opcode.hxx |4 ++--
sc/source/core/inc/interpre.hxx|4 ++--
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
sc/source/core/tool/interpr2.cxx |4 ++--
sc/source/core/tool/interpr4.cxx |4 ++--
sc/source/core/tool/token.cxx |4 ++--
sc/source/filter/excel/xlformula.cxx |4 ++--
sc/source/filter/lotus/lotform.cxx | 14 +++---
sc/source/filter/qpro/qproform.cxx |4 ++--
sc/source/ui/src/scfuncs.src |8
14 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit c6d3405d9cf75adc8ae9f8b2cca2dfd2c9de7d7d
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 13:26:48 2015 +0100
fdo#85818: rename RMZ to PMT
Change-Id: I952d4cee42c9a6256589a32f4acb6a6fc70ef443
Reviewed-on: https://gerrit.libreoffice.org/13830
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 50bfd82..5d289fb 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -98,7 +98,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocDB:
case ocVBD:
case ocSLN:
-case ocRMZ:
+case ocPMT:
case ocZW:
case ocIpmt:
case ocPpmt:
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index c6f4a2f..82cdcf2 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1254,7 +1254,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
return AddDefaultArg( pNewArr, 1, 2.0 );
case ocBetaDist:
case ocBetaInv:
-case ocRMZ: // PMT
+case ocPMT:
return AddDefaultArg( pNewArr, 3, 0.0 );
case ocIpmt:
case ocPpmt:
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index c64be1f..81cafdf 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -217,7 +217,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_DURATION { Text = PDURATION ; };
String SC_OPCODE_SLN { Text = SLN ; };
-String SC_OPCODE_RMZ { Text = PMT ; };
+String SC_OPCODE_PMT { Text = PMT ; };
String SC_OPCODE_COLUMNS { Text = COLUMNS ; };
String SC_OPCODE_ROWS { Text = ROWS ; };
String SC_OPCODE_TABLES { Text = SHEETS ; };
@@ -624,7 +624,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_DURATION { Text = _xlfn.PDURATION ; };
String SC_OPCODE_SLN { Text = SLN ; };
-String SC_OPCODE_RMZ { Text = PMT ; };
+String SC_OPCODE_PMT { Text = PMT ; };
String SC_OPCODE_COLUMNS { Text = COLUMNS ; };
String SC_OPCODE_ROWS { Text = ROWS ; };
String SC_OPCODE_TABLES { Text = _xlfn.SHEETS ; };
@@ -1033,7 +1033,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_DURATION { Text = DURATION ; };
String SC_OPCODE_SLN { Text = SLN ; };
-String SC_OPCODE_RMZ { Text = PMT ; };
+String SC_OPCODE_PMT { Text = PMT ; };
String SC_OPCODE_COLUMNS { Text = COLUMNS ; };
String SC_OPCODE_ROWS { Text = ROWS ; };
String SC_OPCODE_TABLES { Text = SHEETS ; };
@@ -1951,7 +1951,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = SLN ;
};
-String SC_OPCODE_RMZ
+String SC_OPCODE_PMT
{
Text [ en-US ] = PMT ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index bfbcc70..a512e28 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -248,7 +248,7 @@
#define SC_OPCODE_VBD 248
#define SC_OPCODE_DURATION 249
#define SC_OPCODE_SLN 250
-#define SC_OPCODE_RMZ 251
+#define SC_OPCODE_PMT 251
#define SC_OPCODE_COLUMNS 252
#define SC_OPCODE_ROWS 253
#define SC_OPCODE_COLUMN254
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 4ca9893..5349559 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -252,7 +252,7 @@ enum OpCode : sal_uInt16
ocVBD =
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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/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 ++--
13 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit fd66d3749e286d8e1b40429ea04e33d7266c1132
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 12:12:59 2015 +0100
fdo#85818: rename GDA to DDB
Change-Id: Ic73225a34ca3339216c11bd72116e55d6a098257
Reviewed-on: https://gerrit.libreoffice.org/13827
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 6d324e2..ec53ee6 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -94,7 +94,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocNPV:
case ocPV:
case ocSYD:
-case ocGDA:
+case ocDDB:
case ocDB:
case ocVBD:
case ocLIA:
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 8a65301..6ed8e2d 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -212,7 +212,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PERMUTATION_A { Text = PERMUTATIONA ; };
String SC_OPCODE_PV { Text = PV ; };
String SC_OPCODE_SYD { Text = SYD ; };
-String SC_OPCODE_GDA { Text = DDB ; };
+String SC_OPCODE_DDB { Text = DDB ; };
String SC_OPCODE_DB { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_DURATION { Text = PDURATION ; };
@@ -619,7 +619,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PERMUTATION_A { Text = _xlfn.PERMUTATIONA ; };
String SC_OPCODE_PV { Text = PV ; };
String SC_OPCODE_SYD { Text = SYD ; };
-String SC_OPCODE_GDA { Text = DDB ; };
+String SC_OPCODE_DDB { Text = DDB ; };
String SC_OPCODE_DB { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_DURATION { Text = _xlfn.PDURATION ; };
@@ -1028,7 +1028,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PERMUTATION_A { Text = PERMUTATIONA ; };
String SC_OPCODE_PV { Text = PV ; };
String SC_OPCODE_SYD { Text = SYD ; };
-String SC_OPCODE_GDA { Text = DDB ; };
+String SC_OPCODE_DDB { Text = DDB ; };
String SC_OPCODE_DB { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_DURATION { Text = DURATION ; };
@@ -1931,7 +1931,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = SYD ;
};
-String SC_OPCODE_GDA
+String SC_OPCODE_DDB
{
Text [ en-US ] = DDB ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 86ff639..7e9facb 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -243,7 +243,7 @@
#define SC_OPCODE_PERMUTATION_A 243
#define SC_OPCODE_PV244
#define SC_OPCODE_SYD 245
-#define SC_OPCODE_GDA 246
+#define SC_OPCODE_DDB 246
#define SC_OPCODE_DB247
#define SC_OPCODE_VBD 248
#define SC_OPCODE_DURATION 249
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index f566507..2fed555 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -247,7 +247,7 @@ enum OpCode : sal_uInt16
ocPermutationA = SC_OPCODE_PERMUTATION_A,
ocPV= SC_OPCODE_PV,
ocSYD = SC_OPCODE_SYD,
-ocGDA = SC_OPCODE_GDA,
+ocDDB = SC_OPCODE_DDB,
ocDB= SC_OPCODE_DB,
ocVBD = SC_OPCODE_VBD,
ocDuration = SC_OPCODE_DURATION,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 53615bd..2e7e325 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -664,7 +664,7 @@ void ScPV();
void ScSYD();
double ScGetGDA(double fWert, double fRest, double fDauer,
double fPeriode, double fFactor);
-void ScGDA();
+void ScDDB();
void ScDB();
double
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/api/FormulaCompiler.cxx|4 ++--
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/compiler.cxx |2 +-
sc/source/core/tool/interpr2.cxx |2 +-
sc/source/core/tool/interpr4.cxx |2 +-
sc/source/core/tool/parclass.cxx |2 +-
sc/source/core/tool/token.cxx |2 +-
sc/source/filter/excel/xlformula.cxx |2 +-
sc/source/filter/qpro/qproform.cxx |4 ++--
sc/source/ui/src/scfuncs.src |4 ++--
14 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 92cef7eb344c9c9c7a6aa1489845a1b0eb346ead
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 13:43:55 2015 +0100
fdo#85818: rename ZGZ to RRI
Change-Id: Ifeb513eba762f881dd4ea7cd7fc531fe5028106d
Reviewed-on: https://gerrit.libreoffice.org/13831
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 5d289fb..d1ef9a9 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -108,7 +108,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocRate:
case ocIRR:
case ocMIRR:
-case ocZGZ:
+case ocRRI:
case ocEffective:
case ocNominal:
case ocPercentSign:
@@ -917,7 +917,7 @@ void FormulaCompiler::OpCodeMap::copyFrom( const OpCodeMap
r, bool bOverrideKno
OpCode eOp = OpCode(i);
switch (eOp)
{
-case ocZGZ:
+case ocRRI:
aSymbol = RRI;
break;
case ocTableOp:
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 81cafdf..1e76de2 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -224,7 +224,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_COLUMN { Text = COLUMN ; };
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = SHEET ; };
-String SC_OPCODE_ZGZ { Text = RRI ; };
+String SC_OPCODE_RRI { Text = RRI ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
@@ -631,7 +631,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_COLUMN { Text = COLUMN ; };
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = _xlfn.SHEET ; };
-String SC_OPCODE_ZGZ { Text = _xlfn.RRI ; };
+String SC_OPCODE_RRI { Text = _xlfn.RRI ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
@@ -1040,7 +1040,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_COLUMN { Text = COLUMN ; };
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = SHEET ; };
-String SC_OPCODE_ZGZ { Text = ZGZ ; };
+String SC_OPCODE_RRI { Text = ZGZ ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
@@ -1979,7 +1979,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = SHEET ;
};
-String SC_OPCODE_ZGZ
+String SC_OPCODE_RRI
{
Text [ en-US ] = RRI ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index a512e28..5686a8b 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -253,7 +253,7 @@
#define SC_OPCODE_ROWS 253
#define SC_OPCODE_COLUMN254
#define SC_OPCODE_ROW 255
-#define SC_OPCODE_ZGZ 256
+#define SC_OPCODE_RRI 256
#define SC_OPCODE_ZW257
#define SC_OPCODE_ZZR 258
#define SC_OPCODE_RATE 259
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 5349559..c9e105d 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -257,7 +257,7 @@ enum OpCode : sal_uInt16
ocRows = SC_OPCODE_ROWS,
ocColumn= SC_OPCODE_COLUMN,
ocRow = SC_OPCODE_ROW,
-ocZGZ = SC_OPCODE_ZGZ,
+ocRRI = SC_OPCODE_RRI,
ocZW= SC_OPCODE_ZW,
ocZZR = SC_OPCODE_ZZR,
ocRate = SC_OPCODE_RATE,
diff --git
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 lcharri...@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 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 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
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 |4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit c7d23291ea9ae7a3a2c055b09fce9c29bb7f58d3
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 07:01:11 2015 +0100
fdo#85818: rename Effektiv to Effective
Change-Id: I55a863f7d7068de9abc468676ecf2e54ecd3c06c
Reviewed-on: https://gerrit.libreoffice.org/13823
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index c91a50a..de527e4 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -109,7 +109,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocIRR:
case ocMIRR:
case ocZGZ:
-case ocEffektiv:
+case ocEffective:
case ocNominal:
case ocPercentSign:
return NUMBERFORMAT_PERCENT;
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index e2a3ed5..a5bf5d8 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -232,7 +232,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PPMT { Text = PPMT ; };
String SC_OPCODE_CUM_IPMT { Text = CUMIPMT ; };
String SC_OPCODE_CUM_PRINC { Text = CUMPRINC ; };
-String SC_OPCODE_EFFEKTIV { Text = EFFECT ; };
+String SC_OPCODE_EFFECTIVE { Text = EFFECT ; };
String SC_OPCODE_NOMINAL { Text = NOMINAL ; };
String SC_OPCODE_SUB_TOTAL { Text = SUBTOTAL ; };
String SC_OPCODE_DB_SUM { Text = DSUM ; };
@@ -639,7 +639,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PPMT { Text = PPMT ; };
String SC_OPCODE_CUM_IPMT { Text = CUMIPMT ; };
String SC_OPCODE_CUM_PRINC { Text = CUMPRINC ; };
-String SC_OPCODE_EFFEKTIV { Text = EFFECTIVE ; };
+String SC_OPCODE_EFFECTIVE { Text = EFFECTIVE ; };
String SC_OPCODE_NOMINAL { Text = NOMINAL ; };
String SC_OPCODE_SUB_TOTAL { Text = SUBTOTAL ; };
String SC_OPCODE_DB_SUM { Text = DSUM ; };
@@ -1048,7 +1048,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PPMT { Text = PPMT ; };
String SC_OPCODE_CUM_IPMT { Text = CUMIPMT ; };
String SC_OPCODE_CUM_PRINC { Text = CUMPRINC ; };
-String SC_OPCODE_EFFEKTIV { Text = EFFECTIVE ; };
+String SC_OPCODE_EFFECTIVE { Text = EFFECTIVE ; };
String SC_OPCODE_NOMINAL { Text = NOMINAL ; };
String SC_OPCODE_SUB_TOTAL { Text = SUBTOTAL ; };
String SC_OPCODE_DB_SUM { Text = DSUM ; };
@@ -2011,7 +2011,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = CUMPRINC ;
};
-String SC_OPCODE_EFFEKTIV
+String SC_OPCODE_EFFECTIVE
{
Text [ en-US ] = EFFECTIVE ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index d420fbd..be61ed8 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -261,7 +261,7 @@
#define SC_OPCODE_PPMT 261
#define SC_OPCODE_CUM_IPMT 262
#define SC_OPCODE_CUM_PRINC 263
-#define SC_OPCODE_EFFEKTIV 264
+#define SC_OPCODE_EFFECTIVE 264
#define SC_OPCODE_NOMINAL 265
#define SC_OPCODE_SUB_TOTAL 266
#define SC_OPCODE_DB_SUM267 /* database functions */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index e6260ce..f6de536 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -265,7 +265,7 @@ enum OpCode : sal_uInt16
ocPpmt = SC_OPCODE_PPMT,
ocCumIpmt = SC_OPCODE_CUM_IPMT,
ocCumPrinc = SC_OPCODE_CUM_PRINC,
-ocEffektiv = SC_OPCODE_EFFEKTIV,
+ocEffective = SC_OPCODE_EFFECTIVE,
ocNominal = SC_OPCODE_NOMINAL,
ocSubTotal = SC_OPCODE_SUB_TOTAL,
// Database functions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 60ef2a9..bc57d19 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -688,7 +688,7 @@ void ScIpmt();
void ScPpmt();
void ScCumIpmt();
void ScCumPrinc();
-void ScEffektiv();
+void ScEffective();
void ScNominal();
void ScMod();
void ScIntercept();
diff --git a/sc/source/core/tool/interpr2.cxx
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 lcharri...@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 c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@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_PERMUT242
#define SC_OPCODE_PERMUTATION_A 243
-#define SC_OPCODE_BW244
+#define SC_OPCODE_PV244
#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 :
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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/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 ++--
13 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit b2fcd4f7c7133f10bde8df3b7544023a3719d2b2
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 12:01:16 2015 +0100
fdo#85818: rename DIA to SYD
Change-Id: I3510403521668c00f44d462b288716f5f7b60115
Reviewed-on: https://gerrit.libreoffice.org/13825
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Noel Grandin noelgran...@gmail.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 858fe06..4ece137 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -93,7 +93,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
return NUMBERFORMAT_TIME;
case ocNPV:
case ocPV:
-case ocDIA:
+case ocSYD:
case ocGDA:
case ocGDA2:
case ocVBD:
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 2434ead..31ca6e1 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -211,7 +211,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PERMUT { Text = PERMUT ; };
String SC_OPCODE_PERMUTATION_A { Text = PERMUTATIONA ; };
String SC_OPCODE_PV { Text = PV ; };
-String SC_OPCODE_DIA { Text = SYD ; };
+String SC_OPCODE_SYD { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
String SC_OPCODE_GDA_2 { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
@@ -618,7 +618,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PERMUT { Text = PERMUT ; };
String SC_OPCODE_PERMUTATION_A { Text = _xlfn.PERMUTATIONA ; };
String SC_OPCODE_PV { Text = PV ; };
-String SC_OPCODE_DIA { Text = SYD ; };
+String SC_OPCODE_SYD { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
String SC_OPCODE_GDA_2 { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
@@ -1027,7 +1027,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PERMUT { Text = PERMUT ; };
String SC_OPCODE_PERMUTATION_A { Text = PERMUTATIONA ; };
String SC_OPCODE_PV { Text = PV ; };
-String SC_OPCODE_DIA { Text = SYD ; };
+String SC_OPCODE_SYD { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
String SC_OPCODE_GDA_2 { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
@@ -1927,7 +1927,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = PV ;
};
-String SC_OPCODE_DIA
+String SC_OPCODE_SYD
{
Text [ en-US ] = SYD ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 3ffd2ba..ea177ba 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -242,7 +242,7 @@
#define SC_OPCODE_PERMUT242
#define SC_OPCODE_PERMUTATION_A 243
#define SC_OPCODE_PV244
-#define SC_OPCODE_DIA 245
+#define SC_OPCODE_SYD 245
#define SC_OPCODE_GDA 246
#define SC_OPCODE_GDA_2 247
#define SC_OPCODE_VBD 248
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 6a68339..df2452b 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -246,7 +246,7 @@ enum OpCode : sal_uInt16
ocPermut= SC_OPCODE_PERMUT,
ocPermutationA = SC_OPCODE_PERMUTATION_A,
ocPV= SC_OPCODE_PV,
-ocDIA = SC_OPCODE_DIA,
+ocSYD = SC_OPCODE_SYD,
ocGDA = SC_OPCODE_GDA,
ocGDA2 = SC_OPCODE_GDA_2,
ocVBD = SC_OPCODE_VBD,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 2cf46e8..4ce3313 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -661,7 +661,7 @@ void ScISPMT();
double ScGetBw(double fZins, double fZzr, double fRmz,
double fZw, double fF);
void ScPV();
-void ScDIA();
+void ScSYD();
double ScGetGDA(double fWert, double
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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/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/ui/src/scfuncs.src |4 ++--
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 4a2fded15046f2c469c9c1723ccef4e517fc372a
Author: Laurent Charrière lcharri...@gmail.com
Date: Fri Jan 9 12:07:44 2015 +0100
fdo#85818: rename GDA2 to DB
Change-Id: I2449645b47918325474109fc090ef34b009f26a8
Reviewed-on: https://gerrit.libreoffice.org/13826
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 4ece137..6d324e2 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -95,7 +95,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocPV:
case ocSYD:
case ocGDA:
-case ocGDA2:
+case ocDB:
case ocVBD:
case ocLIA:
case ocRMZ:
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 31ca6e1..ccaba7a 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -213,7 +213,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_PV { Text = PV ; };
String SC_OPCODE_SYD { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
-String SC_OPCODE_GDA_2 { Text = DB ; };
+String SC_OPCODE_DB { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_LAUFZ { Text = PDURATION ; };
String SC_OPCODE_LIA { Text = SLN ; };
@@ -620,7 +620,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_PV { Text = PV ; };
String SC_OPCODE_SYD { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
-String SC_OPCODE_GDA_2 { Text = DB ; };
+String SC_OPCODE_DB { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_LAUFZ { Text = _xlfn.PDURATION ; };
String SC_OPCODE_LIA { Text = SLN ; };
@@ -1029,7 +1029,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_PV { Text = PV ; };
String SC_OPCODE_SYD { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
-String SC_OPCODE_GDA_2 { Text = DB ; };
+String SC_OPCODE_DB { Text = DB ; };
String SC_OPCODE_VBD { Text = VDB ; };
String SC_OPCODE_LAUFZ { Text = DURATION ; };
String SC_OPCODE_LIA { Text = SLN ; };
@@ -1935,7 +1935,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = DDB ;
};
-String SC_OPCODE_GDA_2
+String SC_OPCODE_DB
{
Text [ en-US ] = DB ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index ea177ba..42bba26 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -244,7 +244,7 @@
#define SC_OPCODE_PV244
#define SC_OPCODE_SYD 245
#define SC_OPCODE_GDA 246
-#define SC_OPCODE_GDA_2 247
+#define SC_OPCODE_DB247
#define SC_OPCODE_VBD 248
#define SC_OPCODE_LAUFZ 249
#define SC_OPCODE_LIA 250
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index df2452b..8f891db 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -248,7 +248,7 @@ enum OpCode : sal_uInt16
ocPV= SC_OPCODE_PV,
ocSYD = SC_OPCODE_SYD,
ocGDA = SC_OPCODE_GDA,
-ocGDA2 = SC_OPCODE_GDA_2,
+ocDB= SC_OPCODE_DB,
ocVBD = SC_OPCODE_VBD,
ocLaufz = SC_OPCODE_LAUFZ,
ocLIA = SC_OPCODE_LIA,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4ce3313..7b0da5c 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -665,7 +665,7 @@ void ScSYD();
double ScGetGDA(double fWert, double fRest, double fDauer,
double fPeriode, double fFactor);
void ScGDA();
-void ScGDA2();
+void ScDB();
double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1,
double fPeriode,double fFactor);
void ScVDB();
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/api/FormulaCompiler.cxx|2 +-
formula/source/core/api/token.cxx |4 ++--
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 |4 ++--
sc/source/ui/src/scfuncs.src |2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 2963dbb5ce65a141051cb3e4e3ed06a6ed31574c
Author: Laurent Charrière lcharri...@gmail.com
Date: Wed Jan 7 10:36:27 2015 +0100
fdo#85818: rename ZinsZ enum name, constant, function to Ipmt
Rename OcZinsZ to OcIpmt, SC_OPCODE_ZINS_Z to SC_OPCODE_IPMT,
ScInterpreter::ScZinsZ() to ScInterpreter::ScIpmt()
Change-Id: I6ed671aff85b7d2ec06dd66cd7ec9390776008b1
Reviewed-on: https://gerrit.libreoffice.org/13813
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 69afa63..b8380b8 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -100,7 +100,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocLIA:
case ocRMZ:
case ocZW:
-case ocZinsZ:
+case ocIpmt:
case ocKapz:
case ocKumZinsZ:
case ocKumKapZ:
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index ec9f4d3..1403dfa 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1256,7 +1256,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
case ocBetaInv:
case ocRMZ: // PMT
return AddDefaultArg( pNewArr, 3, 0.0 );
-case ocZinsZ: // IPMT
+case ocIpmt:
case ocKapz:// PPMT
return AddDefaultArg( pNewArr, 4, 0.0 );
case ocBW: // PV
@@ -1264,7 +1264,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
break;
-case ocRate:// RATE
+case ocRate:
bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv
bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 408d083..af72798 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -228,7 +228,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
-String SC_OPCODE_ZINS_Z { Text = IPMT ; };
+String SC_OPCODE_IPMT { Text = IPMT ; };
String SC_OPCODE_KAPZ { Text = PPMT ; };
String SC_OPCODE_KUM_ZINS_Z { Text = CUMIPMT ; };
String SC_OPCODE_KUM_KAP_Z { Text = CUMPRINC ; };
@@ -635,7 +635,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
-String SC_OPCODE_ZINS_Z { Text = IPMT ; };
+String SC_OPCODE_IPMT { Text = IPMT ; };
String SC_OPCODE_KAPZ { Text = PPMT ; };
String SC_OPCODE_KUM_ZINS_Z { Text = CUMIPMT ; };
String SC_OPCODE_KUM_KAP_Z { Text = CUMPRINC ; };
@@ -1044,7 +1044,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_RATE { Text = RATE ; };
-String SC_OPCODE_ZINS_Z { Text = IPMT ; };
+String SC_OPCODE_IPMT { Text = IPMT ; };
String SC_OPCODE_KAPZ { Text = PPMT ; };
String SC_OPCODE_KUM_ZINS_Z { Text = CUMIPMT ; };
String SC_OPCODE_KUM_KAP_Z { Text = CUMPRINC ; };
@@ -1995,7 +1995,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = RATE ;
};
-String SC_OPCODE_ZINS_Z
+String SC_OPCODE_IPMT
{
Text [ en-US ] = IPMT ;
};
diff --git a/include/formula/compiler.hrc
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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_Z262
#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
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 lcharri...@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 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 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_Z262
+#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
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src | 32 -
include/formula/compiler.hrc |8 +++---
include/formula/opcode.hxx |8 +++---
sc/source/core/inc/interpre.hxx|8 +++---
sc/source/core/opencl/formulagroupcl.cxx | 16 ++--
sc/source/core/opencl/op_math.cxx |6 ++--
sc/source/core/opencl/op_math.hxx |6 ++--
sc/source/core/opencl/op_statistical.cxx |4 +--
sc/source/core/opencl/op_statistical.hxx |8 +++---
sc/source/core/tool/interpr3.cxx |8 +++---
sc/source/core/tool/interpr4.cxx |8 +++---
sc/source/core/tool/token.cxx |8 +++---
sc/source/filter/excel/xlformula.cxx |8 +++---
sc/source/filter/lotus/lotform.cxx |2 -
sc/source/ui/src/scfuncs.src |8 +++---
15 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 5af576c2fcf8ebdc517b3919dd0ef808b09b04a1
Author: Laurent Charrière lcharri...@gmail.com
Date: Wed Jan 7 15:58:44 2015 +0100
fdo#85818: rename Kombin, Kombin2, Variationen, Variationen2
Rename OcKombin to OcCombin, SC_OPCODE_KOMBIN to SC_OPCODE_COMBIN,
ScInterpreter::ScKombin() to ScInterpreter::ScCombin(), OpKombin to
OpCombin.
Rename OcKombin2 to OcCombinA, SC_OPCODE_KOMBIN_2 to
SC_OPCODE_COMBIN_A, ScInterpreter::ScKombin2() to
ScInterpreter::ScCombinA(), OpKombin2 to OpCombinA.
Rename OcVariationen to OcPermut, SC_OPCODE_VARIATIONEN to
SC_OPCODE_PERMUT, ScInterpreter::ScVariationen() to
ScInterpreter::ScPermut(), OpVariationen to OpPermut.
Rename OcVariationen2 to OcPermutationA, SC_OPCODE_VARIATIONEN_2 to
SC_OPCODE_PERMUTATION_A, ScInterpreter::ScVariationen2() to
ScInterpreter::ScPermutationA(), OpVariationen2 to OpPermutationA.
Change-Id: I2efa01e9b160e98058879d08e2e2313284a5ec91
Reviewed-on: https://gerrit.libreoffice.org/13814
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index af72798..f704d0c 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -206,10 +206,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_BINOM_DIST_MS { Text = COM.MICROSOFT.BINOM.DIST ; };
String SC_OPCODE_POISSON_DIST { Text = POISSON ; };
String SC_OPCODE_POISSON_DIST_MS { Text = COM.MICROSOFT.POISSON.DIST ; };
-String SC_OPCODE_KOMBIN { Text = COMBIN ; };
-String SC_OPCODE_KOMBIN_2 { Text = COMBINA ; };
-String SC_OPCODE_VARIATIONEN { Text = PERMUT ; };
-String SC_OPCODE_VARIATIONEN_2 { Text = PERMUTATIONA ; };
+String SC_OPCODE_COMBIN { Text = COMBIN ; };
+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_DIA { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
@@ -613,10 +613,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_BINOM_DIST_MS { Text = _xlfn.BINOM.DIST ; };
String SC_OPCODE_POISSON_DIST { Text = POISSON ; };
String SC_OPCODE_POISSON_DIST_MS { Text = _xlfn.POISSON.DIST ; };
-String SC_OPCODE_KOMBIN { Text = COMBIN ; };
-String SC_OPCODE_KOMBIN_2 { Text = _xlfn.COMBINA ; };
-String SC_OPCODE_VARIATIONEN { Text = PERMUT ; };
-String SC_OPCODE_VARIATIONEN_2 { Text = _xlfn.PERMUTATIONA ; };
+String SC_OPCODE_COMBIN { Text = COMBIN ; };
+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_DIA { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
@@ -1022,10 +1022,10 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_BINOM_DIST_MS { Text = BINOM.DIST ; };
String SC_OPCODE_POISSON_DIST { Text = POISSON ; };
String SC_OPCODE_POISSON_DIST_MS { Text = POISSON.DIST ; };
-String SC_OPCODE_KOMBIN { Text = COMBIN ; };
-String SC_OPCODE_KOMBIN_2 { Text = COMBINA ; };
-String SC_OPCODE_VARIATIONEN { Text = PERMUT ; };
-String SC_OPCODE_VARIATIONEN_2 { Text = PERMUTATIONA ; };
+String SC_OPCODE_COMBIN { Text = COMBIN ; };
+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_DIA { Text = SYD ; };
String SC_OPCODE_GDA { Text = DDB ; };
@@ -1907,19 +1907,19 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
[Libreoffice-commits] core.git: formula/source include/formula sc/source
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 |6 +++---
sc/source/filter/qpro/qproform.cxx |2 +-
sc/source/ui/src/scfuncs.src |2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 1f4fd70495b3d0e732447e8e60e5faa9086471a8
Author: Laurent Charrière lcharri...@gmail.com
Date: Tue Jan 6 21:10:31 2015 +0100
fdo#85818: rename 'Zins' enum name, constant, function to Rate
Rename OcZins to OcRate, SC_OPCODE_ZINS to SC_OPCODE_RATE,
ScInterpreter::ScZins() to ScInterpreter::ScRate()
(partial fix for fdo#85818, more constants remain to be renamed)
Change-Id: Icd5d0df14f2583da7ebd0308dc660abd07f326a4
Reviewed-on: https://gerrit.libreoffice.org/13777
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index f5b1b9a..69afa63 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -105,7 +105,7 @@ short lcl_GetRetFormat( OpCode eOpCode )
case ocKumZinsZ:
case ocKumKapZ:
return NUMBERFORMAT_CURRENCY;
-case ocZins:
+case ocRate:
case ocIRR:
case ocMIRR:
case ocZGZ:
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 2f6ae97..ec9f4d3 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1264,7 +1264,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray
*pNewArr, const Missin
bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
break;
-case ocZins:// RATE
+case ocRate:// RATE
bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt
bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv
bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 99b387d..408d083 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -227,7 +227,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_ZGZ { Text = RRI ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
-String SC_OPCODE_ZINS { Text = RATE ; };
+String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_ZINS_Z { Text = IPMT ; };
String SC_OPCODE_KAPZ { Text = PPMT ; };
String SC_OPCODE_KUM_ZINS_Z { Text = CUMIPMT ; };
@@ -634,7 +634,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ZGZ { Text = _xlfn.RRI ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
-String SC_OPCODE_ZINS { Text = RATE ; };
+String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_ZINS_Z { Text = IPMT ; };
String SC_OPCODE_KAPZ { Text = PPMT ; };
String SC_OPCODE_KUM_ZINS_Z { Text = CUMIPMT ; };
@@ -1043,7 +1043,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_ZGZ { Text = ZGZ ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
-String SC_OPCODE_ZINS { Text = RATE ; };
+String SC_OPCODE_RATE { Text = RATE ; };
String SC_OPCODE_ZINS_Z { Text = IPMT ; };
String SC_OPCODE_KAPZ { Text = PPMT ; };
String SC_OPCODE_KUM_ZINS_Z { Text = CUMIPMT ; };
@@ -1991,7 +1991,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = NPER ;
};
-String SC_OPCODE_ZINS
+String SC_OPCODE_RATE
{
Text [ en-US ] = RATE ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index bd1ad39..8767082 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -256,7 +256,7 @@
#define SC_OPCODE_ZGZ 256
#define SC_OPCODE_ZW257
#define SC_OPCODE_ZZR 258
-#define SC_OPCODE_ZINS 259
+#define SC_OPCODE_RATE 259
#define SC_OPCODE_ZINS_Z
License statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 1/3] Translate German comments in ure/xml2cmp
Signed-off-by: Laurent Charrière lcharri...@gmail.com
---
xml2cmp/source/support/list.hxx |4 ++--
xml2cmp/source/xcd/cr_index.cxx |2 +-
xml2cmp/source/xcd/main.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx
index 7678752..6de123e 100644
--- a/xml2cmp/source/support/list.hxx
+++ b/xml2cmp/source/support/list.hxx
@@ -165,7 +165,7 @@ template class XX
void
ListXX::checkSize(unsigned newLength)
{
- // neuen Platzbedarf pruefen:
+ // test new size requirement:
unsigned newSpace = space();
if (newLength newSpace)
{
@@ -184,7 +184,7 @@ ListXX::checkSize(unsigned newLength)
}
}
- // Veraenderung ?:
+ // change?
if (newSpace != space())
alloc(newSpace,true);
}
diff --git a/xml2cmp/source/xcd/cr_index.cxx b/xml2cmp/source/xcd/cr_index.cxx
index f4f0d28..aef1432 100644
--- a/xml2cmp/source/xcd/cr_index.cxx
+++ b/xml2cmp/source/xcd/cr_index.cxx
@@ -241,7 +241,7 @@ Index::WriteHeap( std::ostream o_rOut,
-/**�bersicht der Struktur
+/**Structure overview
MODULEDESCRIPTION
{
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index c40e09f..7e13807 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -128,7 +128,7 @@ Do_SingleFileCommandLine(const CommandLine i_rCommandLine)
int
Do_IndexCommandLine(const CommandLine i_rCommandLine)
{
-// Parsen files:
+// Parse files:
ListSimstr aFiles;
Index aIndex( i_rCommandLine.OutputDirectory(),
i_rCommandLine.IdlRootPath(),
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 2/3] Delete commented out code in ure/xml2cmp
Signed-off-by: Laurent Charrière lcharri...@gmail.com
---
xml2cmp/source/finder/dependy.cxx |1 -
xml2cmp/source/xcd/main.cxx |1 -
xml2cmp/source/xcd/parse.cxx |4
3 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/xml2cmp/source/finder/dependy.cxx
b/xml2cmp/source/finder/dependy.cxx
index 4daca23..1b34b56 100644
--- a/xml2cmp/source/finder/dependy.cxx
+++ b/xml2cmp/source/finder/dependy.cxx
@@ -104,7 +104,6 @@ DependencyFinder::FindNeededServices( StringVector
o_rLibraries,
aResult_Libraries.erase( aResult_Libraries.begin(),
aResult_Libraries.end() );
aResult_Services.erase( aResult_Services.begin(), aResult_Services.end() );
-// const ServiceInfo rSInfo = (*itService).second-FirstImplementation();
Add2Result( *(*itService).second );
for ( std::set Simstr ::const_iterator il = aResult_Libraries.begin();
diff --git a/xml2cmp/source/xcd/main.cxx b/xml2cmp/source/xcd/main.cxx
index 7e13807..377cd9a 100644
--- a/xml2cmp/source/xcd/main.cxx
+++ b/xml2cmp/source/xcd/main.cxx
@@ -213,7 +213,6 @@ Create_TypeInfo( const char *
o_sOutputFile,
if ( 0 == strcmp(pHeapTop-Key(), pLastHeapTop-Key()) )
continue;
delete pLastHeapTop;
-// pLastHeapTop = 0;
}
pLastHeapTop = pHeapTop;
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index 906b407..20198cf 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/xml2cmp/source/xcd/parse.cxx
@@ -442,10 +442,6 @@ X2CParser::SyntaxError( const char * i_sText )
void
X2CParser::TestCurChar()
{
-// if (*text == '\0')
-// SyntaxError(unexpected end of file);
-// else
-
if (*text == '\n')
nFileLine++;
}
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH 2/3] Delete commented out code in ure/cppuhelper
Signed-off-by: Laurent Charrière lcharri...@gmail.com
---
cppuhelper/inc/cppuhelper/interfacecontainer.hxx |1 -
cppuhelper/source/factory.cxx|2 --
cppuhelper/source/interfacecontainer.cxx |1 -
cppuhelper/source/weak.cxx | 10 --
4 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
index 4b34e92..a933547 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx
@@ -157,7 +157,6 @@ void OMultiTypeInterfaceContainerHelperVar key , hashImpl
, equalImpl ::dispos
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
-//ppListenerContainers = new (ListenerContainer*)[nSize];
typename InterfaceMap::iterator iter = m_pMap-begin();
typename InterfaceMap::iterator end = m_pMap-end();
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 6d1942e..d46e305 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -1084,8 +1084,6 @@ ReferenceXSingleServiceFactory SAL_CALL
createOneInstanceFactory(
{
return new OFactoryComponentHelper(
rServiceManager, rImplementationName, pCreateFunction, 0,
rServiceNames, pModCount, sal_True );
-// return new OFactoryUnloadableComponentHelper(
-// rServiceManager, rImplementationName, pCreateFunction, 0,
rServiceNames, pModCount, sal_True );
}
// global function
diff --git a/cppuhelper/source/interfacecontainer.cxx
b/cppuhelper/source/interfacecontainer.cxx
index afd3d09..ca6a1e2 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -686,7 +686,6 @@ void
OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
-//ppListenerContainers = new (ListenerContainer*)[nSize];
t_long2ptr::iterator iter = pMap-begin();
t_long2ptr::iterator end = pMap-end();
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1c24f48..750981b 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -289,16 +289,6 @@ Any OWeakAggObject::queryInterface( const Type rType )
throw(::com::sun::star:
{
Reference XInterface x( xDelegator ); // harden ref
return (x.is() ? x-queryInterface( rType ) : queryAggregation( rType ));
-
-// // set rOut to zero, if failed
-// if( !xDelegator.queryHardRef( aUik, rOut ) )
-// {
-// XInterfaceRef x;
-// if( !xDelegator.queryHardRef( ((XInterface*)0)-getSmartUik(),
x ) )
-// // reference is not valid
-// queryAggregation( aUik, rOut );
-// }
-// return rOut.is();
}
// XAggregation
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
