[gnumeric] Fix export of Ring plots to ODF. [#747763]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix export of Ring plots to ODF. [#747763]
- Date: Mon, 13 Apr 2015 03:49:24 +0000 (UTC)
commit a7ac0b0146a1835107115a6604d359361761cbb8
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Sun Apr 12 21:46:15 2015 -0600
Fix export of Ring plots to ODF. [#747763]
2015-04-12 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_generic_axis): deleted
(odf_write_plot): don't even try to write axes for Pie or
Ring plots.
NEWS | 1 +
plugins/openoffice/ChangeLog | 6 ++++++
plugins/openoffice/openoffice-write.c | 23 ++++-------------------
3 files changed, 11 insertions(+), 19 deletions(-)
---
diff --git a/NEWS b/NEWS
index b430ddb..5608a04 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Andreas:
* Fix ODF import/export of unlinked checkboxes and radio buttons.
* Plug leak in ODF import and export. [#747590]
* Improve pattern fill round trip through ODF.
+ * Fix export of Ring plots to ODF. [#747763]
Jean:
* Fix signal handling while running Python. [#744638]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 3c6866e..2f8bc0b 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,11 @@
2015-04-12 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-write.c (odf_write_generic_axis): deleted
+ (odf_write_plot): don't even try to write axes for Pie or
+ Ring plots.
+
+2015-04-12 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-write.c (odf_write_regression_curve): we may use
several chart:regression-curve
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 81eac79..44b5e50 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -7883,21 +7883,6 @@ odf_write_axis_no_cats (GnmOOExport *state,
}
static void
-odf_write_generic_axis (GnmOOExport *state,
- G_GNUC_UNUSED GogObject const *chart,
- G_GNUC_UNUSED char const *axis_role,
- char const *dimension,
- G_GNUC_UNUSED odf_chart_type_t gtype,
- GSList const *series)
-{
- gsf_xml_out_start_element (state->xml, CHART "axis");
- gsf_xml_out_add_cstr (state->xml, CHART "dimension", dimension);
- gsf_xml_out_add_cstr (state->xml, CHART "style-name", "generic-axis");
- odf_write_axis_categories (state, series);
- gsf_xml_out_end_element (state->xml); /* </chart:axis> */
-}
-
-static void
odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *graph,
GogObject const *chart, GogObject const *plot, GSList *other_plots)
{
@@ -7973,9 +7958,9 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *graph,
odf_write_min_max_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogPiePlot", CHART "circle", ODF_CIRCLE,
- 5., "X-Axis", "Y-Axis", NULL,
+ 5., NULL, NULL, NULL,
odf_write_standard_series,
- odf_write_axis, odf_write_axis, odf_write_axis},
+ NULL, NULL, NULL},
{ "GogRadarPlot", CHART "radar", ODF_RADAR,
10., "Circular-Axis", "Radial-Axis", NULL,
odf_write_standard_series,
@@ -7985,9 +7970,9 @@ odf_write_plot (GnmOOExport *state, SheetObject *so, GogObject const *graph,
odf_write_standard_series,
odf_write_axis, odf_write_axis, odf_write_axis},
{ "GogRingPlot", CHART "ring", ODF_RING,
- 10., "X-Axis", "Y-Axis", NULL,
+ 10., NULL, NULL, NULL,
odf_write_standard_series,
- odf_write_generic_axis, odf_write_generic_axis, NULL},
+ NULL, NULL, NULL},
{ "GogXYPlot", CHART "scatter", ODF_SCATTER,
20., "X-Axis", "Y-Axis", NULL,
odf_write_standard_series,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]