Skip to content

GitLab

Commit 8f57a068 authored by Michael Meeks's avatar Michael Meeks
Browse files

Shared formulae mostly implemented, various fixups & cleanups.

parent f33a9a6e
Hide whitespace changes
Inline Side-by-side
ChangeLog-1999-07-09
View file @ 8f57a068
1999-04-03 Michael Meeks <michael@imaginator.com>
* src/sheet.c (sheet_cell_remove_from_hash): Now checks
return value of g_hash_table_lookup_extended, before
freeing a random pointer if its not there.
* src/cellspan.c (cell_unregister_span): Check another
pointer.
* src/cell.c (cell_set_formula): Default error_msg !
1999-04-02 Michael Meeks <michael@imaginator.com>
* src/fn-sheet.c (gnumeric_if): Fix to allow variable
......
ChangeLog-2000-02-23
View file @ 8f57a068
1999-04-03 Michael Meeks <michael@imaginator.com>
* src/sheet.c (sheet_cell_remove_from_hash): Now checks
return value of g_hash_table_lookup_extended, before
freeing a random pointer if its not there.
* src/cellspan.c (cell_unregister_span): Check another
pointer.
* src/cell.c (cell_set_formula): Default error_msg !
1999-04-02 Michael Meeks <michael@imaginator.com>
* src/fn-sheet.c (gnumeric_if): Fix to allow variable
......
OChangeLog-1999-07-09
View file @ 8f57a068
1999-04-03 Michael Meeks <michael@imaginator.com>
* src/sheet.c (sheet_cell_remove_from_hash): Now checks
return value of g_hash_table_lookup_extended, before
freeing a random pointer if its not there.
* src/cellspan.c (cell_unregister_span): Check another
pointer.
* src/cell.c (cell_set_formula): Default error_msg !
1999-04-02 Michael Meeks <michael@imaginator.com>
* src/fn-sheet.c (gnumeric_if): Fix to allow variable
......
OChangeLog-2000-02-23
View file @ 8f57a068
1999-04-03 Michael Meeks <michael@imaginator.com>
* src/sheet.c (sheet_cell_remove_from_hash): Now checks
return value of g_hash_table_lookup_extended, before
freeing a random pointer if its not there.
* src/cellspan.c (cell_unregister_span): Check another
pointer.
* src/cell.c (cell_set_formula): Default error_msg !
1999-04-02 Michael Meeks <michael@imaginator.com>
* src/fn-sheet.c (gnumeric_if): Fix to allow variable
......
plugins/excel/ChangeLog
View file @ 8f57a068
1999-04-03 Michael Meeks <michael@imaginator.com>
* ms-excel.c (ms_excel_read_sheet): removed fixup_array_formulae.
(ms_excel_read_cell): Large SHRFMLA / ARRAY fixups.
(biff_share_formula_new,destroy,hash,equal): Implemented.
(ms_excel_sheet_new): Removed GList array_formulae and insert
shared formula hash table.
(ms_excel_sheet_destroy): Deal with hash table.
(ms_excel_sheet_shared_formula): Returns shared formula text
(ms_excel_set_cell_xf): Cleaned unused variables.
* ms-excel.h: Added ms_excel_sheet_shared_formula prototype
* ms-formula.c (ms_excel_fixup_array_formula): Removed.
(ms_excel_parse_formula): Sorted FORMULA_PTG_EXP.
* ms-formula.h: Removed prototype.
1999-04-02 Michael Meeks <michael@imaginator.com>
* ms-formula.c (ms_excel_parse_formula): PTG_ATTR: corrected
......
plugins/excel/ms-excel-read.c
View file @ 8f57a068
......@@ -194,6 +194,38 @@ biff_get_error_text (guint8 err)
return buf ;
}
static BIFF_SHARED_FORMULA *
biff_shared_formula_new (guint16 col, guint16 row, BYTE *data, guint32 data_len)
{
BIFF_SHARED_FORMULA *sf = g_new (BIFF_SHARED_FORMULA, 1) ;
sf->key.col = col ;
sf->key.row = row ;
sf->data = data ;
sf->data_len = data_len ;
return sf ;
}
static gboolean
biff_shared_formula_destroy (gpointer key, BIFF_SHARED_FORMULA *sf, gpointer userdata)
{
g_free (sf) ;
return 1 ;
}
/* Shared formula hashing functions */
static guint
biff_shared_formula_hash (const BIFF_SHARED_FORMULA_KEY *d)
{ return (d->row<<16)+d->col ; }
static guint
biff_shared_formula_equal (const BIFF_SHARED_FORMULA_KEY *a,
const BIFF_SHARED_FORMULA_KEY *b)
{
if (a->col == b->col &&
a->row == b->row) return 1 ;
return 0 ;
}
/**
* See S59D5D.HTM
**/
......@@ -791,10 +823,10 @@ ms_excel_set_cell_font (MS_EXCEL_SHEET * sheet, Cell * cell, BIFF_XF_DATA * xf)
static void
ms_excel_set_cell_xf (MS_EXCEL_SHEET * sheet, Cell * cell, guint16 xfidx)
{
GList *ptr;
int cnt;
BIFF_XF_DATA *xf;
g_return_if_fail (cell->value) ;
if (xfidx == 0){
/* printf ("Normal cell formatting\n"); */
return;
......@@ -1113,10 +1145,28 @@ ms_excel_sheet_new (MS_EXCEL_WORKBOOK * wb, char *name)
ans->gnum_sheet = sheet_new (wb->gnum_wb, name);
ans->blank = 1 ;
ans->wb = wb;
ans->array_formulae = 0;
ans->shared_formulae = g_hash_table_new ((GHashFunc)biff_shared_formula_hash,
(GCompareFunc)biff_shared_formula_equal) ;
return ans;
}
char *
ms_excel_sheet_shared_formula (MS_EXCEL_SHEET *sheet,
int col, int row)
{
BIFF_SHARED_FORMULA_KEY k ;
BIFF_SHARED_FORMULA *sf ;
k.col = col ;
k.row = row ;
sf = g_hash_table_lookup (sheet->shared_formulae, &k) ;
if (sf)
return ms_excel_parse_formula (sheet, sf->data, col, row, sf->data_len) ;
printf ("Duff shared formula index %d %d\n", col, row) ;
return strdup ("00") ;
}
static void
ms_excel_sheet_set_version (MS_EXCEL_SHEET *sheet, eBiff_version ver)
{
......@@ -1133,9 +1183,8 @@ ms_excel_sheet_insert (MS_EXCEL_SHEET * sheet, int xfidx, int col, int row, char
sheet->blank = 0 ;
cell_set_text_simple (cell, text);
}
else {
else
cell_set_text_simple (cell, "") ;
}
ms_excel_set_cell_xf (sheet, cell, xfidx);
}
......@@ -1148,13 +1197,11 @@ ms_excel_sheet_set_index (MS_EXCEL_SHEET *ans, int idx)
static void
ms_excel_sheet_destroy (MS_EXCEL_SHEET * sheet)
{
GList *ptr = g_list_first (sheet->array_formulae);
while (ptr){
g_free (ptr->data);
ptr = ptr->next;
}
g_list_free (sheet->array_formulae);
g_hash_table_foreach_remove (sheet->shared_formulae,
(GHRFunc)biff_shared_formula_destroy,
sheet) ;
g_hash_table_destroy (sheet->shared_formulae) ;
sheet->shared_formulae = NULL ;
sheet_destroy (sheet->gnum_sheet);
......@@ -1506,6 +1553,43 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
break;
}
case BIFF_SHRFMLA: /* See: S59DE4.HTM */
{
int array_col_first, array_col_last ;
int array_row_first, array_row_last ;
BYTE *data ;
int data_len ;
char *txt ;
Cell *cell ;
BIFF_SHARED_FORMULA *sf ;
array_row_first = BIFF_GETWORD(q->data + 0) ;
array_row_last = BIFF_GETWORD(q->data + 2) ;
array_col_first = BIFF_GETBYTE(q->data + 4) ;
array_col_last = BIFF_GETBYTE(q->data + 5) ;
data = q->data + 10 ;
data_len = BIFF_GETWORD(q->data + 8) ;
/* Whack in the hash for later */
sf = biff_shared_formula_new (array_col_first, array_row_first,
data, data_len) ;
g_hash_table_insert (sheet->shared_formulae, &sf->key, sf) ;
printf ("Shared formula of extent %d %d %d %d\n",
array_col_first, array_row_first, array_col_last, array_row_last) ;
txt = ms_excel_parse_formula (sheet, data,
array_col_first, array_row_first,
data_len) ;
/* NB. This keeps the pre-set XF record */
cell = sheet_cell_fetch (sheet->gnum_sheet,
array_col_first, array_row_first);
if (!cell)
break ;
cell_set_text_simple (cell, txt);
g_free(txt) ;
break ;
}
case BIFF_ARRAY: /* See: S59D57.HTM */
{
int array_col_first, array_col_last ;
......@@ -1519,19 +1603,10 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
array_col_first = BIFF_GETBYTE(q->data + 4) ;
array_col_last = BIFF_GETBYTE(q->data + 5) ;
switch (q->ls_op) {
case BIFF_SHRFMLA:
data = q->data + 10 ;
data_len = BIFF_GETWORD(q->data + 8) ;
break ;
default:{
/* int options = BIFF_GETWORD(q->data + 6) ; not so useful */
g_assert (q->ls_op == BIFF_ARRAY) ;
data = q->data + 14 ;
data_len = BIFF_GETWORD(q->data + 12) ;
break ;
}
}
g_assert (q->ls_op == BIFF_ARRAY) ;
data = q->data + 14 ;
data_len = BIFF_GETWORD(q->data + 12) ;
printf ("%s Formula of extent %d %d %d %d\n", q->ls_op==BIFF_ARRAY?"Array":"Shrfmla",
array_col_first, array_row_first, array_col_last, array_row_last) ;
for (xlp=array_col_first;xlp<=array_col_last;xlp++)
......@@ -1539,8 +1614,10 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
{
char *txt = ms_excel_parse_formula (sheet, data,
xlp, ylp, data_len) ;
/* FIXME: Magic XF number: 0 */
ms_excel_sheet_insert (sheet, 0, xlp, ylp, txt) ;
/* NB. This keeps the pre-set XF record */
Cell *cell = sheet_cell_fetch (sheet->gnum_sheet, xlp, ylp);
if (cell)
cell_set_text_simple (cell, txt);
g_free(txt) ;
}
break ;
......@@ -1708,7 +1785,6 @@ ms_excel_read_sheet (MS_EXCEL_SHEET *sheet, BIFF_QUERY * q, MS_EXCEL_WORKBOOK *
ms_excel_sheet_destroy (sheet) ;
return;
}
ms_excel_fixup_array_formulae (sheet);
return;
break;
case BIFF_SELECTION: /* S59DE2.HTM */
......
plugins/excel/ms-excel-read.h
View file @ 8f57a068
......@@ -29,10 +29,25 @@ typedef struct _MS_EXCEL_SHEET
Sheet *gnum_sheet ;
struct _MS_EXCEL_WORKBOOK *wb ;
eBiff_version ver ;
GList *array_formulae ;
GHashTable *shared_formulae ;
} MS_EXCEL_SHEET ;
extern void ms_excel_sheet_insert (MS_EXCEL_SHEET *sheet, int xfidx, int col, int row, char *text) ;
typedef struct {
guint16 col ;
guint16 row ;
} BIFF_SHARED_FORMULA_KEY ;
typedef struct {
BIFF_SHARED_FORMULA_KEY key ;
BYTE *data ;
guint32 data_len ;
} BIFF_SHARED_FORMULA ;
extern void ms_excel_sheet_insert (MS_EXCEL_SHEET *sheet,
int xfidx, int col,
int row, char *text) ;
extern char *ms_excel_sheet_shared_formula (MS_EXCEL_SHEET *sheet,
int col, int row) ;
typedef struct _MS_EXCEL_PALETTE
{
......
plugins/excel/ms-excel.c
View file @ 8f57a068
......@@ -194,6 +194,38 @@ biff_get_error_text (guint8 err)
return buf ;
}
static BIFF_SHARED_FORMULA *
biff_shared_formula_new (guint16 col, guint16 row, BYTE *data, guint32 data_len)
{
BIFF_SHARED_FORMULA *sf = g_new (BIFF_SHARED_FORMULA, 1) ;
sf->key.col = col ;
sf->key.row = row ;
sf->data = data ;
sf->data_len = data_len ;
return sf ;
}
static gboolean
biff_shared_formula_destroy (gpointer key, BIFF_SHARED_FORMULA *sf, gpointer userdata)
{
g_free (sf) ;
return 1 ;
}
/* Shared formula hashing functions */
static guint
biff_shared_formula_hash (const BIFF_SHARED_FORMULA_KEY *d)
{ return (d->row<<16)+d->col ; }
static guint
biff_shared_formula_equal (const BIFF_SHARED_FORMULA_KEY *a,
const BIFF_SHARED_FORMULA_KEY *b)
{
if (a->col == b->col &&
a->row == b->row) return 1 ;
return 0 ;
}
/**
* See S59D5D.HTM
**/
......@@ -791,10 +823,10 @@ ms_excel_set_cell_font (MS_EXCEL_SHEET * sheet, Cell * cell, BIFF_XF_DATA * xf)
static void
ms_excel_set_cell_xf (MS_EXCEL_SHEET * sheet, Cell * cell, guint16 xfidx)
{
GList *ptr;
int cnt;
BIFF_XF_DATA *xf;
g_return_if_fail (cell->value) ;
if (xfidx == 0){
/* printf ("Normal cell formatting\n"); */
return;
......@@ -1113,10 +1145,28 @@ ms_excel_sheet_new (MS_EXCEL_WORKBOOK * wb, char *name)
ans->gnum_sheet = sheet_new (wb->gnum_wb, name);
ans->blank = 1 ;
ans->wb = wb;
ans->array_formulae = 0;
ans->shared_formulae = g_hash_table_new ((GHashFunc)biff_shared_formula_hash,
(GCompareFunc)biff_shared_formula_equal) ;
return ans;
}
char *
ms_excel_sheet_shared_formula (MS_EXCEL_SHEET *sheet,
int col, int row)
{
BIFF_SHARED_FORMULA_KEY k ;
BIFF_SHARED_FORMULA *sf ;
k.col = col ;
k.row = row ;
sf = g_hash_table_lookup (sheet->shared_formulae, &k) ;
if (sf)
return ms_excel_parse_formula (sheet, sf->data, col, row, sf->data_len) ;
printf ("Duff shared formula index %d %d\n", col, row) ;
return strdup ("00") ;
}
static void
ms_excel_sheet_set_version (MS_EXCEL_SHEET *sheet, eBiff_version ver)
{
......@@ -1133,9 +1183,8 @@ ms_excel_sheet_insert (MS_EXCEL_SHEET * sheet, int xfidx, int col, int row, char
sheet->blank = 0 ;
cell_set_text_simple (cell, text);
}
else {
else
cell_set_text_simple (cell, "") ;
}
ms_excel_set_cell_xf (sheet, cell, xfidx);
}
......@@ -1148,13 +1197,11 @@ ms_excel_sheet_set_index (MS_EXCEL_SHEET *ans, int idx)
static void
ms_excel_sheet_destroy (MS_EXCEL_SHEET * sheet)
{
GList *ptr = g_list_first (sheet->array_formulae);
while (ptr){
g_free (ptr->data);
ptr = ptr->next;
}
g_list_free (sheet->array_formulae);
g_hash_table_foreach_remove (sheet->shared_formulae,
(GHRFunc)biff_shared_formula_destroy,
sheet) ;
g_hash_table_destroy (sheet->shared_formulae) ;
sheet->shared_formulae = NULL ;
sheet_destroy (sheet->gnum_sheet);
......@@ -1506,6 +1553,43 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
break;
}
case BIFF_SHRFMLA: /* See: S59DE4.HTM */
{
int array_col_first, array_col_last ;
int array_row_first, array_row_last ;
BYTE *data ;
int data_len ;
char *txt ;
Cell *cell ;
BIFF_SHARED_FORMULA *sf ;
array_row_first = BIFF_GETWORD(q->data + 0) ;
array_row_last = BIFF_GETWORD(q->data + 2) ;
array_col_first = BIFF_GETBYTE(q->data + 4) ;
array_col_last = BIFF_GETBYTE(q->data + 5) ;
data = q->data + 10 ;
data_len = BIFF_GETWORD(q->data + 8) ;
/* Whack in the hash for later */
sf = biff_shared_formula_new (array_col_first, array_row_first,
data, data_len) ;
g_hash_table_insert (sheet->shared_formulae, &sf->key, sf) ;
printf ("Shared formula of extent %d %d %d %d\n",
array_col_first, array_row_first, array_col_last, array_row_last) ;
txt = ms_excel_parse_formula (sheet, data,
array_col_first, array_row_first,
data_len) ;
/* NB. This keeps the pre-set XF record */
cell = sheet_cell_fetch (sheet->gnum_sheet,
array_col_first, array_row_first);
if (!cell)
break ;
cell_set_text_simple (cell, txt);
g_free(txt) ;
break ;
}
case BIFF_ARRAY: /* See: S59D57.HTM */
{
int array_col_first, array_col_last ;
......@@ -1519,19 +1603,10 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
array_col_first = BIFF_GETBYTE(q->data + 4) ;
array_col_last = BIFF_GETBYTE(q->data + 5) ;
switch (q->ls_op) {
case BIFF_SHRFMLA:
data = q->data + 10 ;
data_len = BIFF_GETWORD(q->data + 8) ;
break ;
default:{
/* int options = BIFF_GETWORD(q->data + 6) ; not so useful */
g_assert (q->ls_op == BIFF_ARRAY) ;
data = q->data + 14 ;
data_len = BIFF_GETWORD(q->data + 12) ;
break ;
}
}
g_assert (q->ls_op == BIFF_ARRAY) ;
data = q->data + 14 ;
data_len = BIFF_GETWORD(q->data + 12) ;
printf ("%s Formula of extent %d %d %d %d\n", q->ls_op==BIFF_ARRAY?"Array":"Shrfmla",
array_col_first, array_row_first, array_col_last, array_row_last) ;
for (xlp=array_col_first;xlp<=array_col_last;xlp++)
......@@ -1539,8 +1614,10 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
{
char *txt = ms_excel_parse_formula (sheet, data,
xlp, ylp, data_len) ;
/* FIXME: Magic XF number: 0 */
ms_excel_sheet_insert (sheet, 0, xlp, ylp, txt) ;
/* NB. This keeps the pre-set XF record */
Cell *cell = sheet_cell_fetch (sheet->gnum_sheet, xlp, ylp);
if (cell)
cell_set_text_simple (cell, txt);
g_free(txt) ;
}
break ;
......@@ -1708,7 +1785,6 @@ ms_excel_read_sheet (MS_EXCEL_SHEET *sheet, BIFF_QUERY * q, MS_EXCEL_WORKBOOK *
ms_excel_sheet_destroy (sheet) ;
return;
}
ms_excel_fixup_array_formulae (sheet);
return;
break;
case BIFF_SELECTION: /* S59DE2.HTM */
......
plugins/excel/ms-excel.h
View file @ 8f57a068
......@@ -29,10 +29,25 @@ typedef struct _MS_EXCEL_SHEET
Sheet *gnum_sheet ;
struct _MS_EXCEL_WORKBOOK *wb ;
eBiff_version ver ;
GList *array_formulae ;
GHashTable *shared_formulae ;
} MS_EXCEL_SHEET ;
extern void ms_excel_sheet_insert (MS_EXCEL_SHEET *sheet, int xfidx, int col, int row, char *text) ;
typedef struct {
guint16 col ;
guint16 row ;
} BIFF_SHARED_FORMULA_KEY ;
typedef struct {
BIFF_SHARED_FORMULA_KEY key ;
BYTE *data ;
guint32 data_len ;
} BIFF_SHARED_FORMULA ;
extern void ms_excel_sheet_insert (MS_EXCEL_SHEET *sheet,
int xfidx, int col,
int row, char *text) ;
extern char *ms_excel_sheet_shared_formula (MS_EXCEL_SHEET *sheet,
int col, int row) ;
typedef struct _MS_EXCEL_PALETTE
{
......
plugins/excel/ms-formula-read.c
View file @ 8f57a068
......@@ -693,7 +693,7 @@ make_function (PARSE_LIST *stack, int fn_idx, int numargs)
/**
* Parse that RP Excel formula, see S59E2B.HTM
* Return a dynamicaly allocated string containing the formula
* Return a dynamicaly allocated string containing the formula, never NULL
**/
char *ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
int fn_col, int fn_row, guint16 length)
......@@ -915,15 +915,15 @@ char *ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
dump(mem, length) ;
parse_list_push_raw (stack, g_strdup("Unknown name"), NO_PRECEDENCE) ;
}
case FORMULA_PTG_EXP: /* FIXME: the formula is the same as another record ... we need a cell_get_funtion call ! */
case FORMULA_PTG_EXP:
{
int top_left_col = BIFF_GETWORD(cur+2) ;
int top_left_row = BIFF_GETWORD(cur+0) ;
printf ("FIXME: I'm found in an ARRAY record ... %d %d\n",
top_left_col, top_left_row) ;
/* Just push a null string onto the stack, just to get the
XF info sorted safely */
parse_list_push_raw (stack, g_strdup(""), NO_PRECEDENCE) ;
char *txt ;
txt = ms_excel_sheet_shared_formula (sheet, top_left_col,
top_left_row) ;
txt[0] = ' ' ; /* Kill '=' */
parse_list_push_raw (stack, txt, NO_PRECEDENCE) ;
ptg_length = 4 ;
break ;
}
......@@ -946,8 +946,10 @@ char *ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
} else if (grbit & 0x02) { /* AttrIf: 'optimised' IF function */
/* Who cares if the TRUE expr has a goto at the end */
char *txt ;
printf ("Optimised IF 0x%x 0x%x\n", grbit, w) ;
dump (mem, length) ;
if (FORMULA_DEBUG>2) {
printf ("Optimised IF 0x%x 0x%x\n", grbit, w) ;
dump (mem, length) ;
}
if (w)
txt = ms_excel_parse_formula (sheet, cur+ptg_length,
fn_col, fn_row, w) ;
......@@ -1100,7 +1102,7 @@ char *ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
dump (mem, length) ;
parse_list_free (stack) ;
return g_strdup (_("Unknown formula")) ;
return g_strdup (_(" Unknown formula")) ;
}
ans = parse_list_to_equation (stack) ;
......@@ -1108,21 +1110,6 @@ char *ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
if (ans)
return ans ;
else
return g_strdup(_("Empty parse list")) ;
return g_strdup(_(" Empty parse list")) ;
}
void ms_excel_fixup_array_formulae (MS_EXCEL_SHEET *sheet)
{
GList *tmp = sheet->array_formulae ;
while (tmp)
{
FORMULA_ARRAY_DATA *dat = tmp->data ;
printf ("Copying formula from %d,%d to %d,%d\n",
dat->src_col, dat->src_row,
dat->dest_col, dat->dest_row) ;
duplicate_formula (sheet->gnum_sheet,
dat->src_col, dat->src_row,
dat->dest_col, dat->dest_row) ;
tmp = tmp->next ;
}
}
plugins/excel/ms-formula-read.h
View file @ 8f57a068
......@@ -15,8 +15,6 @@
char *ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
int fn_col, int fn_row, guint16 length) ;
void ms_excel_fixup_array_formulae (MS_EXCEL_SHEET *sheet) ;