[gnumeric] use go_string_replace

[Andreas J. Guelzow <guelzow src gnome org>]

commit 90d9019f30c0b4fd672666059aec78ab2328b7d0
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Jun 30 21:33:50 2010 -0600

    use go_string_replace
    
    2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gnm-format.c (format_value_common): use go_string_replace
    	* src/func.c (gnm_func_convert_markup_to_pango): ditto

 ChangeLog        |    5 +++++
 src/func.c       |    8 +++-----
 src/gnm-format.c |    9 ++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 26c8e2d..6fc61a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/gnm-format.c (format_value_common): use go_string_replace
+	* src/func.c (gnm_func_convert_markup_to_pango): ditto
+	
+2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/cell-draw.c (cell_calc_layout): HALIGN_FILL overrides wrap_text
 
 2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/src/func.c b/src/func.c
index 7744f5e..4cbcc15 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1295,14 +1295,12 @@ gnm_func_convert_markup_to_pango (char const *desc)
 
 	while ((at = strstr (str->str, "@{"))) {
 		gint len = at - str->str;
-		g_string_erase (str, len, 2);
-		g_string_insert (str, len,
-				 "<span foreground=\"#0000FF\">");
+		go_string_replace (str, len, 2,
+				   "<span foreground=\"#0000FF\">", -1);
 		if ((at = strstr
 		     (str->str + len + 26, "}"))) {
 			len = at - str->str;
-			g_string_erase (str, len, 1);
-			g_string_insert (str, len, "</span>");
+			go_string_replace (str, len, 1, "</span>", -1);
 		} else
 			g_string_append (str, "</span>");
 	}
diff --git a/src/gnm-format.c b/src/gnm-format.c
index a856247..f749ffc 100644
--- a/src/gnm-format.c
+++ b/src/gnm-format.c
@@ -133,11 +133,10 @@ format_value_common (PangoLayout *layout, GString *str,
 				       || dir == PANGO_DIRECTION_WEAK_RTL);
 			}
 			
-			while ((ptr = strchr (str->str, '\n')) != NULL) {
-				gssize pos = ptr - str->str;
-				g_string_erase (str, pos, 1);
-				g_string_insert (str, pos, rtl ? UTF8_NEWLINE_RTL : UTF8_NEWLINE);
-			}
+			while ((ptr = strchr (str->str, '\n')) != NULL)
+				go_string_replace 
+					(str, ptr - str->str, 1, rtl ? UTF8_NEWLINE_RTL : UTF8_NEWLINE, -1);
+
 			sval = sval_free = g_string_free (str, FALSE);
 		}
 	}