summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-07-14 18:30:43 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-07-18 10:02:06 +0000
commitb1ba2092631c4f05e14a0280978e96f4494a78d3 (patch)
tree755c7da772228c262fabd4d8e2cc5fc6e2394c14
parent1cf7025df7f825326ce57b4e2817ee9544f059b7 (diff)
forward compatibility for several _xlfn.ORG.OPENOFFICE.* functions in OOXML
as they will be written by LibreOffice 5.3 ERRORTYPE, MULTIRANGE, GOALSEEK, EASTERSUNDAY, CURRENT and STYLE. Change-Id: Ifad317ccb2ae6dd0e53cadf2ad298490c14f1010 Reviewed-on: https://gerrit.libreoffice.org/27225 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/core/tool/compiler.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index adff3f468e92..5f827b9c027c 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2750,7 +2750,14 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
OpCode eOp;
};
static const FunctionName aOoxmlAliases[] = {
- { "EFFECTIVE", ocEffective } // EFFECTIVE -> EFFECT
+ { "EFFECTIVE", ocEffective }, // EFFECTIVE -> EFFECT
+ // LibreOffice 5.3 will correctly write this, be able to read it.
+ { "_xlfn.ORG.OPENOFFICE.ERRORTYPE", ocErrorType }, // _xlfn.ORG.OPENOFFICE.ERRORTYPE -> ERRORTYPE
+ { "_xlfn.ORG.OPENOFFICE.MULTIRANGE", ocMultiArea }, // _xlfn.ORG.OPENOFFICE.MULTIRANGE -> MULTIRANGE
+ { "_xlfn.ORG.OPENOFFICE.GOALSEEK", ocBackSolver }, // _xlfn.ORG.OPENOFFICE.GOALSEEK -> GOALSEEK
+ { "_xlfn.ORG.OPENOFFICE.EASTERSUNDAY", ocEasterSunday }, // _xlfn.ORG.OPENOFFICE.EASTERSUNDAY -> EASTERSUNDAY
+ { "_xlfn.ORG.OPENOFFICE.CURRENT", ocCurrent }, // _xlfn.ORG.OPENOFFICE.CURRENT -> CURRENT
+ { "_xlfn.ORG.OPENOFFICE.STYLE", ocStyle } // _xlfn.ORG.OPENOFFICE.STYLE -> STYLE
};
for (const FunctionName& rOoxmlAlias : aOoxmlAliases)
{