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

[Winfried Donkers]

 formula/source/core/resource/core_resource.src |    2 +-
 sc/source/core/tool/compiler.cxx               |    2 +-
 sc/source/filter/oox/formulabase.cxx           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 656667ae1c23a35800bb60f9aea09b6a963c2f8a
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Wed Sep 23 10:17:21 2015 +0200

    tdf#94214 ODFF function FINV incorrectly saved as COM.MICROSOFT.F.INV
    
    Reviewed-on: https://gerrit.libreoffice.org/18792
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 5ba0f79e246ea970d16f366640c2ccd87e1d8786)
    
    Backported to 5-0 replacing the interim forward compatibility of
    4a33435137e4d9fb7a85c527a37edc6780170d9a
    
    Change-Id: Ic053342fde436a7053c15e32683e09b9e91f5308
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 534dafc..ed0aeca 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -378,7 +378,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_T_INV_2T { Text = "COM.MICROSOFT.T.INV.2T" ; };
     String SC_OPCODE_T_INV_MS { Text = "COM.MICROSOFT.T.INV" ; };
     String SC_OPCODE_F_INV { Text = "LEGACY.FINV" ; };
-    String SC_OPCODE_F_INV_LT { Text = "COM.MICROSOFT.F.INV" ; };
+    String SC_OPCODE_F_INV_LT { Text = "FINV" ; };
     String SC_OPCODE_F_INV_RT { Text = "COM.MICROSOFT.F.INV.RT" ; };
     String SC_OPCODE_CHI_TEST { Text = "LEGACY.CHITEST" ; };
     String SC_OPCODE_CHI_TEST_MS { Text = "COM.MICROSOFT.CHISQ.TEST" ; };
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b2d94bf..2bec067 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2635,8 +2635,8 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
             { "COLOR",          ocColor },          // COLOR -> ORG.LIBREOFFICE.COLOR
             { "GOALSEEK",       ocBackSolver },     // GOALSEEK -> ORG.OPENOFFICE.GOALSEEK
             { "COM.MICROSOFT.F.DIST", ocFDist_LT }, // fdo#40835, -> FDIST -> COM.MICROSOFT.F.DIST
+            { "COM.MICROSOFT.F.INV",  ocFInv_LT }   // tdf#94214, COM.MICROSOFT.F.INV -> FINV (ODF)
             // Renamed new names, prepare to read future names:
-            { "FINV",           ocFInv_LT },        // COM.MICROSOFT.F.INV  -> FINV
             //{ "ORG.OPENOFFICE.XXX", ocXXX }         // XXX -> ORG.OPENOFFICE.XXX
         };
         static const size_t nOdffAliases = sizeof(aOdffAliases) / sizeof(aOdffAliases[0]);
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index b31020b..52b1757 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -775,7 +775,7 @@ static const FunctionData saFuncTable2010[] =
     { "COM.MICROSOFT.CONFIDENCE.T",           "CONFIDENCE.T",        NOID,    NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
     { "FDIST",                                "F.DIST",              NOID,   NOID,    4,  4,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
     { "COM.MICROSOFT.F.DIST.RT",              "F.DIST.RT",           NOID,   NOID,    3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
-    { "COM.MICROSOFT.F.INV",                  "F.INV",               NOID,   NOID,    3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
+    { "FINV",                                 "F.INV",               NOID,   NOID,    3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
     { "COM.MICROSOFT.F.INV.RT",               "F.INV.RT",            NOID,   NOID,    3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },
     { "COM.MICROSOFT.F.TEST",                 "F.TEST",              NOID,   NOID,    2,  2,  V, { VA }, FUNCFLAG_MACROCALL_NEW },
     { "COM.MICROSOFT.EXPON.DIST",             "EXPON.DIST",          NOID,   NOID,    3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW },