[gnumeric] Fix printing of labels with text intersecting markup language

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

commit c6c79182ab44393f2195dfc7f0bc762ef18e2bca
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun May 3 20:50:45 2009 -0600

    Fix printing of labels with text intersecting markup language
    
        2009-05-03  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        	* src/gnm-so-filled.c (gnm_so_filled_draw_cairo) use
        	  pango_layout_set_text rather than pango_layout_set_markup
        	  fixes #581125
---
 ChangeLog           |    6 ++++++
 NEWS                |    1 +
 src/gnm-so-filled.c |    2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fcfd90..7b04f29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-03  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/gnm-so-filled.c (gnm_so_filled_draw_cairo) use 
+	  pango_layout_set_text rather than pango_layout_set_markup
+	  fixes #581125
+
 2009-05-03  Morten Welinder  <terra gnome org>
 
 	* src/expr-name.c (expr_name_handle_references): Undo last change.
diff --git a/NEWS b/NEWS
index e580171..d968aea 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Andreas:
 	* Fix some divergence between character weight in the label properties
 	  dialog and the label itself.
 	* Add interface to format cell comments
+	* Fix printing of sheet objects whose text intersects with markup. [#581125]
 
 Jean:
 	* Do not crash in rendr_value for NULL values. [#581120]
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index f307d32..323900c 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -295,7 +295,7 @@ gnm_so_filled_draw_cairo (SheetObject const *so, cairo_t *cr,
 				   - sof->margin_pts.right) * PANGO_SCALE;
 		cairo_move_to (cr, sof->margin_pts.left, 
 			       sof->margin_pts.top);
-		pango_layout_set_markup (pl, sof->text, -1);
+		pango_layout_set_text (pl, sof->text, -1);
 		pango_layout_set_attributes (pl, sof->markup);
 		pango_layout_set_width (pl, pl_width);
 		pango_layout_set_height (pl, pl_height);