[gnumeric] Fix import/export of Pie charts from/to ODF. [#747807]



commit 1634bf8013501ae8db744b5b330f36e5a49e5d74
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Apr 14 00:36:45 2015 -0600

    Fix import/export of Pie charts from/to ODF. [#747807]
    
    2015-04-14  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * openoffice-read.c (od_style_prop_chart): read
        chart:initial-angle
        * openoffice-write.c (odf_write_plot_style): write
        chart:initial-angle

 NEWS                                  |    1 +
 plugins/openoffice/ChangeLog          |    7 +++++++
 plugins/openoffice/openoffice-read.c  |    4 ++++
 plugins/openoffice/openoffice-write.c |    6 +++++-
 4 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 40df9c8..f3ad661 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Andreas:
        * Plug leak in ODF import and export. [#747590]
        * 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]
 
 Jean:
        * Fix signal handling while running Python. [#744638]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 80e7446..74e7a8d 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-14  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * openoffice-read.c (od_style_prop_chart): read
+       chart:initial-angle
+       * openoffice-write.c (odf_write_plot_style): write
+       chart:initial-angle
+
 2015-04-13  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (odf_apply_style_props): for hatch use
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index da63faf..36afe8b 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7165,6 +7165,10 @@ od_style_prop_chart (GsfXMLIn *xin, xmlChar const **attrs)
                                            "hole-size", &ftmp))
                        style->plot_props = g_slist_prepend (style->plot_props,
                                oo_prop_new_double ("center-size", ftmp));
+               else if (oo_attr_angle (xin, attrs, OO_NS_CHART,
+                                           "angle-offset", &tmp))
+                       style->plot_props = g_slist_prepend (style->plot_props,
+                               oo_prop_new_double ("initial-angle", (double) tmp));
                else if (oo_attr_bool (xin, attrs, OO_NS_CHART,
                                         "reverse-direction", &btmp))
                        style->axis_props = g_slist_prepend (style->axis_props,
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 887d1ff..13239a3 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -6960,6 +6960,10 @@ odf_write_plot_style (GnmOOExport *state, GogObject const *plot)
                                             "center-size",
                                             CHART "hole-size");
 
+       odf_write_plot_style_double (state->xml, plot,
+                                    "initial-angle",
+                                    CHART "angle-offset");
+
        if (gnm_object_has_readable_prop (plot, "interpolation",
                                          G_TYPE_NONE, NULL))
                odf_write_interpolation_attribute (state, NULL, plot);
@@ -7154,7 +7158,7 @@ odf_write_axis_style (GnmOOExport *state, GOStyle const *style,
                odf_write_plot_style_bool
                        (state->xml, axis,
                         "invert-axis", GNMSTYLE "reverse-direction");
-
+       
        odf_write_axisline_style (state, style, axis);
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]