[gnumeric] Work around OpenOffice date formatting bugs. [#636131]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Work around OpenOffice date formatting bugs. [#636131]
- Date: Tue, 30 Nov 2010 18:03:52 +0000 (UTC)
commit b22f6009b1514b86be5776e00a1bfd1d679064a7
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Tue Nov 30 11:04:32 2010 -0700
Work around OpenOffice date formatting bugs. [#636131]
2010-11-30 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (styles_dtd): connect style:map handling to
number:text-style since OOo seems to use maps attached to
number:text-style to render dates that it flagged as numbers.
NEWS | 1 +
plugins/openoffice/ChangeLog | 6 ++++++
plugins/openoffice/openoffice-read.c | 4 ++--
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index ce882ab..08a2413 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.10.13
Andreas:
* Calculate residuals when using the regression tool. [#635064]
* Permit data entry by-passing autocorrection.
+ * Work around OpenOffice date formatting bugs. [#636131]
Jean
* Only disable the formula bar when a chart sheet is selected. [#636031]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 12d247a..906238b 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-30 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-read.c (styles_dtd): connect style:map handling to
+ number:text-style since OOo seems to use maps attached to
+ number:text-style to render dates that it flagged as numbers.
+
2010-11-25 Morten Welinder <terra gnome org>
* Release 1.10.12
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 0eaff9a..c0b904a 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7109,10 +7109,10 @@ GSF_XML_IN_NODE (START, OFFICE_STYLES, OO_NS_OFFICE, "styles", GSF_XML_NO_CONTEN
GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_MAP, OO_NS_STYLE, "map", GSF_XML_NO_CONTENT, &odf_map, NULL),
GSF_XML_IN_NODE (STYLE_PERCENTAGE, PERCENTAGE_TEXT_PROP, OO_NS_STYLE, "text-properties", GSF_XML_NO_CONTENT, &odf_number_color, NULL),
- GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_TEXT, OO_NS_NUMBER, "text-style", GSF_XML_NO_CONTENT, NULL, NULL),
+ GSF_XML_IN_NODE (OFFICE_STYLES, STYLE_TEXT, OO_NS_NUMBER, "text-style", GSF_XML_NO_CONTENT, &odf_number_style, &odf_number_style_end),
GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_CONTENT, OO_NS_NUMBER, "text-content", GSF_XML_NO_CONTENT, NULL, NULL),
GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_PROP, OO_NS_NUMBER, "text", GSF_XML_NO_CONTENT, NULL, NULL),
- GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_MAP, OO_NS_STYLE, "map", GSF_XML_NO_CONTENT, NULL, NULL),
+ GSF_XML_IN_NODE (STYLE_TEXT, STYLE_TEXT_MAP, OO_NS_STYLE, "map", GSF_XML_NO_CONTENT, &odf_map, NULL),
GSF_XML_IN_NODE_END
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]