[gnumeric] Fully read sceintific format from ODF.
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fully read sceintific format from ODF.
- Date: Fri, 5 Aug 2011 20:43:23 +0000 (UTC)
commit ac90436acf27585bdde2f821554db121cdae6a0b
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Fri Aug 5 14:42:43 2011 -0600
Fully read sceintific format from ODF.
2011-08-05 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (odf_scientific): read gnm:literal-E
NEWS | 1 +
plugins/openoffice/ChangeLog | 4 ++++
plugins/openoffice/openoffice-read.c | 8 ++++++--
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index d8f89cd..4fb25bd 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Andreas:
[#584380][#651561]
* Clarify the distinction beween open/save and import/export.
* Fix enabling of modify comment or hyperlink. [#655877]
+ * Fully read sceintific format from ODF.
Jean:
* Make things build against gtk+-3.0.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 3154656..3ddad60 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,9 @@
2011-08-05 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-read.c (odf_scientific): read gnm:literal-E
+
+2011-08-05 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-read.c (odf_scientific): read min-exponent-digits
2011-08-01 Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index eee651d..4d9ac6d 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -4023,7 +4023,7 @@ odf_scientific (GsfXMLIn *xin, xmlChar const **attrs)
OOParseState *state = (OOParseState *)xin->user_state;
GOFormatDetails *details;
gboolean engineering = FALSE;
-/* int min_exp_digits = 1; */
+ gboolean use_literal_E = FALSE;
if (state->cur_format.accum == NULL)
return;
@@ -4042,9 +4042,13 @@ odf_scientific (GsfXMLIn *xin, xmlChar const **attrs)
&details->exponent_digits, 0, 30))
;
else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "engineering",
- &engineering));
+ &engineering))
+ ;
+ else if (oo_attr_bool (xin, attrs, OO_GNUM_NS_EXT, "literal-E",
+ &use_literal_E));
if (engineering)
details->exponent_step = 3;
+ details->use_markup = !use_literal_E;
go_format_generate_str (state->cur_format.accum, details);
go_format_details_free (details);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]