Commit 52c77a11 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

do not span expressions because they do not span when recalculated. This


2001-06-03  Jody Goldberg <jgoldberg@home.com>

	* src/cellspan.c (cell_calc_span) : do not span expressions
	  because they do not span when recalculated.  This will be fixed when
	  just in time rendering is done.
parent fad57259
2001-06-03 Jody Goldberg <jgoldberg@home.com>
* src/cellspan.c (cell_calc_span) : do not span expressions
because they do not span when recalculated. This will be fixed when
just in time rendering is done.
2001-06-03 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-06-03 Jody Goldberg <jgoldberg@home.com>
* src/cellspan.c (cell_calc_span) : do not span expressions
because they do not span when recalculated. This will be fixed when
just in time rendering is done.
2001-06-03 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-06-03 Jody Goldberg <jgoldberg@home.com>
* src/cellspan.c (cell_calc_span) : do not span expressions
because they do not span when recalculated. This will be fixed when
just in time rendering is done.
2001-06-03 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-06-03 Jody Goldberg <jgoldberg@home.com>
* src/cellspan.c (cell_calc_span) : do not span expressions
because they do not span when recalculated. This will be fixed when
just in time rendering is done.
2001-06-03 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
2001-06-03 Jody Goldberg <jgoldberg@home.com>
* src/cellspan.c (cell_calc_span) : do not span expressions
because they do not span when recalculated. This will be fixed when
just in time rendering is done.
2001-06-03 Jody Goldberg <jgoldberg@home.com>
From Juan Pablo Mendoza <pablo_juan@yahoo.com>
......
......@@ -17,6 +17,9 @@ typedef enum {
/* Cell is in the midst of a cyclic calculation */
CELL_BEING_ITERATED = 0x080000,
/* Cell content spans */
CELL_CONTENT_SPANS = 0x100000,
} CellFlags;
/* Definition of a Gnumeric Cell */
......
......@@ -77,6 +77,9 @@ cell_register_span (Cell const * const cell, int left, int right)
ri = cell->row_info;
col = cell->pos.col;
if (left == right)
return;
if (ri->spans == NULL)
ri->spans = g_hash_table_new (col_hash, col_compare);
......@@ -200,7 +203,7 @@ cell_calc_span (Cell const * const cell, int * const col1, int * const col2)
/*
* Report only one column is used if
* - Cell is going to be recalculated
* - Cell has an expression
* - Cell is in a hidden col
* - Cell is a number
* - Cell is the top left of a merged cell
......@@ -221,7 +224,7 @@ cell_calc_span (Cell const * const cell, int * const col1, int * const col2)
if (align == HALIGN_LEFT || align == HALIGN_RIGHT)
indented_w += cell_rendered_offset (cell);
if (cell_needs_recalc (cell) ||
if (cell_has_expr (cell) ||
!cell->col_info->visible ||
((indented_w <= COL_INTERNAL_WIDTH (cell->col_info)) &&
align != HALIGN_CENTER_ACROSS_SELECTION) ||
......
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