[gnumeric] reimplement text in ellipses.

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

commit 2e4cc8abae627ea815d843aa01e1ad547a155fc1
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Sep 21 21:07:42 2009 +0200

    reimplement text in ellipses.

 ChangeLog           |    5 +++++
 src/gnm-so-filled.c |    9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3313427..f2841d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-21  Jean Brefort  <jean brefort normalesup org>
+
+	* src/gnm-so-filled.c (so_filled_view_set_bounds),
+	(cb_gnm_so_filled_changed): reimplement text in ellipses.[#595710]
+
 2009-09-20  Morten Welinder  <terra gnome org>
 
 	* configure.in: Post-release bump.
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 2cbeb87..fc3248e 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -93,6 +93,11 @@ so_filled_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean
 				/ scale;
 			h -= (sof->margin_pts.top + sof->margin_pts.bottom)
 				/ scale;
+			if (sof->is_oval)
+				goc_item_set (GOC_ITEM (fiv->text),
+				              "x", w / 2.,
+				              "y", h / 2.,
+				              NULL);
 
 			goc_item_set (GOC_ITEM (fiv->text),
 				"clip-height", h,
@@ -179,10 +184,10 @@ cb_gnm_so_filled_changed (GnmSOFilled const *sof,
 {
 	cb_gnm_so_filled_style_changed (GOC_ITEM (group->bg), sof);
 
-	if (!sof->is_oval && sof->text != NULL) {
+	if (sof->text != NULL) {
 		if (group->text == NULL)
 			group->text = goc_item_new (GOC_GROUP (group), GOC_TYPE_TEXT,
-				"anchor",	GTK_ANCHOR_NW,
+				"anchor",	sof->is_oval? GTK_ANCHOR_CENTER: GTK_ANCHOR_NW,
 				"clip",		TRUE,
 				"x",		sof->margin_pts.left,
 				"y",		sof->margin_pts.top,