sc/source/filter/excel/xlformula.cxx | 4 ++--
sc/source/filter/oox/formulabase.cxx | 16 +++++++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 3d70765218986abba8b6d7c8e3cadd83a62ee035
Author: Eike Rathke <er...@redhat.com>
Date: Fri Jul 15 13:43:09 2016 +0200
mapping ERROR.TYPE to ORG.OPENOFFICE.ERRORTYPE was always wrong
Change-Id: I02b941a1a884a984b39632cad36579130cd71d6c
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 63372e6..232d569 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -488,7 +488,7 @@ static const FunctionData saFuncTableBiff4[] =
{ "RANK", "RANK", 216, 216, 2, 3,
V, { VR, RO, VR }, 0 },
{ "DB", "DB", 247, 247, 4, 5,
V, { VR }, 0 },
{ "FREQUENCY", "FREQUENCY", 252, 252, 2, 2,
A, { RA }, 0 },
- { "ORG.OPENOFFICE.ERRORTYPE","ERROR.TYPE", 261, 261, 1, 1,
V, { VR }, 0 },
+ { "ERROR.TYPE", "ERROR.TYPE", 261, 261, 1, 1,
V, { VR }, 0 },
{ "AVEDEV", "AVEDEV", 269, 269, 1,
MX, V, { RX }, 0 },
{ "BETADIST", "BETADIST", 270, 270, 3, 5,
V, { VR }, 0 },
{ "GAMMALN", "GAMMALN", 271, 271, 1, 1,
V, { VR }, 0 },
commit 89c4a69103b6e15e7f52401c51110b926c3ccf36
Author: Eike Rathke <er...@redhat.com>
Date: Fri Jul 15 13:20:19 2016 +0200
add missing functions to FunctionData saFuncTableOOoLO
Change-Id: I9cd23fcbeabaf29b4ea9b85691e2871b32666cdd
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index e9242f6..63372e6 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -948,6 +948,20 @@ static const FunctionData saFuncTableOOoLO[] =
{ "ORG.OPENOFFICE.DAYSINYEAR",
"COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDAYSINYEAR", NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
{ "ORG.OPENOFFICE.WEEKSINYEAR",
"COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETWEEKSINYEAR", NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
{ "ORG.OPENOFFICE.ROT13",
"COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETROT13", NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+ // More functions written wrongly in the past.
+ { "ORG.OPENOFFICE.ERRORTYPE", "ORG.OPENOFFICE.ERRORTYPE", NOID,
NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+ { "ORG.OPENOFFICE.MULTIRANGE", "ORG.OPENOFFICE.MULTIRANGE", NOID,
NOID, 1, MX, V, { RX }, FUNCFLAG_MACROCALL_NEW },
+ { "ORG.OPENOFFICE.GOALSEEK", "ORG.OPENOFFICE.GOALSEEK", NOID,
NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+ { "ORG.OPENOFFICE.EASTERSUNDAY","ORG.OPENOFFICE.EASTERSUNDAY", NOID,
NOID, 1, 1, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+ { "ORG.OPENOFFICE.CURRENT", "ORG.OPENOFFICE.CURRENT", NOID,
NOID, 0, 0, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+ { "ORG.OPENOFFICE.STYLE", "ORG.OPENOFFICE.STYLE", NOID,
NOID, 1, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW },
+ // And the import for the wrongly written functions even without _xlfn.
+ { "ORG.OPENOFFICE.ERRORTYPE", "ERRORTYPE", NOID, NOID, 1, 1, V,
{ VR }, FUNCFLAG_IMPORTONLY },
+ { "ORG.OPENOFFICE.MULTIRANGE", "MULTIRANGE", NOID, NOID, 1, MX, V,
{ RX }, FUNCFLAG_IMPORTONLY },
+ { "ORG.OPENOFFICE.GOALSEEK", "GOALSEEK", NOID, NOID, 3, 3, V,
{ VR }, FUNCFLAG_IMPORTONLY },
+ { "ORG.OPENOFFICE.EASTERSUNDAY","EASTERSUNDAY", NOID, NOID, 1, 1, V,
{ VR }, FUNCFLAG_IMPORTONLY },
+ { "ORG.OPENOFFICE.CURRENT", "CURRENT", NOID, NOID, 0, 0, V,
{ VR }, FUNCFLAG_IMPORTONLY },
+ { "ORG.OPENOFFICE.STYLE", "STYLE", NOID, NOID, 1, 3, V,
{ VR }, FUNCFLAG_IMPORTONLY },
// Other functions.
{ "ORG.OPENOFFICE.CONVERT", "ORG.OPENOFFICE.CONVERT", NOID, NOID,
3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW },
{ "ORG.LIBREOFFICE.COLOR", "ORG.LIBREOFFICE.COLOR", NOID, NOID,
3, 4, V, { VR }, FUNCFLAG_MACROCALL_NEW },
commit 24fe9e30d5b9c85da55c8f2ba85d0c3a50fa180a
Author: Eike Rathke <er...@redhat.com>
Date: Fri Jul 15 13:16:07 2016 +0200
STYLE only one parameter required, two optional
Change-Id: Ifb0fa665a6ae3af03c307052a45bba5cf77b9208
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index 3ab4656..665dd94 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -622,8 +622,8 @@ static const XclFunctionInfo saFuncTable_OOoLO[] =
EXC_FUNCENTRY_OOO_IBR( ocEasterSunday,1,1, 0, "EASTERSUNDAY" ), // was
written wrongly, read it
EXC_FUNCENTRY_OOO( ocCurrent, 0, 0, 0, "ORG.OPENOFFICE.CURRENT" ),
EXC_FUNCENTRY_OOO_IBR( ocCurrent, 0, 0, 0, "CURRENT" ), // was
written wrongly, read it
- EXC_FUNCENTRY_OOO( ocStyle, 3, 3, 0, "ORG.OPENOFFICE.STYLE" ),
- EXC_FUNCENTRY_OOO_IBR( ocStyle, 3, 3, 0, "STYLE" ), // was
written wrongly, read it
+ EXC_FUNCENTRY_OOO( ocStyle, 1, 3, 0, "ORG.OPENOFFICE.STYLE" ),
+ EXC_FUNCENTRY_OOO_IBR( ocStyle, 1, 3, 0, "STYLE" ), // was
written wrongly, read it
EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, "ORG.OPENOFFICE.CONVERT" ),
EXC_FUNCENTRY_OOO( ocColor, 3, 4, 0, "ORG.LIBREOFFICE.COLOR" ),
EXC_FUNCENTRY_OOO( ocRawSubtract, 2, MX, 0,
"ORG.LIBREOFFICE.RAWSUBTRACT" ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
