[Libreoffice-commits] core.git: formula/source sc/source

[Eike Rathke]

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

New commits:
commit fe4d72b56319fe7820d973794fc937d79aeec64a
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Aug 21 15:41:03 2014 +0200

    it's about time to write GOALSEEK as ODFF ORG.OPENOFFICE.GOALSEEK
    
    Change-Id: Ie5a0464b49baae62e217e87f4d0040151f3aa8a5

diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 6f7f8d5..b6816c7 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -287,7 +287,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_MAT_MULT { Text = "MMULT" ; };
     String SC_OPCODE_MAT_TRANS { Text = "TRANSPOSE" ; };
     String SC_OPCODE_MATRIX_UNIT { Text = "MUNIT" ; };
-    String SC_OPCODE_BACK_SOLVER { Text = "GOALSEEK" ; };
+    String SC_OPCODE_BACK_SOLVER { Text = "ORG.OPENOFFICE.GOALSEEK" ; };
     String SC_OPCODE_HYP_GEOM_DIST { Text = "HYPGEOMDIST" ; };
     String SC_OPCODE_HYP_GEOM_DIST_MS { Text = "COM.MICROSOFT.HYPGEOM.DIST" ; };
     String SC_OPCODE_LOG_NORM_DIST { Text = "LOGNORMDIST" ; };
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 788dd0e..93d8f19 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2425,8 +2425,9 @@ bool ScCompiler::IsOpCode( const OUString& rName, bool bInArray )
             { "EASTERSUNDAY",   ocEasterSunday },   // EASTERSUNDAY -> ORG.OPENOFFICE.EASTERSUNDAY
             { "ZGZ",            ocZGZ },            // ZGZ -> RRI
             { "COLOR",          ocColor },          // COLOR -> ORG.LIBREOFFICE.COLOR
+            { "GOALSEEK",       ocBackSolver }      // GOALSEEK -> ORG.OPENOFFICE.GOALSEEK
             // Renamed new names, prepare to read future names:
-            { "ORG.OPENOFFICE.GOALSEEK", ocBackSolver } // GOALSEEK -> ORG.OPENOFFICE.GOALSEEK
+            //{ "ORG.OPENOFFICE.XXX", ocXXX }         // XXX -> ORG.OPENOFFICE.XXX
         };
         static const size_t nOdffAliases = sizeof(aOdffAliases) / sizeof(aOdffAliases[0]);
         for (size_t i=0; i<nOdffAliases; ++i)