[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 55a38964c28ab2fa9deac8db629c5940284b2394
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jul 14 18:30:43 2016 +0200

    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/27226
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index c6684c8..e161b12 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2682,7 +2682,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)
         {