Commit 928b13df authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

http://bugzilla.gnome.org/show_bug.cgi?id=87939 leave merged cells out of


2002-07-12  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=87939
	* src/sheet.c (cb_max_cell_width) : leave merged cells out of the
	  running.

	http://bugzilla.gnome.org/show_bug.cgi?id=87987
	(sheet_range_bounding_box) : nice catch, thankfully it is a new bug.
parent 5e63d3a1
2002-07-12 Jody Goldberg <jody@gnome.org>
* src/sheet.c (cb_max_cell_width) : leave merged cells out of the
running.
http://bugzilla.gnome.org/show_bug.cgi?id=87987
(sheet_range_bounding_box) : nice catch, thankfully it is a new bug.
2002-07-12 Jody Goldberg <jody@gnome.org>
* src/plugin-service.c (gnum_plugin_file_opener_probe) : remove
......
2002-07-12 Jody Goldberg <jody@gnome.org>
* src/sheet.c (cb_max_cell_width) : leave merged cells out of the
running.
http://bugzilla.gnome.org/show_bug.cgi?id=87987
(sheet_range_bounding_box) : nice catch, thankfully it is a new bug.
2002-07-12 Jody Goldberg <jody@gnome.org>
* src/plugin-service.c (gnum_plugin_file_opener_probe) : remove
......
2002-07-12 Jody Goldberg <jody@gnome.org>
* src/sheet.c (cb_max_cell_width) : leave merged cells out of the
running.
http://bugzilla.gnome.org/show_bug.cgi?id=87987
(sheet_range_bounding_box) : nice catch, thankfully it is a new bug.
2002-07-12 Jody Goldberg <jody@gnome.org>
* src/plugin-service.c (gnum_plugin_file_opener_probe) : remove
......
......@@ -1005,13 +1005,15 @@ cb_max_cell_width (Sheet *sheet, int col, int row, Cell *cell,
{
int width;
/* Dynamic cells must be rerendered */
if (cell->rendered_value == NULL || cell->rendered_value->dynamic_width)
cell_render_value (cell, FALSE);
if (!cell_is_merged (cell)) {
/* Dynamic cells must be rerendered */
if (cell->rendered_value == NULL || cell->rendered_value->dynamic_width)
cell_render_value (cell, FALSE);
width = cell_rendered_width (cell) + cell_rendered_offset (cell);
if (width > *max)
*max = width;
width = cell_rendered_width (cell) + cell_rendered_offset (cell);
if (width > *max)
*max = width;
}
return NULL;
}
......@@ -1418,10 +1420,10 @@ sheet_range_bounding_box (Sheet const *sheet, Range *bound)
row_span_get (ri, r.end.col);
if (span1 != NULL) {
if (bound->start.col < span0->left)
bound->start.col = span0->left;
if (bound->end.col > span0->right)
bound->end.col = span0->right;
if (bound->start.col < span1->left)
bound->start.col = span1->left;
if (bound->end.col > span1->right)
bound->end.col = span1->right;
}
}
/* skip segments with no cells */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment