diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2015-09-23 10:17:21 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-11-28 14:15:40 +0100 |
| commit | b74638b54342a545929dec2cc64ba54b326f5fcc (patch) | |
| tree | fdcd42038683931d451d155c8e773ab579079c8f | |
| parent | 8a7ad1caf962d9978e4fa31d025c736355e93859 (diff) | |
tdf#94214 ODFF function FINV incorrectly saved as COM.MICROSOFT.F.INV
Reviewed-on: https://gerrit.libreoffice.org/18792
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@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@redhat.com>
(cherry picked from commit 656667ae1c23a35800bb60f9aea09b6a963c2f8a)
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 534dafcb2651..ed0aeca4522f 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 b2d94bfa871a..2bec06721c86 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 b31020b69556..52b175785e78 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 }, |