[gnumeric] Add more determinism to ODF export. [#747916]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Add more determinism to ODF export. [#747916]
- Date: Wed, 15 Apr 2015 14:53:05 +0000 (UTC)
commit 7a261ba8700638c9ab7e21c0291ca9145d37829a
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Wed Apr 15 08:49:50 2015 -0600
Add more determinism to ODF export. [#747916]
2015-04-15 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_office_styles): use
gnm_hash_table_foreach_ordered for text_colours
(odf_write_graphs): use gnm_hash_table_foreach_ordered
for fill_images
NEWS | 1 +
plugins/openoffice/ChangeLog | 7 +++++++
plugins/openoffice/openoffice-write.c | 13 ++++++++++---
3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index f3ad661..0913182 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Andreas:
* Improve pattern fill round trip through ODF.
* Fix export of Ring plots to ODF. [#747763]
* Fix import/export of Pie charts from/to ODF. [#747807]
+ * Add more determinism to ODF export. [#747916]
Jean:
* Fix signal handling while running Python. [#744638]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 21cb640..9ba06e0 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,12 @@
2015-04-15 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-write.c (odf_write_office_styles): use
+ gnm_hash_table_foreach_ordered for text_colours
+ (odf_write_graphs): use gnm_hash_table_foreach_ordered
+ for fill_images
+
+2015-04-15 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-read.c (odf_scale_initial_angle): new
(od_style_prop_chart): use odf_scale_initial_angle
(oo_chart_axis): do not add axes to ring and pie plots
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 998d815..58c0103 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -5419,7 +5419,11 @@ odf_write_office_styles (GnmOOExport *state)
by_value_str,
state);
- g_hash_table_foreach (state->text_colours, (GHFunc) odf_write_text_colours, state);
+ gnm_hash_table_foreach_ordered
+ (state->text_colours,
+ (GHFunc) odf_write_text_colours,
+ by_key_str,
+ state);
if (state->default_style_region->style != NULL) {
gsf_xml_out_start_element (state->xml, STYLE "default-style");
@@ -8684,8 +8688,11 @@ odf_write_graphs (SheetObject *so, char const *name, GnmOOExport *state)
}
g_free (fullname);
- g_hash_table_foreach (state->graph_fill_images, (GHFunc) odf_write_fill_images,
- state);
+ gnm_hash_table_foreach_ordered
+ (state->graph_fill_images,
+ (GHFunc) odf_write_fill_images,
+ by_value_str,
+ state);
g_hash_table_remove_all (state->graph_dashes);
g_hash_table_remove_all (state->graph_hatches);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]