[gnumeric] Fix centering of spanned cell content. [#662361]

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

commit 20f552debc9cbb431cb2a8955359d83c88393855
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Oct 20 22:48:01 2011 -0600

    Fix centering of spanned cell content. [#662361]
    
    2011-10-20 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/cell-draw.c (cell_draw): also transform h_center if given

 ChangeLog       |    4 ++++
 NEWS            |    3 ++-
 src/cell-draw.c |    3 +++
 3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 31c1271..e52932e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-10-20 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/cell-draw.c (cell_draw): also transform h_center if given
+
+2011-10-20 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/cellspan.c (cell_calc_span): we need to stop extending in
 	a direction on the first failure in that direction
 
diff --git a/NEWS b/NEWS
index d72e3d8..284c267 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,8 @@ Andreas:
 	* Speed up printing of few pages of large sheets. [#662056]
 	* Provide an information dialog for print preview. [#662056]
 	* Fix hyperlink placement when inserting or adding hyperlink. [#662310]
+	* Fix spanning of long centered cell content. [#662331]
+	* Fix centering of spanned cell content. [#662361]
 
 Jean:
 	* Make things build against gtk+-3.0.
@@ -148,7 +150,6 @@ Andreas:
 	* From ODF also import named expressions with illegal name. [#650125]
 	* Handle [#REF!] and friends on ODF import. [#650639][#650640]
 	* Handle some invalid expressions in ODF import. [#650625]
-	* Fix spanning of long centered cell content. [#662331]
 
 Jean:
 	* Fixed critical. [#649901]
diff --git a/src/cell-draw.c b/src/cell-draw.c
index 38d882d..4dae240 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -315,6 +315,9 @@ cell_draw (GnmCell const *cell, cairo_t *cr,
 	height -= GNM_ROW_MARGIN + GNM_ROW_MARGIN + 1;
 	width  -= GNM_COL_MARGIN + GNM_COL_MARGIN + 1;
 
+	if (h_center > GNM_COL_MARGIN)
+		h_center -= (GNM_COL_MARGIN + 1);
+
 	rv = gnm_cell_fetch_rendered_value (cell, TRUE);
 
 	if (cell_calc_layout (cell, rv, +1,