[gnumeric] Add accidentally omitted handling of COMBINA and ARABIC on ODF ex- and import

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

commit 772f7f4bd098e49837db48506d4742b36e0bfdc8
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat Oct 24 00:02:33 2009 -0600

    Add accidentally omitted handling of COMBINA and ARABIC on ODF ex- and import
    
    2009-10-24  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_func_map_in): we had COMBINA and ARABIC
    	  for a while
    	* openoffice-write.c (odf_expr_func_handler): ditto

 plugins/openoffice/ChangeLog          |    6 ++++++
 plugins/openoffice/openoffice-read.c  |    2 --
 plugins/openoffice/openoffice-write.c |    4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 0dcadde..0f928d3 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-24  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (oo_func_map_in): we had COMBINA and ARABIC 
+	  for a while
+	* openoffice-write.c (odf_expr_func_handler): ditto
+
+2009-10-24  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (oo_func_map_in): we now have ISFORMULA
 	* openoffice-write.c (odf_expr_func_handler): ditto
 	
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 0e3f489..2a7953e 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4655,10 +4655,8 @@ 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                                 */
 
-		{ "ARABIC","ODF.ARABIC" },
 		{ "AVERAGEIFS","ODF.AVERAGEIFS" },
 		{ "B","ODF.B" },
-		{ "COMBINA","ODF.COMBINA" },
 		{ "COUNTIFS","ODF.COUNTIFS" },
 		{ "DDE","ODF.DDE" },
 		{ "IFNA","ODF.IFNA" },
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index a8f2271..ee28d46 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -1589,7 +1589,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
 		{ "AMORDEGRC","AMORDEGRC" },
 		{ "AMORLINC","AMORLINC" },
 		{ "AND","AND" },
-		/* { "ODF.ARABIC","ARABIC" },  not implemented */
+		{ "ARABIC","ARABIC" },
 		{ "AREAS","AREAS" },
 		{ "ASC","ASC" },
 		{ "ASIN","ASIN" },
@@ -1631,7 +1631,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
 		{ "COLUMN","COLUMN" },
 		{ "COLUMNS","COLUMNS" },
 		{ "COMBIN","COMBIN" },
-		/* { "COMBINA","COMBINA" },  not implemented */
+		{ "COMBINA","COMBINA" },
 		{ "COMPLEX","COMPLEX" },
 		{ "CONCATENATE","CONCATENATE" },
 		{ "CONFIDENCE","CONFIDENCE" },