[gnumeric] Improve horizontal fill. [#594193, part 1]

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

commit 659e088fc91fbca420aadefb8eb2b45573348ec3
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Jun 30 15:45:07 2010 -0600

    Improve horizontal fill. [#594193, part 1]
    
    2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/cell-draw.c (cell_calc_layout): HALIGN_FILL overrides wrap_text

 ChangeLog       |    4 ++++
 NEWS            |    2 +-
 src/cell-draw.c |    3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c0ce65d..26c8e2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/cell-draw.c (cell_calc_layout): HALIGN_FILL overrides wrap_text
+
+2010-06-30  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/gnm-format.c (format_value_common): in one-paragraph mode
 	  replace newlines with visible glyphs.
 
diff --git a/NEWS b/NEWS
index 9d9ed29..bd8cd89 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ Andreas:
 	* Add new Excel and Openformula units ("pica" and "picapt") to CONVERT.
 	* Save default search settings. [#105615]
 	* Improve configurable text export of numbers. [#126444]
-	* Improve horizontal fill. [#594193, part 2]
+	* Improve horizontal fill. [#594193, parts 1 and 2]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.7
diff --git a/src/cell-draw.c b/src/cell-draw.c
index c0ca76a..2b9d85b 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -111,7 +111,8 @@ cell_calc_layout (GnmCell const *cell, GnmRenderedValue *rv, int y_direction,
 		if (sin_a < 0) {
 			hoffset += (width - indent) - rv->layout_natural_width;
 		}
-	} else if (!rv->rotation && rv->wrap_text) {
+	} else if (!rv->rotation && rv->wrap_text 
+		   && (rv->effective_halign != HALIGN_FILL)) {
 		int wanted_width = MAX (0, width - indent);
 		if (wanted_width != pango_layout_get_width (layout)) {
 			pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);