gnumeric r16743 - in trunk: . src

[jbrefort svn gnome org]

Author: jbrefort
Date: Thu Aug 21 18:35:07 2008
New Revision: 16743
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16743&view=rev

Log:
2008-08-21  Jean Brefort  <jean brefort normalesup org>

	* src/gnm-so-filled.c: (gnm_so_filled_read_xml_dom),
	(gnm_so_filled_write_xml_sax), (sof_sax_style): use GOPersist.
	* src/gnm-so-line.c: (gnm_so_line_read_xml_dom),
	(gnm_so_line_write_xml_sax), (sol_sax_style): ditto.



Modified:
   trunk/ChangeLog
   trunk/src/gnm-so-filled.c
   trunk/src/gnm-so-line.c

Modified: trunk/src/gnm-so-filled.c
==============================================================================
--- trunk/src/gnm-so-filled.c	(original)
+++ trunk/src/gnm-so-filled.c	Thu Aug 21 18:35:07 2008
@@ -29,6 +29,7 @@
 #include <goffice/utils/go-libxml-extras.h>
 #include <goffice/graph/gog-style.h>
 #include <goffice/utils/go-color.h>
+#include <goffice/utils/go-persist.h>
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
@@ -305,7 +306,7 @@
 		sof->is_oval = (type == 102);
 
 	if (NULL != (child = e_xml_get_child_by_name (node, "Style"))) /* new version */
-		return !gog_persist_dom_load (GOG_PERSIST (sof->style), child);
+		return !go_persist_dom_load (GO_PERSIST (sof->style), child);
 
 	/* Old 1.0 and 1.2 */
 	xml_node_get_gocolor (node, "OutlineColor", &sof->style->outline.color);
@@ -330,7 +331,7 @@
 		gsf_xml_out_add_cstr (output, "Label", sof->text);
 
 	gsf_xml_out_start_element (output, "Style");
-	gog_persist_sax_save (GOG_PERSIST (sof->style), output);
+	go_persist_sax_save (GO_PERSIST (sof->style), output);
 	gsf_xml_out_end_element (output); /* </Style> */
 }
 
@@ -339,7 +340,7 @@
 {
 	SheetObject *so = gnm_xml_in_cur_obj (xin);
 	GnmSOFilled *sof = GNM_SO_FILLED (so);
-	gog_persist_prep_sax (GOG_PERSIST (sof->style), xin, attrs);
+	go_persist_prep_sax (GO_PERSIST (sof->style), xin, attrs);
 }
 
 static void

Modified: trunk/src/gnm-so-line.c
==============================================================================
--- trunk/src/gnm-so-line.c	(original)
+++ trunk/src/gnm-so-line.c	Thu Aug 21 18:35:07 2008
@@ -29,6 +29,7 @@
 #include <goffice/utils/go-libxml-extras.h>
 #include <goffice/graph/gog-style.h>
 #include <goffice/utils/go-color.h>
+#include <goffice/utils/go-persist.h>
 #include <gsf/gsf-impl-utils.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
@@ -300,7 +301,7 @@
 		go_arrow_init (&sol->end_arrow, a, b, c);
 
 	if (NULL != (child = e_xml_get_child_by_name (node, "Style"))) /* new version */
-		return !gog_persist_dom_load (GOG_PERSIST (sol->style), child);
+		return !go_persist_dom_load (GO_PERSIST (sol->style), child);
 	/* Old 1.0 and 1.2 */
 	xml_node_get_gocolor (node, "FillColor", &sol->style->line.color);
 	if (xml_node_get_double  (node, "Width", &width))
@@ -325,7 +326,7 @@
 		gsf_xml_out_add_int (output, "Type", 1);
 
 	gsf_xml_out_start_element (output, "Style");
-	gog_persist_sax_save (GOG_PERSIST (sol->style), output);
+	go_persist_sax_save (GO_PERSIST (sol->style), output);
 	gsf_xml_out_end_element (output); /* </Style> */
 }
 
@@ -334,7 +335,7 @@
 {
 	SheetObject *so = gnm_xml_in_cur_obj (xin);
 	GnmSOLine *sol = GNM_SO_LINE (so);
-	gog_persist_prep_sax (GOG_PERSIST (sol->style), xin, attrs);
+	go_persist_prep_sax (GO_PERSIST (sol->style), xin, attrs);
 }
 
 static void