[gnumeric] New GnmSOPath sheet objects.
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] New GnmSOPath sheet objects.
- Date: Sun, 26 Aug 2012 09:55:59 +0000 (UTC)
commit 6fca567721fe1b535d508428e0eaf9eb5700e17d
Author: Jean Brefort <jean brefort normalesup org>
Date: Sun Aug 26 11:53:06 2012 +0200
New GnmSOPath sheet objects.
ChangeLog | 7 +
plugins/openoffice/ChangeLog | 4 +
plugins/openoffice/openoffice-read.c | 10 +-
src/Makefile.am | 2 +
src/gnm-so-path.c | 521 ++++++++++++++++++++++++++++++++++
src/gnm-so-path.h | 35 +++
src/xml-sax-read.c | 4 +
7 files changed, 582 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a703684..42b1791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-26 Jean Brefort <jean brefort normalesup org>
+
+ * src/Makefile.am: add new GOPath based sheet objects.
+ * src/gnm-so-path.c: ditto.
+ * src/gnm-so-path.h: ditto.
+ * src/xml-sax-read.c (xml_sax_read_obj): ditto.
+
2012-08-16 Jean Brefort <jean brefort normalesup org>
* all: fixed introspection warnings.
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 4a358e3..c34b3fd 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-26 Jean Brefort <jean brefort normalesup org>
+
+ * openoffice-read.c (odf_custom_shape_end): use GnmSOPath when possible.
+
2012-08-16 Andreas J. Guelzow <aguelzow pyrshep ca>
* plugin.xml.in: use the standards terms of conformance rather than
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 4dca388..a37fc31 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -62,6 +62,7 @@
#include <graph.h>
#include <gnm-so-filled.h>
#include <gnm-so-line.h>
+#include <gnm-so-path.h>
#include <hlink.h>
@@ -9100,7 +9101,14 @@ odf_custom_shape_end (GsfXMLIn *xin, GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin->user_state;
if (state->chart.cs_type) {
- if (0 == g_ascii_strcasecmp (state->chart.cs_type, "ellipse") &&
+ GOPath *path = go_path_new_from_odf_enhanced_path (state->chart.cs_enhanced_path, NULL);
+ if (path) {
+ odf_custom_shape_replace_object
+ (state, g_object_new (GNM_SO_PATH_TYPE,
+ "path", path, NULL));
+ go_path_free (path);
+ }
+ else if (0 == g_ascii_strcasecmp (state->chart.cs_type, "ellipse") &&
g_str_has_prefix (state->chart.cs_enhanced_path, "U ")) {
/* We have already created an ellipse */
} else if (0 == g_ascii_strcasecmp (state->chart.cs_type, "rectangle") &&
diff --git a/src/Makefile.am b/src/Makefile.am
index 7679ca5..aa1b4e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,6 +168,7 @@ libspreadsheet_la_SOURCES = \
sheet-object-cell-comment.c \
gnm-so-filled.c \
gnm-so-line.c \
+ gnm-so-path.c \
gnm-so-polygon.c \
sheet-object-component.c \
sheet-object-graph.c \
@@ -298,6 +299,7 @@ libspreadsheet_include_HEADERS = \
sheet-object-widget-impl.h \
gnm-so-filled.h \
gnm-so-line.h \
+ gnm-so-path.h \
gnm-so-polygon.h \
sheet-object-component.h \
sheet-object-graph.h \
diff --git a/src/gnm-so-path.c b/src/gnm-so-path.c
new file mode 100644
index 0000000..e27392b
--- /dev/null
+++ b/src/gnm-so-path.c
@@ -0,0 +1,521 @@
+/*
+ * gnm-so-path.c
+ *
+ * Copyright (C) 2012 Jean BrÃfort <jean brefort normalesup org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ */
+
+#include <gnumeric-config.h>
+#include "gnumeric.h"
+#include "application.h"
+#include "gnm-so-path.h"
+#include "sheet-object-impl.h"
+#include "sheet.h"
+#include "xml-sax.h"
+
+#include <goffice/goffice.h>
+#include <gsf/gsf-impl-utils.h>
+#include <glib/gi18n-lib.h>
+
+#define CXML2C(s) ((char const *)(s))
+
+static inline gboolean
+attr_eq (const xmlChar *a, const char *s)
+{
+ return !strcmp (CXML2C (a), s);
+}
+
+#define GNM_SO_PATH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_SO_PATH_TYPE, GnmSOPath))
+
+typedef struct {
+ SheetObject base;
+ GOStyle *style;
+ GOPath *path;
+ double x_offset, y_offset, width, height;
+
+ char *text;
+ PangoAttrList *markup;
+ struct {
+ double top, bottom, left, right;
+ } margin_pts;
+} GnmSOPath;
+typedef SheetObjectClass GnmSOPathClass;
+
+#ifdef GNM_WITH_GTK
+#include "gnm-pane.h"
+
+typedef struct {
+ SheetObjectView base;
+ GocItem *path, *text;
+} GnmSOPathView;
+
+static void
+so_path_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean visible)
+{
+ GnmSOPathView *spv = (GnmSOPathView *) sov;
+
+ if (visible) {
+ SheetObject *so = sheet_object_view_get_so (sov);
+ GnmSOPath const *sop = GNM_SO_PATH (so);
+ GOPath *path;
+ double scale, x_scale, y_scale, x, y;
+ if (sop->path == NULL || sop->width <=0. || sop->height <=0.)
+ return;
+
+ scale = goc_canvas_get_pixels_per_unit (GOC_ITEM (sov)->canvas);
+ x_scale = fabs (coords[2] - coords[0]) / sop->width / scale;
+ y_scale = fabs (coords[3] - coords[1]) / sop->height / scale;
+ x = MIN (coords[0], coords[2]) / scale - sop->x_offset * x_scale;
+ y = MIN (coords[1], coords[3]) / scale - sop->y_offset * y_scale;
+
+ path = go_path_scale (sop->path, x_scale, y_scale);
+ goc_item_set (spv->path, "x", x, "y", y, "path", path, NULL);
+ go_path_free (path);
+
+ if (spv->text != NULL && GOC_ITEM (spv->text)) {
+ double x0, y0, x1, y1;
+ goc_item_get_bounds (spv->path, &x0, &y0, &x1, &y1);
+ x1 += x0 + (sop->margin_pts.left - sop->margin_pts.right);
+ y1 += y0 + (sop->margin_pts.top - sop->margin_pts.bottom);
+ x1 = MAX (x1, DBL_MIN);
+ y1 = MAX (y1, DBL_MIN);
+
+ goc_item_set (GOC_ITEM (spv->text),
+ "x", x1 / 2.,
+ "y", y1 / 2.,
+ "clip-height", y1,
+ "clip-width", x1,
+ "wrap-width", x1,
+ NULL);
+ }
+ } else
+ goc_item_hide (GOC_ITEM (sov));
+}
+
+static void
+so_path_goc_view_class_init (SheetObjectViewClass *sov_klass)
+{
+ sov_klass->set_bounds = so_path_view_set_bounds;
+}
+
+typedef SheetObjectViewClass GnmSOPathViewClass;
+static GSF_CLASS (GnmSOPathView, so_path_goc_view,
+ so_path_goc_view_class_init, NULL,
+ SHEET_OBJECT_VIEW_TYPE)
+
+#endif
+
+/*****************************************************************************/
+
+static SheetObjectClass *gnm_so_path_parent_class;
+enum {
+ SOP_PROP_0,
+ SOP_PROP_STYLE,
+ SOP_PROP_PATH,
+ SOP_PROP_TEXT,
+ SOP_PROP_MARKUP
+};
+
+
+static GOStyle *
+sop_default_style (void)
+{
+ GOStyle *res = go_style_new ();
+ res->interesting_fields = GO_STYLE_OUTLINE | GO_STYLE_FILL;
+ res->line.width = 0; /* hairline */
+ res->line.color = GO_COLOR_BLACK;
+ res->line.dash_type = GO_LINE_SOLID; /* anything but 0 */
+ res->line.join = CAIRO_LINE_JOIN_ROUND;
+ res->fill.type = GO_STYLE_FILL_PATTERN;
+ go_pattern_set_solid (&res->fill.pattern, GO_COLOR_WHITE);
+ return res;
+}
+
+#ifdef GNM_WITH_GTK
+#include <sheet-control-gui.h>
+#include <dialogs/dialogs.h>
+
+static void
+cb_gnm_so_path_style_changed (GocItem *item, GnmSOPath const *sop)
+{
+ GOStyle const *style = sop->style;
+ goc_item_set (item, "style", style, NULL);
+}
+
+static void
+gnm_so_path_user_config (SheetObject *so, SheetControl *sc)
+{
+ GnmSOPath *sop = GNM_SO_PATH (so);
+ dialog_so_styled (scg_wbcg (SHEET_CONTROL_GUI (sc)), G_OBJECT (so),
+ sop->style, sop_default_style (),
+ _("Filled Object Properties"),
+ SO_STYLED_TEXT);
+}
+
+static void
+cb_gnm_so_path_changed (GnmSOPath const *sop,
+ G_GNUC_UNUSED GParamSpec *pspec,
+ GnmSOPathView *group)
+{
+ cb_gnm_so_path_style_changed (GOC_ITEM (group->path), sop);
+
+ if (sop->text != NULL && *sop->text != 0) {
+ /* set a font, a very bad solution, but will do until we move to GOString */
+ PangoFontDescription *desc = pango_font_description_from_string ("Sans 10");
+ GOStyle *style;
+ if (group->text == NULL) {
+ double x0, y0, x1, y1;
+ goc_item_get_bounds (group->path, &x0, &y0, &x1, &y1);
+ x1 += x0 + (sop->margin_pts.left - sop->margin_pts.right);
+ y1 += y0 + (sop->margin_pts.top - sop->margin_pts.bottom);
+ x1 = MAX (x1, DBL_MIN);
+ y1 = MAX (y1, DBL_MIN);
+ group->text = goc_item_new (GOC_GROUP (group), GOC_TYPE_TEXT,
+ "anchor", GO_ANCHOR_CENTER,
+ "clip", TRUE,
+ "x", x1 / 2.,
+ "y", y1 / 2.,
+ "attributes", sop->markup,
+ NULL);
+ }
+ style = go_styled_object_get_style (GO_STYLED_OBJECT (group->text));
+ go_style_set_font_desc (style, desc);
+ goc_item_set (group->text,
+ "text", sop->text,
+ "attributes", sop->markup,
+ NULL);
+ } else if (group->text != NULL) {
+ g_object_unref (group->text);
+ group->text = NULL;
+ }
+}
+
+static SheetObjectView *
+gnm_so_path_new_view (SheetObject *so, SheetObjectViewContainer *container)
+{
+ GnmSOPath *sop = GNM_SO_PATH (so);
+ GnmSOPathView *item = (GnmSOPathView *) goc_item_new (
+ gnm_pane_object_group (GNM_PANE (container)),
+ so_path_goc_view_get_type (),
+ NULL);
+ item->path = goc_item_new (GOC_GROUP (item),
+ GOC_TYPE_PATH,
+ "closed", TRUE,
+ NULL);
+ cb_gnm_so_path_changed (sop, NULL, item);
+ g_signal_connect_object (sop,
+ "notify::style", G_CALLBACK (cb_gnm_so_path_changed),
+ item, 0);
+ return gnm_pane_object_register (so, GOC_ITEM (item), TRUE);
+}
+
+#endif
+
+static void
+gnm_so_path_draw_cairo (SheetObject const *so, cairo_t *cr,
+ double width, double height)
+{
+ GnmSOPath *sop = GNM_SO_PATH (so);
+ GOStyle const *style = sop->style;
+
+ cairo_new_path (cr);
+ cairo_save (cr);
+ cairo_move_to (cr, -sop->x_offset, -sop->y_offset);
+ cairo_scale (cr, width / sop->width, height / sop->height);
+ go_path_to_cairo (sop->path, GO_PATH_DIRECTION_FORWARD, cr);
+ cairo_restore (cr);
+/* if (sof->is_oval) {
+ cairo_save (cr);
+ cairo_scale (cr, width, height);
+ cairo_arc (cr, .5, .5, .5, 0., 2 * M_PI);
+ cairo_restore (cr);
+ } else {
+ cairo_move_to (cr, 0., 0.);
+ cairo_line_to (cr, width, 0.);
+ cairo_line_to (cr, width, height);
+ cairo_line_to (cr, 0., height);
+ cairo_line_to (cr, 0., 0.);
+ cairo_close_path (cr);
+ }*/
+ /* Fill the shape */
+ go_style_fill (style, cr, TRUE);
+ /* Draw the line */
+ if (go_style_set_cairo_line (style, cr))
+ cairo_stroke (cr);
+ else
+ cairo_new_path (cr);
+ /* Draw the text. */
+ if (sop->text != NULL && *(sop->text) != '\0') {
+ PangoLayout *pl = pango_cairo_create_layout (cr);
+ double pl_height = (height - sop->margin_pts.top
+ - sop->margin_pts.bottom) * PANGO_SCALE;
+ double pl_width = (width - sop->margin_pts.left
+ - sop->margin_pts.right) * PANGO_SCALE;
+ /* set a font, a very bad solution, but will do until we move to GOString */
+ PangoFontDescription *desc = pango_font_description_from_string ("Sans 10");
+ double const scale_h = 72. / gnm_app_display_dpi_get (TRUE);
+ double const scale_v = 72. / gnm_app_display_dpi_get (FALSE);
+ PangoRectangle r;
+ pango_layout_set_font_description (pl, desc);
+ pango_layout_set_text (pl, sop->text, -1);
+ pango_layout_set_attributes (pl, sop->markup);
+ pango_layout_set_width (pl, pl_width);
+ pango_layout_set_height (pl, pl_height);
+ cairo_save (cr);
+ pango_layout_get_extents (pl, NULL, &r);
+ cairo_move_to (cr,
+ (width - r.width / PANGO_SCALE * scale_h) / 2.,
+ (height - r.height / PANGO_SCALE * scale_v) / 2.);
+ cairo_scale (cr, scale_h, scale_v);
+ cairo_set_source_rgba (cr, GO_COLOR_TO_CAIRO (style->font.color));
+ pango_cairo_show_layout (cr, pl);
+ cairo_new_path (cr);
+ cairo_restore (cr);
+ g_object_unref(G_OBJECT (pl));
+ }
+}
+
+static void
+gnm_so_path_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
+ GnmConventions const *convs)
+{
+ GnmSOPath const *sop = GNM_SO_PATH (so);
+ char *svg = go_path_to_svg (sop->path);
+
+ gsf_xml_out_add_cstr (output, "Path", svg);
+ g_free (svg);
+ if (sop->text != NULL && *(sop->text) != '\0') {
+ gsf_xml_out_add_cstr (output, "Label", sop->text);
+ if (sop->markup != NULL) {
+ GOFormat *fmt = go_format_new_markup (sop->markup, TRUE);
+ gsf_xml_out_add_cstr (output, "LabelFormat",
+ go_format_as_XL (fmt));
+ go_format_unref (fmt);
+ }
+ }
+
+ gsf_xml_out_start_element (output, "Style");
+ go_persist_sax_save (GO_PERSIST (sop->style), output);
+ gsf_xml_out_end_element (output); /* </Style> */
+}
+
+static void
+sop_sax_style (GsfXMLIn *xin, xmlChar const **attrs)
+{
+ SheetObject *so = gnm_xml_in_cur_obj (xin);
+ GnmSOPath *sop = GNM_SO_PATH (so);
+ go_persist_prep_sax (GO_PERSIST (sop->style), xin, attrs);
+}
+
+static void
+gnm_so_path_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
+ xmlChar const **attrs,
+ GnmConventions const *convs)
+{
+ static GsfXMLInNode const dtd[] = {
+ GSF_XML_IN_NODE (STYLE, STYLE, -1, "Style", GSF_XML_NO_CONTENT, &sop_sax_style, NULL),
+ GSF_XML_IN_NODE_END
+ };
+ static GsfXMLInDoc *doc = NULL;
+ GnmSOPath *sop = GNM_SO_PATH(so);
+
+ if (NULL == doc)
+ doc = gsf_xml_in_doc_new (dtd, NULL);
+ gsf_xml_in_push_state (xin, doc, NULL, NULL, attrs);
+
+ for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
+ if (attr_eq (attrs[0], "Label"))
+ g_object_set (G_OBJECT (sop), "text", attrs[1], NULL);
+ else if (attr_eq (attrs[0], "LabelFormat")) {
+ GOFormat * fmt = go_format_new_from_XL (attrs[1]);
+ if (go_format_is_markup (fmt))
+ g_object_set (G_OBJECT (sop),
+ "markup", go_format_get_markup (fmt),
+ NULL);
+ go_format_unref (fmt);
+ } else if (attr_eq (attrs[0], "Path")) {
+ GOPath *path = go_path_new_from_svg (attrs[1]);
+ if (path) {
+ g_object_set (G_OBJECT (sop), "path", path, NULL);
+ go_path_free (path);
+ }
+ }
+}
+
+static void
+gnm_so_path_copy (SheetObject *dst, SheetObject const *src)
+{
+ GnmSOPath const *sop = GNM_SO_PATH (src);
+ GnmSOPath *new_sop = GNM_SO_PATH (dst);
+
+ g_object_unref (new_sop->style);
+ new_sop->style = go_style_dup (sop->style);
+ new_sop->x_offset = sop->x_offset;
+ new_sop->y_offset = sop->y_offset;
+ new_sop->width = sop->width;
+ new_sop->height = sop->height;
+ if (new_sop->path)
+ go_path_free (new_sop->path);
+ new_sop->path = (sop->path)? go_path_ref (sop->path): NULL;
+ gnm_so_path_parent_class->copy (dst, src);
+}
+
+static void
+gnm_so_path_set_property (GObject *obj, guint param_id,
+ GValue const *value, GParamSpec *pspec)
+{
+ GnmSOPath *sop = GNM_SO_PATH (obj);
+
+ switch (param_id) {
+ case SOP_PROP_STYLE: {
+ GOStyle *style = go_style_dup (g_value_get_object (value));
+ style->interesting_fields = GO_STYLE_OUTLINE | GO_STYLE_FILL;
+ g_object_unref (sop->style);
+ sop->style = style;
+ break;
+ }
+ case SOP_PROP_PATH: {
+ GOPath *path = g_value_get_boxed (value);
+ if (sop->path)
+ go_path_free (sop->path);
+ sop->path = NULL;
+ if (path) {
+ cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1);
+ cairo_t *cr = cairo_create (surface);
+
+ sop->path = go_path_ref (path);
+ /* evaluates the bounding rectangle */
+ go_path_to_cairo (path, GO_PATH_DIRECTION_FORWARD, cr);
+ cairo_fill_extents (cr,
+ &sop->x_offset, &sop->y_offset,
+ &sop->width, &sop->height);
+ sop->width -= sop->x_offset;
+ sop->height -= sop->y_offset;
+ cairo_destroy (cr);
+ cairo_surface_destroy (surface);
+ }
+ break;
+ }
+ case SOP_PROP_TEXT: {
+ char const *str = g_value_get_string (value);
+ g_free (sop->text);
+ sop->text = g_strdup (str == NULL ? "" : str);
+ break;
+ }
+ case SOP_PROP_MARKUP:
+ if (sop->markup != NULL)
+ pango_attr_list_unref (sop->markup);
+ sop->markup = g_value_peek_pointer (value);
+ if (sop->markup != NULL)
+ pango_attr_list_ref (sop->markup);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, param_id, pspec);
+ return;
+ }
+}
+
+static void
+gnm_so_path_get_property (GObject *obj, guint param_id,
+ GValue *value, GParamSpec *pspec)
+{
+ GnmSOPath *sop = GNM_SO_PATH (obj);
+ switch (param_id) {
+ case SOP_PROP_STYLE:
+ g_value_set_object (value, sop->style);
+ break;
+ case SOP_PROP_PATH:
+ g_value_set_boxed (value, sop->path);
+ break;
+ case SOP_PROP_TEXT :
+ g_value_set_string (value, sop->text);
+ break;
+ case SOP_PROP_MARKUP :
+ g_value_set_boxed (value, sop->markup);
+ break;
+ default :
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, param_id, pspec);
+ break;
+ }
+}
+
+static void
+gnm_so_path_finalize (GObject *object)
+{
+ GnmSOPath *sop = GNM_SO_PATH (object);
+
+ if (sop->path != NULL)
+ go_path_free (sop->path);
+ sop->path = NULL;
+ g_object_unref (sop->style);
+ sop->style = NULL;
+ g_free (sop->text);
+ sop->text = NULL;
+ if (NULL != sop->markup) {
+ pango_attr_list_unref (sop->markup);
+ sop->markup = NULL;
+ }
+ G_OBJECT_CLASS (gnm_so_path_parent_class)->finalize (object);
+}
+
+static void
+gnm_so_path_class_init (GObjectClass *gobject_class)
+{
+ SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+
+ gnm_so_path_parent_class = g_type_class_peek_parent (gobject_class);
+
+ gobject_class->finalize = gnm_so_path_finalize;
+ gobject_class->set_property = gnm_so_path_set_property;
+ gobject_class->get_property = gnm_so_path_get_property;
+ so_class->write_xml_sax = gnm_so_path_write_xml_sax;
+ so_class->prep_sax_parser = gnm_so_path_prep_sax_parser;
+ so_class->copy = gnm_so_path_copy;
+ so_class->rubber_band_directly = FALSE;
+ so_class->xml_export_name = "SheetObjectPath";
+
+#ifdef GNM_WITH_GTK
+ so_class->new_view = gnm_so_path_new_view;
+ so_class->user_config = gnm_so_path_user_config;
+#endif /* GNM_WITH_GTK */
+ so_class->draw_cairo = gnm_so_path_draw_cairo;
+
+ g_object_class_install_property (gobject_class, SOP_PROP_PATH,
+ g_param_spec_boxed ("path", NULL, NULL, GO_TYPE_PATH,
+ GSF_PARAM_STATIC | G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, SOP_PROP_STYLE,
+ g_param_spec_object ("style", NULL, NULL, GO_TYPE_STYLE,
+ GSF_PARAM_STATIC | G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, SOP_PROP_TEXT,
+ g_param_spec_string ("text", NULL, NULL, NULL,
+ GSF_PARAM_STATIC | G_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, SOP_PROP_MARKUP,
+ g_param_spec_boxed ("markup", NULL, NULL, PANGO_TYPE_ATTR_LIST,
+ GSF_PARAM_STATIC | G_PARAM_READWRITE));
+}
+
+static void
+gnm_so_path_init (GObject *obj)
+{
+ GnmSOPath *sop = GNM_SO_PATH (obj);
+ sop->style = sop_default_style ();
+}
+
+GSF_CLASS (GnmSOPath, gnm_so_path,
+ gnm_so_path_class_init, gnm_so_path_init,
+ SHEET_OBJECT_TYPE)
diff --git a/src/gnm-so-path.h b/src/gnm-so-path.h
new file mode 100644
index 0000000..4dd568c
--- /dev/null
+++ b/src/gnm-so-path.h
@@ -0,0 +1,35 @@
+/*
+ * gnm-so-path.h
+ *
+ * Copyright (C) 2012 Jean BrÃfort <jean brefort normalesup org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#ifndef _GNM_SO_PATH_H_
+# define _GNM_SO_PATH_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GNM_SO_PATH_TYPE (gnm_so_path_get_type ())
+#define IS_GNM_SO_PATH(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_SO_PATH_TYPE))
+GType gnm_so_path_get_type (void);
+
+G_END_DECLS
+
+#endif /* _GNM_SO_PATH_H_ */
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index be87a9d..e069d86 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -57,6 +57,7 @@
#include "sheet-object-cell-comment.h"
#include "gnm-so-line.h"
#include "gnm-so-filled.h"
+#include "gnm-so-path.h"
#include "gnm-format.h"
#include "sheet-object-graph.h"
#include "sheet-object-component.h"
@@ -2336,6 +2337,8 @@ xml_sax_read_obj (GsfXMLIn *xin, gboolean needs_cleanup,
so = g_object_new (GNM_SO_FILLED_TYPE, NULL);
else if (!strcmp (type_name, "SheetObjectComponent"))
so = sheet_object_component_new (NULL);
+ else if (!strcmp (type_name, "SheetObjectPath"))
+ so = g_object_new (GNM_SO_PATH_TYPE, NULL);
else {
GType type = g_type_from_name (type_name);
@@ -3098,6 +3101,7 @@ GSF_XML_IN_NODE_FULL (START, WB, GNM, "Workbook", GSF_XML_NO_CONTENT, TRUE, TRUE
GSF_XML_IN_NODE (SHEET_OBJECTS, OBJECT_GRAPH, GNM, "SheetObjectGraph", GSF_XML_NO_CONTENT, &xml_sax_object_start, &xml_sax_object_end),
GSF_XML_IN_NODE (SHEET_OBJECTS, OBJECT_IMAGE, GNM, "SheetObjectImage", GSF_XML_NO_CONTENT, &xml_sax_object_start, &xml_sax_object_end),
GSF_XML_IN_NODE (SHEET_OBJECTS, OBJECT_COMPONENT, GNM, "SheetObjectComponent", GSF_XML_NO_CONTENT, &xml_sax_object_start, &xml_sax_object_end),
+ GSF_XML_IN_NODE (SHEET_OBJECTS, OBJECT_PATH, GNM, "SheetObjectPath", GSF_XML_NO_CONTENT, &xml_sax_object_start, &xml_sax_object_end),
GSF_XML_IN_NODE (WB, WB_GEOMETRY, GNM, "Geometry", GSF_XML_NO_CONTENT, &xml_sax_wb_view, NULL),
GSF_XML_IN_NODE (WB, WB_VIEW, GNM, "UIData", GSF_XML_NO_CONTENT, &xml_sax_wb_view, NULL),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
