[gnumeric] Fix export/import of CONCATENATE to and from ODF.

[Andreas J. Guelzow <guelzow src gnome org>]

commit 1946b4aa25ab4293752a44aafa8fa5b71276fe66
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat Oct 14 19:00:56 2017 -0600

    Fix export/import of CONCATENATE to and from ODF.
    
    2017-10-14  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-write.c (odf_expr_func_handler): write CONCATENATE
        as COM.MICROSOFT.CONCAT
        * openoffice-read.c (oo_func_map_in): import CONCATENATE as
        ODF.CONCATENATE

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    7 +++++++
 plugins/openoffice/openoffice-read.c  |    2 +-
 plugins/openoffice/openoffice-write.c |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5ed1dc8..eab760b 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Andreas:
        * Improve contour plot export/import to/from ODF. [#788728]
        * Improve contour plot import of Excel generated ODF. [#788801]
        * Improve surface plot export to ODF. [#788447]
+       * Fix export/import of CONCATENATE to and from ODF.
 
 Morten:
        * Convert all xpm files to png.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 347e9e4..9e2d9cc 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,10 @@
+2017-10-14  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-write.c (odf_expr_func_handler): write CONCATENATE
+       as COM.MICROSOFT.CONCAT
+       * openoffice-read.c (oo_func_map_in): import CONCATENATE as 
+       ODF.CONCATENATE
+
 2017-10-12  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-write.c (odf_write_axis_categories): add dim argument
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 71508bd..d97eaec 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -13059,6 +13059,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 /* The following is a list of the functions defined in ODF OpenFormula draft 20090508 */
 /* where we do not have a function with the same name                                 */
 
+               { "CONCATENATE","ODF.CONCATENATE" },
                { "DDE","ODF.DDE" },
                { "MULTIPLE.OPERATIONS","ODF.MULTIPLE.OPERATIONS" },
 
@@ -13192,7 +13193,6 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 /* { "COMBIN","COMBIN" }, */
 /* { "COMBINA","COMBINA" }, */
 /* { "COMPLEX","COMPLEX" }, */
-/* { "CONCATENATE","CONCATENATE" }, */
 /* { "CONFIDENCE","CONFIDENCE" }, */
 /* { "CONVERT","CONVERT" }, */
 /* { "CORREL","CORREL" }, */
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 14e4db0..7d69701 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -2300,7 +2300,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
                { "COMBINA","COMBINA" },
                { "COMPLEX","COMPLEX" },
                { "CONCAT","COM.MICROSOFT.CONCAT" },
-               { "CONCATENATE","CONCATENATE" },
+               { "CONCATENATE","COM.MICROSOFT.CONCAT" },
                { "CONFIDENCE","CONFIDENCE" },
                { "CONVERT","CONVERT" },
                { "CORREL","CORREL" },