[gnumeric] Fixed problem with row headers. [#603862]

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

commit 3eff6b52be11b742da921bce4b62c433beea710b
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sun Dec 6 12:49:42 2009 +0100

    Fixed problem with row headers. [#603862]

 ChangeLog      |    4 ++++
 NEWS           |    3 +++
 src/item-bar.c |    5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5a085fd..63758c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-06  Jean Brefort  <jean brefort normalesup org>
+
+	* src/item-bar.c (ib_draw_cell): clip when drawing text. [#603862]
+
 2009-12-05  Jean Brefort  <jean brefort normalesup org>
 
 	* src/graph.c (gnm_go_data_matrix_get_value): do not exchange row and
diff --git a/NEWS b/NEWS
index 5bf67be..b449ec0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ Andreas:
 	* Export hyperlinks to ODF. [#603533]
 	* Make EUROCONVERT Excel compatible
 
+Jean:
+	* Fixed problem with row headers. [#603862]
+
 Morten:
 	* Elminate use of "float".
 	* Fix selection problem.  [#601107]
diff --git a/src/item-bar.c b/src/item-bar.c
index 1d3713e..bb7409a 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -271,8 +271,8 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 		return;
 	}
 
-	cairo_rectangle (cr, rect->x + 1, rect->y + 1, rect->width - 1, rect->height - 1);
-	cairo_fill (cr);
+	cairo_rectangle (cr, rect->x + 1, rect->y + 1, rect->width - 2, rect->height - 2);
+	cairo_fill_preserve (cr);
 	cairo_restore (cr);
 
 	/* The widget parameters could be NULL, but if so some themes would emit a warning.
@@ -288,6 +288,7 @@ ib_draw_cell (ItemBar const * const ib, cairo_t *cr,
 	pango_glyph_string_extents (ib->pango.glyphs, font, NULL, &size);
 
 	cairo_save (cr);
+	cairo_clip (cr);
 	cairo_set_source_rgb (cr, 0., 0., 0.);
 	cairo_translate (cr,
 					 rect->x + (rect->width - PANGO_PIXELS (size.width)) / 2,