[gnumeric] adjust ODF import/export of *SUMPRODUCT

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

commit 361e7a54a810c03717f58823694bc17245dc0986
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Oct 31 13:36:53 2011 -0600

    adjust ODF import/export of *SUMPRODUCT
    
    2011-10-31  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_func_map_in): adjust SUMPRODUCT import
    	* openoffice-write.c (odf_expr_func_handler) adjust SUMPRODUCT export
    
    2011-10-31 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* functions.c (help_sumproduct): add compatibility statement
    	(help_odf_sumproduct): add compatibility statement

 plugins/fn-math/ChangeLog             |    5 +++++
 plugins/fn-math/functions.c           |    6 +++++-
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-read.c  |    1 +
 plugins/openoffice/openoffice-write.c |    2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/plugins/fn-math/ChangeLog b/plugins/fn-math/ChangeLog
index 9f4d9f1..2f413e5 100644
--- a/plugins/fn-math/ChangeLog
+++ b/plugins/fn-math/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-31 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* functions.c (help_sumproduct): add compatibility statement
+	(help_odf_sumproduct): add compatibility statement
+
 2011-10-31  Morten Welinder  <terra gnome org>
 
 	* functions.c (gnumeric_sumproduct_common): New function extracted
diff --git a/plugins/fn-math/functions.c b/plugins/fn-math/functions.c
index c13ea48..ddbb10e 100644
--- a/plugins/fn-math/functions.c
+++ b/plugins/fn-math/functions.c
@@ -2949,7 +2949,9 @@ static GnmFuncHelp const help_sumproduct[] = {
 	"numbers 13, 22, 31, 33, and 39.  Then\n"
 	"SUMPRODUCT(A1:A5,B1:B5) equals 3370.\n"
 #endif
-	{ GNM_FUNC_HELP_SEEALSO, "SUM,PRODUCT,G_PRODUCT" },
+	{ GNM_FUNC_HELP_EXCEL, F_("This function is Excel compatible.") },
+	{ GNM_FUNC_HELP_ODF, F_("This function is not OpenFormula compatible. Use ODF.SUMPRODUCT instead.") },
+	{ GNM_FUNC_HELP_SEEALSO, "SUM,PRODUCT,G_PRODUCT,ODF.SUMPRODUCT" },
 	{ GNM_FUNC_HELP_END }
 };
 
@@ -2963,6 +2965,8 @@ static GnmFuncHelp const help_odf_sumproduct[] = {
 	{ GNM_FUNC_HELP_NOTE, F_("If arrays or range arguments do not have the same dimensions, "
 				 "return #VALUE! error.") },
 	{ GNM_FUNC_HELP_NOTE, F_("This function differs from SUMPRODUCT by considering booleans.") },
+	{ GNM_FUNC_HELP_EXCEL, F_("This function is not Excel compatible. Use SUMPRODUCT instead.") },
+	{ GNM_FUNC_HELP_ODF, F_("This function is OpenFormula compatible.") },
 	{ GNM_FUNC_HELP_SEEALSO, "SUMPRODUCT,SUM,PRODUCT,G_PRODUCT" },
 	{ GNM_FUNC_HELP_END }
 };
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 2d2c60f..9679a69 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2011-10-31  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (oo_func_map_in): adjust SUMPRODUCT import
+	* openoffice-write.c (odf_expr_func_handler) adjust SUMPRODUCT export
+
+2011-10-31  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (opendoc_content_dtd): add table:shapes
 
 2011-10-28  Jean Brefort  <jean brefort normalesup org>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index ab9977d..f5b2a58 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -9671,6 +9671,7 @@ oo_func_map_in (GnmConventions const *convs, Workbook *scope,
 		{ "LEGACY.NORMSINV","NORMSINV" },
 		{ "PDURATION","G_DURATION" },
 		{ "PHI","NORMDIST" },              /* see handler */
+		{ "SUMPRODUCT","ODF.SUMPRODUCT" },
 		{ "USDOLLAR","DOLLAR" },
 
 /* { "ADDRESS","ADDRESS" },       also  see handler */
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 044104b..dd660b2 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -2427,7 +2427,7 @@ odf_expr_func_handler (GnmConventionsOut *out, GnmExprFunction const *func)
 		{ "SUM","SUM" },
 		{ "SUMIF","SUMIF" },
 		/* { "SUMIFS","SUMIFS" },  not implemented */
-		{ "SUMPRODUCT","SUMPRODUCT" },
+		{ "ODF.SUMPRODUCT","SUMPRODUCT" },
 		{ "SUMSQ","SUMSQ" },
 		{ "SUMX2MY2","SUMX2MY2" },
 		{ "SUMX2PY2","SUMX2PY2" },