[gnumeric] Rendered Value: simplify.

[Morten Welinder <mortenw src gnome org>]

commit 15fd713fcfc024c45118438c8778a06eb545a019
Author: Morten Welinder <terra gnome org>
Date:   Sat Sep 12 19:21:36 2009 -0400

    Rendered Value: simplify.

 ChangeLog            |    6 ++++++
 src/cell.c           |    3 +--
 src/print-cell.c     |   18 +++++++++---------
 src/rendered-value.c |   10 +++++-----
 src/rendered-value.h |    2 --
 5 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a9a942b..c6921df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-12  Morten Welinder  <terra gnome org>
 
+	* src/rendered-value.c (gnm_rendered_value_new): Drop mstyle and
+	context arguments.  All callers changed.
+
+	* src/print-cell.c (print_cell_gtk): Drop unused style argument.
+	All callers changed.
+
 	* src/preview-grid.c (pg_style_get_row): Greatly simplify by using
 	the sheet.
 	(pg_fetch_cell): Ditto.
diff --git a/src/cell.c b/src/cell.c
index 96fa80a..0b643a9 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -496,9 +496,8 @@ gnm_cell_render_value (GnmCell const *cell, gboolean allow_variable_width)
 	g_return_val_if_fail (cell != NULL, NULL);
 
 	sheet = cell->base.sheet;
-	rv = gnm_rendered_value_new (cell, gnm_cell_get_style (cell),
+	rv = gnm_rendered_value_new (cell,
 				     allow_variable_width,
-				     sheet->context,
 				     sheet->last_zoom_factor_used);
 
 	gnm_rvc_store (sheet->rendered_values, cell, rv);
diff --git a/src/print-cell.c b/src/print-cell.c
index 82fa443..917c9ed 100644
--- a/src/print-cell.c
+++ b/src/print-cell.c
@@ -53,9 +53,10 @@
  */
 
 static void
-print_cell_gtk (GnmCell const *cell, GnmStyle const *mstyle,
-	    cairo_t *context,
-	    double x1, double y1, double width, double height, double h_center)
+print_cell_gtk (GnmCell const *cell,
+		cairo_t *context,
+		double x1, double y1,
+		double width, double height, double h_center)
 {
 	GnmRenderedValue *rv, *rv100 = NULL;
 	GOColor fore_color;
@@ -77,9 +78,8 @@ print_cell_gtk (GnmCell const *cell, GnmStyle const *mstyle,
 		 * We're zoomed and we don't want printing to reflect that.
 		 */
 
-		rv100 = gnm_rendered_value_new ((GnmCell *)cell, mstyle,
+		rv100 = gnm_rendered_value_new ((GnmCell *)cell,
 						rv->variable_width,
-						pango_layout_get_context (rv->layout),
 						1.0);
 		rv = rv100;
 	}
@@ -236,10 +236,10 @@ print_merged_range_gtk (cairo_t *context,
 			row_calc_spans ((ColRowInfo *)ri, cell->pos.row, sheet);
 
 		if (sheet->text_is_rtl)
-			print_cell_gtk (cell, style, context,
+			print_cell_gtk (cell, context,
 				r, t, l - r, b - t, -1.);
 		else
-			print_cell_gtk (cell, style, context,
+			print_cell_gtk (cell, context,
 				l, t, r - l, b - t, -1.);
 	}
 	gnm_style_border_print_diag_gtk (style, context, l, t, r, b);
@@ -481,7 +481,7 @@ gnm_gtk_print_cell_range (cairo_t *context,
 				/* no need to draw blanks */
 				GnmCell const *cell = sheet_cell_get (sheet, col, row);
 				if (!gnm_cell_is_empty (cell))
-					print_cell_gtk (cell, style, context, x, y,
+					print_cell_gtk (cell, context, x, y,
 							ci->size_pts * hscale,
 							ri->size_pts, -1.);
 
@@ -527,7 +527,7 @@ gnm_gtk_print_cell_range (cairo_t *context,
 						real_x -= offset;
 				}
 
-				print_cell_gtk (cell, style, context,
+				print_cell_gtk (cell, context,
 						real_x, y, tmp_width, ri->size_pts,
 						center_offset);
 			} else if (col != span->left)
diff --git a/src/rendered-value.c b/src/rendered-value.c
index 27508f7..80986d1 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -173,18 +173,15 @@ gnm_rendered_value_remeasure (GnmRenderedValue *rv)
 /**
  * gnm_rendered_value_new:
  * @cell:   The cell
- * @mstyle: The mstyle associated with the cell
  * @allow_variable_width : Allow format to depend on column width.
- * @context: A pango context for layout.
  *
  * Formats the value of the cell according to the format style given in @mstyle
  *
  * Return value: a new GnmRenderedValue
  **/
 GnmRenderedValue *
-gnm_rendered_value_new (GnmCell const *cell, GnmStyle const *mstyle,
+gnm_rendered_value_new (GnmCell const *cell,
 			gboolean allow_variable_width,
-			PangoContext *context,
 			double zoom)
 {
 	GnmRenderedValue	*res;
@@ -194,12 +191,14 @@ gnm_rendered_value_new (GnmCell const *cell, GnmStyle const *mstyle,
 	int              rotation;
 	Sheet const     *sheet;
 	gboolean         displayed_formula;
+	PangoContext *context;
+	GnmStyle const *mstyle;
 
 	g_return_val_if_fail (cell != NULL, NULL);
-	g_return_val_if_fail (context != NULL, NULL);
 
 	/* sheet->workbook can be NULL when called from preview-grid.c  */
 	sheet = cell->base.sheet;
+	context = sheet->context;
 
 	displayed_formula =
 		gnm_cell_has_expr (cell) && sheet->display_formulas;
@@ -214,6 +213,7 @@ gnm_rendered_value_new (GnmCell const *cell, GnmStyle const *mstyle,
 	/* Must come after above gnm_cell_eval.  */
 	g_return_val_if_fail (cell->value != NULL, NULL);
 
+	mstyle = gnm_cell_get_style (cell);
 	rotation = gnm_style_get_rotation (mstyle);
 	if (rotation) {
 		static PangoMatrix const id = PANGO_MATRIX_INIT;
diff --git a/src/rendered-value.h b/src/rendered-value.h
index c6ee8c7..a0c574a 100644
--- a/src/rendered-value.h
+++ b/src/rendered-value.h
@@ -41,9 +41,7 @@ struct _GnmRenderedRotatedValue {
 };
 
 GnmRenderedValue *gnm_rendered_value_new       (GnmCell const *cell,
-						GnmStyle const *mstyle,
 						gboolean variable_width,
-						PangoContext *context,
 						double zoom);
 void              gnm_rendered_value_destroy   (GnmRenderedValue *rv);