Commit d069a550 authored by Miguel de Icaza's avatar Miguel de Icaza Committed by Arturo Espinosa
Browse files

Create the span if required.

1999-10-24  Miguel de Icaza  <miguel@gnu.org>

	* src/cellspan.c (cell_register_span): Create the span if required.

	* src/sheet.c (sheet_destroy_contents): Remove debugging messages.
	(sheet_row_new): Row spans are now created on demand.
parent c6048ccb
No preview for this file type
No preview for this file type
......@@ -381,6 +381,9 @@ cell_render_value (Cell *cell)
g_return_if_fail (cell != NULL);
g_return_if_fail (cell->value != NULL);
if (cell->render_color == 0xdeadbeef){
g_error ("This cell is dead!");
}
if (cell->render_color) {
style_color_unref (cell->render_color);
cell->render_color = NULL;
......
......@@ -90,6 +90,9 @@ cell_register_span (Cell *cell, int left, int right)
ri = cell->row;
col = cell->col->pos;
if (ri->spans == NULL)
row_init_span (ri);
for (i = left; i <= right; i++){
int *key;
......
......@@ -338,7 +338,6 @@ sheet_row_new (Sheet *sheet)
g_return_val_if_fail (IS_SHEET (sheet), NULL);
*ri = sheet->rows.default_style;
row_init_span (ri);
return ri;
}
......
......@@ -925,6 +925,7 @@ xml_get_print_hf (xmlNodePtr node, PrintHF *const hf)
g_free (hf->left_format);
hf->left_format = g_strdup (txt);
free (txt);
}
txt = xml_value_get (node, "Middle");
......@@ -933,6 +934,7 @@ xml_get_print_hf (xmlNodePtr node, PrintHF *const hf)
g_free (hf->middle_format);
hf->middle_format = g_strdup (txt);
free (txt);
}
txt = xml_value_get (node, "Right");
......@@ -941,6 +943,7 @@ xml_get_print_hf (xmlNodePtr node, PrintHF *const hf)
g_free (hf->right_format);
hf->right_format = g_strdup (txt);
free (txt);
}
}
......
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