[gnumeric] Text object: fix clipping issue.

[Morten Welinder <mortenw src gnome org>]

commit 052ec13ca56b096dc8f2db4db0a57786bb93b47d
Author: Morten Welinder <terra gnome org>
Date:   Fri Nov 12 10:00:17 2010 -0500

    Text object: fix clipping issue.

 ChangeLog           |    5 +++++
 NEWS                |    1 +
 src/gnm-so-filled.c |    4 ++++
 3 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5bbb0c8..ef428c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-12  Morten Welinder  <terra gnome org>
+
+	* src/gnm-so-filled.c (so_filled_view_set_bounds): Ensure that
+	clipping width and height do not become non-positive.  Fixes #634597.
+
 2010-11-07  Jean Brefort  <jean brefort normalesup org>
 
 	* src/sheet-object-image.c (so_image_view_set_bounds): fixed image bounds
diff --git a/NEWS b/NEWS
index 0bc44d6..6b89f0b 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ Morten:
 	* Fix analysis tools problems when "as values" is chosen.
 	* Fix gtk+/X crash with large tooltips.
 	* Take care of dead kittens.
+	* Fix text object clipping issue.  [#634597]
 
 Sameer Morar:
 	* Add key combinations to move sheets. [#634139]
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 72fce2a..361e315 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -93,8 +93,12 @@ so_filled_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean
 		if (fiv->text != NULL && GOC_ITEM (fiv->text)) {
 			w -= (sof->margin_pts.left + sof->margin_pts.right)
 				/ scale;
+			w = MAX (w, DBL_MIN);
+
 			h -= (sof->margin_pts.top + sof->margin_pts.bottom)
 				/ scale;
+			h = MAX (h, DBL_MIN);
+
 			if (sof->is_oval)
 				goc_item_set (GOC_ITEM (fiv->text),
 				              "x", w / 2.,