[goffice] Fix output of scientific number formats to ODF. [#672353]

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

commit 6c3546438f8c33e28c1c4ae1db14ffc1260af988
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Mar 18 12:44:25 2012 -0600

    Fix output of scientific number formats to ODF. [#672353]
    
    2012-03-18 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* goffice/utils/go-format.c (go_format_output_scientific_number_to_odf):
    	fix output of scientific formats

 ChangeLog                 |    5 +++++
 NEWS                      |    2 ++
 goffice/utils/go-format.c |   12 ++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9f7da62..8a662fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-18 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* goffice/utils/go-format.c (go_format_output_scientific_number_to_odf):
+	fix output of scientific formats
+
 2012-03-16  Morten Welinder  <terra gnome org>
 
 	* goffice/utils/go-file.c (go_url_show): Remove.  (Use
diff --git a/NEWS b/NEWS
index f8bcabb..8ddaa3d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 goffice 0.9.3:
 
+Andreas:
+	* Fix output of scientific number formats to ODF. [#672353]
 Jean:
 	* Add introspection support. [#670161]
 	* Make introspection build when libgoffice is not installed [#671699]
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 6288f42..438c486 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -8222,8 +8222,16 @@ go_format_output_scientific_number_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
 				hashes++;
 			break;
 
-		case 'e':
-		case 'E': {
+#ifdef ALLOW_SI_APPEND
+		case TOK_EXP_SI:
+#endif
+#ifdef ALLOW_EE_MARKUP
+		case TOK_EXP_MU:
+#ifdef ALLOW_SI_APPEND
+		case TOK_EXP_MU_SI:
+#endif
+#endif
+		case TOK_EXP: {
 			gboolean use_literal_E;
 
 			if (number_completed)