mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Cleanup.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2657 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
8c5b0a3391
commit
8b5326b3df
@ -2015,41 +2015,42 @@ gnucash_sheet_block_set_from_table (GnucashSheet *sheet, gint virt_row,
|
|||||||
if (block->style && block->style != style) {
|
if (block->style && block->style != style) {
|
||||||
|
|
||||||
gnucash_sheet_block_clear_entries (block);
|
gnucash_sheet_block_clear_entries (block);
|
||||||
|
|
||||||
/* the zero'th virtual row isn't drawn */
|
/* the zero'th virtual row isn't drawn */
|
||||||
if (virt_row > 0)
|
if (virt_row > 0)
|
||||||
sheet->height -= block->style->dimensions->height;
|
sheet->height -= block->style->dimensions->height;
|
||||||
gnucash_style_unref (block->style);
|
gnucash_style_unref (block->style);
|
||||||
block->style = NULL;
|
block->style = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (block->style == NULL) {
|
if (block->style == NULL) {
|
||||||
block->style = style;
|
block->style = style;
|
||||||
|
|
||||||
/* the zero'th virtual row isn't drawn */
|
/* the zero'th virtual row isn't drawn */
|
||||||
if (virt_row > 0)
|
if (virt_row > 0)
|
||||||
sheet->height += block->style->dimensions->height;
|
sheet->height += block->style->dimensions->height;
|
||||||
|
|
||||||
gnucash_style_ref(block->style);
|
gnucash_style_ref(block->style);
|
||||||
|
|
||||||
|
block->entries = g_new0( gchar **,
|
||||||
block->entries = g_new0( gchar **, block->style->nrows);
|
block->style->nrows);
|
||||||
for (i = 0; i < block->style->nrows; i++)
|
for (i = 0; i < block->style->nrows; i++)
|
||||||
block->entries[i] = g_new0(gchar *,
|
block->entries[i] = g_new0(gchar *,
|
||||||
block->style->ncols);
|
block->style->ncols);
|
||||||
|
|
||||||
block->fg_colors = g_new0( GdkColor **, block->style->nrows);
|
block->fg_colors = g_new0( GdkColor **,
|
||||||
|
block->style->nrows);
|
||||||
for (i = 0; i < block->style->nrows; i++)
|
for (i = 0; i < block->style->nrows; i++)
|
||||||
block->fg_colors[i] = g_new0(GdkColor *,
|
block->fg_colors[i] = g_new0(GdkColor *,
|
||||||
block->style->ncols);
|
block->style->ncols);
|
||||||
|
|
||||||
block->bg_colors = g_new0( GdkColor **, block->style->nrows);
|
block->bg_colors = g_new0( GdkColor **,
|
||||||
|
block->style->nrows);
|
||||||
for (i = 0; i < block->style->nrows; i++)
|
for (i = 0; i < block->style->nrows; i++)
|
||||||
block->bg_colors[i] = g_new0(GdkColor *,
|
block->bg_colors[i] = g_new0(GdkColor *,
|
||||||
block->style->ncols);
|
block->style->ncols);
|
||||||
}
|
}
|
||||||
|
|
||||||
gnucash_sheet_block_set_entries (sheet, virt_row, virt_col);
|
gnucash_sheet_block_set_entries (sheet, virt_row, virt_col);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2075,7 +2076,7 @@ gnucash_sheet_cell_set_from_table (GnucashSheet *sheet, gint virt_row,
|
|||||||
style = block->style;
|
style = block->style;
|
||||||
if (!style)
|
if (!style)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (cell_row >= 0 && cell_row <= style->nrows &&
|
if (cell_row >= 0 && cell_row <= style->nrows &&
|
||||||
cell_col >= 0 && cell_col <= style->ncols) {
|
cell_col >= 0 && cell_col <= style->ncols) {
|
||||||
VirtualCell *vcell;
|
VirtualCell *vcell;
|
||||||
@ -2238,7 +2239,7 @@ gnucash_sheet_resize (GnucashSheet *sheet)
|
|||||||
else if (diff_rows > 0) {
|
else if (diff_rows > 0) {
|
||||||
/* we need some more rows */
|
/* we need some more rows */
|
||||||
for (i = 0; i < diff_rows; i++)
|
for (i = 0; i < diff_rows; i++)
|
||||||
gnucash_sheet_block_new(sheet, num_virt_rows + i, 0);
|
gnucash_sheet_block_new(sheet, num_virt_rows + i, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
sheet->num_virt_rows = sheet->table->num_virt_rows;
|
sheet->num_virt_rows = sheet->table->num_virt_rows;
|
||||||
|
Loading…
Reference in New Issue
Block a user