[gnumeric] Fix row height autofit when zoom level is not 1. [#656418]

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

commit 6428a0258020e2adcc7a49da1768c3bf1322c5a3
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sat Aug 20 08:25:56 2011 +0200

    Fix row height autofit when zoom level is not 1. [#656418]

 ChangeLog   |    7 +++++++
 NEWS        |    1 +
 src/sheet.c |    7 +++----
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0011c3c..5d35c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-20  Jean Brefort  <jean brefort normalesup org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* src/sheet.c (cb_max_cell_height): fix row height autofit when zoom
+	level is not 1. [#656418]
+
 2011-08-19 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/workbook-view.c (wb_view_auto_expr_recalc): chaeck for NULL
diff --git a/NEWS b/NEWS
index f4a6316..9913ec2 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Andreas:
 Jean:
 	* Make things build against gtk+-3.0.
 	* Make Ctrl-PgUp and Ctrl-PgDn work on chart-only sheets. [#645673]
+	* Fix row height autofit when zoom level is not 1. [#656418]
 
 Valek:
 	* In xls import, set LABEL encoding based on FONT charset converted to 
diff --git a/src/sheet.c b/src/sheet.c
index 9d786c2..9e00fea 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -2354,10 +2354,9 @@ cb_max_cell_height (GnmCellIter const *iter, struct cb_fit *data)
 		 * that they are all the same height, more or less.
 		 */
 		Sheet const *sheet = cell->base.sheet;
-		height = sheet->last_zoom_factor_used *
-			gnm_style_get_pango_height (gnm_cell_get_style (cell),
-						    sheet->rendered_values->context,
-						    sheet->last_zoom_factor_used);
+		height =  gnm_style_get_pango_height (gnm_cell_get_style (cell),
+						      sheet->rendered_values->context,
+						      sheet->last_zoom_factor_used);
 	} else {
 		(void)gnm_cell_fetch_rendered_value (cell, TRUE);