[gnumeric] use Gnumeric's conventions when parsing MS's formulas

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

commit 54b9c474b27b556b269a9595a7d46eda0aa0e4cb
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun May 10 15:51:25 2009 -0600

    use Gnumeric's conventions when parsing MS's formulas
    
    2009-05-10  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_expr_parse_str): use Gnumeric's conventions when
    	  parsing MS's formulas
---
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index f0616a4..ce3b9b3 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2009-05-10  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (oo_expr_parse_str): use Gnumeric's conventions when
+	  parsing MS's formulas
+
+2009-05-10  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (OOFormula): new type
 	(oo_expr_parse_str): add OOFormula type argument and change all callers
 	(oo_cell_start): recognize "msoxl" formulas
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 2e79431..0bd0f33 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -487,8 +487,12 @@ oo_expr_parse_str (GsfXMLIn *xin, char const *str,
 	GnmParseError  perr;
 
 	parse_error_init (&perr);
-	texpr = gnm_expr_parse_str (str, pp, flags,
-		state->convs, &perr);
+	if (type == FORMULA_OPENFORMULA)
+		texpr = gnm_expr_parse_str (str, pp, flags,
+					    state->convs, &perr);
+	else
+		texpr = gnm_expr_parse_str (str, pp, flags,
+					    gnm_conventions_default, &perr);
 
 	if (texpr == NULL) {
 		oo_warning (xin, _("Unable to parse\n\t'%s'\nbecause '%s'"),