[gnumeric] Serialize multiple paths in GsmSOPath.

[Jean BrÃfort <jbrefort src gnome org>]

commit 442745d7ff086504d63e648320e126bf83cf648c
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sun Sep 9 09:10:55 2012 +0200

    Serialize multiple paths in GsmSOPath.

 ChangeLog         |    5 +++++
 src/gnm-so-path.c |   44 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5f2c6af..d9e3663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-09  Jean Brefort  <jean brefort normalesup org>
+
+	* src/gnm-so-path.c (gnm_so_path_write_xml_sax), (sop_sax_path),
+	(gnm_so_path_prep_sax_parser): serialize multiple paths.
+
 2012-09-08  Jean Brefort  <jean brefort normalesup org>
 
 	* src/gnm-so-path.c (so_path_view_set_bounds),
diff --git a/src/gnm-so-path.c b/src/gnm-so-path.c
index ce26c5d..4a0522d 100644
--- a/src/gnm-so-path.c
+++ b/src/gnm-so-path.c
@@ -331,10 +331,8 @@ 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);
+	char *svg;
 
-	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) {
@@ -344,6 +342,20 @@ gnm_so_path_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
 			go_format_unref (fmt);
 		}
 	}
+	if (sop->path) {
+		svg = go_path_to_svg (sop->path);
+		gsf_xml_out_add_cstr (output, "Path", svg);
+		g_free (svg);
+	} else if (sop->paths) {
+		unsigned i;
+		for (i = 0; i < sop->paths->len; i++) {
+			gsf_xml_out_start_element (output, "Path");
+			svg = go_path_to_svg ((GOPath *) g_ptr_array_index (sop->paths, i));
+			gsf_xml_out_add_cstr (output, "Path", svg);
+			g_free (svg);
+			gsf_xml_out_end_element (output); /* </Path> */
+		}
+	}
 
 	gsf_xml_out_start_element (output, "Style");
 	go_persist_sax_save (GO_PERSIST (sop->style), output);
@@ -351,6 +363,28 @@ gnm_so_path_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
 }
 
 static void
+sop_sax_path (GsfXMLIn *xin, xmlChar const **attrs)
+{
+	SheetObject *so = gnm_xml_in_cur_obj (xin);
+	GnmSOPath *sop = GNM_SO_PATH (so);
+	GOPath *path;
+	g_return_if_fail (sop->path == NULL);
+	if (sop->paths == NULL)
+		sop->paths = g_ptr_array_new_with_free_func ((GDestroyNotify) go_path_free);
+	for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
+		if (attr_eq (attrs[0], "Path")) {
+			path = go_path_new_from_svg (attrs[1]);
+			if (path)
+				g_ptr_array_add (sop->paths, path);
+			/* we need to update the extents, not optimal */
+			g_ptr_array_ref (sop->paths);
+			g_object_set (G_OBJECT (sop), "paths", sop->paths, NULL);
+			g_ptr_array_unref (sop->paths);
+			return;
+		}	
+}
+
+static void
 sop_sax_style (GsfXMLIn *xin, xmlChar const **attrs)
 {
 	SheetObject *so = gnm_xml_in_cur_obj (xin);
@@ -364,7 +398,9 @@ gnm_so_path_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
 			       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 (SOPATH, SOPATH, -1, "SheetObjectPath",	GSF_XML_NO_CONTENT, NULL, NULL),
+	  GSF_XML_IN_NODE (SOPATH, PATH, -1, "Path",	GSF_XML_NO_CONTENT, &sop_sax_path, NULL),
+	  GSF_XML_IN_NODE (SOPATH, STYLE, -1, "Style",	GSF_XML_NO_CONTENT, &sop_sax_style, NULL),
 	  GSF_XML_IN_NODE_END
 	};
 	static GsfXMLInDoc *doc = NULL;