[gnumeric] xml: more cleanups.

[Morten Welinder <mortenw src gnome org>]

commit bf489b4f918a2000622d709ee26282f4eb478921
Author: Morten Welinder <terra gnome org>
Date:   Mon Sep 21 16:40:32 2009 -0400

    xml: more cleanups.

 ChangeLog           |    5 +++--
 src/xml-io.c        |   15 ---------------
 src/xml-io.h        |    1 -
 src/xml-sax-write.c |   15 +++++++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3ae156d..85e03d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2009-09-21  Morten Welinder  <terra gnome org>
 
-	* src/xml-sax-write.c (gnm_xml_out_add_color): Move from xml-io.c
-	and make static.
+	* src/xml-sax-write.c (gnm_xml_out_add_color,
+	gnm_xml_out_add_cellpos): Move from xml-io.c and make static.
+	(gnm_xml_out_add_gocolor): Ditto, except keep public.
 
 2009-09-21  Jean Brefort  <jean brefort normalesup org>
 
diff --git a/src/xml-io.c b/src/xml-io.c
index 818ebcb..a1bdf1b 100644
--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -140,21 +140,6 @@ xml_parse_ctx_destroy (XmlParseContext *ctxt)
 
 /* ------------------------------------------------------------------------- */
 
-void
-gnm_xml_out_add_gocolor (GsfXMLOut *o, char const *id, GOColor c)
-{
-	GdkColor tmp;
-	go_color_to_gdk (c, &tmp);
-	gsf_xml_out_add_color (o, id, tmp.red, tmp.green, tmp.blue);
-}
-
-void
-gnm_xml_out_add_cellpos (GsfXMLOut *o, char const *id, GnmCellPos const *p)
-{
-	g_return_if_fail (p != NULL);
-	gsf_xml_out_add_cstr_unchecked (o, id, cellpos_as_string (p));
-}
-
 /*****************************************************************************/
 /*
  * Reads a value which is stored using a format '%d:%s' where %d is the
diff --git a/src/xml-io.h b/src/xml-io.h
index 119956d..e669be4 100644
--- a/src/xml-io.h
+++ b/src/xml-io.h
@@ -51,7 +51,6 @@ GnmStyle      *xml_read_style     (XmlParseContext *ctxt, xmlNodePtr tree,
 void      xml_init (void);
 /* Gnumeric specific SAX utilities */
 void gnm_xml_out_add_gocolor (GsfXMLOut *o, char const *id, GOColor c);
-void gnm_xml_out_add_cellpos (GsfXMLOut *o, char const *id, GnmCellPos const *p);
 
 /* Gnumeric specific SAX import */
 gboolean gnm_xml_attr_int     (xmlChar const * const *attrs,
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index c17cc11..f708362 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -79,6 +79,14 @@ typedef struct {
 /* Precision to use when saving point measures. */
 #define POINT_SIZE_PRECISION 4
 
+void
+gnm_xml_out_add_gocolor (GsfXMLOut *o, char const *id, GOColor c)
+{
+	GdkColor tmp;
+	go_color_to_gdk (c, &tmp);
+	gsf_xml_out_add_color (o, id, tmp.red, tmp.green, tmp.blue);
+}
+
 static void
 gnm_xml_out_add_color (GsfXMLOut *o, char const *id, GnmColor const *c)
 {
@@ -86,6 +94,13 @@ gnm_xml_out_add_color (GsfXMLOut *o, char const *id, GnmColor const *c)
 }
 
 static void
+gnm_xml_out_add_cellpos (GsfXMLOut *o, char const *id, GnmCellPos const *p)
+{
+	g_return_if_fail (p != NULL);
+	gsf_xml_out_add_cstr_unchecked (o, id, cellpos_as_string (p));
+}
+
+static void
 xml_out_add_range (GsfXMLOut *xml, GnmRange const *r)
 {
 	g_return_if_fail (range_is_sane (r));