Commit b9d4510c authored by Michael Meeks's avatar Michael Meeks

corba-workbook compile fixes,

Bugfix to ms-formula,
parent 3324d4e7
1999-05-07 Michael Meeks <michael@imaginator.com>
* src/corba-workbook.c (corba_sheet): Add CORBA_Environment
parameter, needed for Object_dupicate...
(Workbook_sheet_new, Workbook_sheet_lookup),
(Workbook_sheet_current): Updated corba_sheet's args.
* src/fn-lookup.c: Fixed choose help.
1999-05-06 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/corba-workbook.c (corba_sheet): Duplicate the object before
......
1999-05-07 Michael Meeks <michael@imaginator.com>
* src/corba-workbook.c (corba_sheet): Add CORBA_Environment
parameter, needed for Object_dupicate...
(Workbook_sheet_new, Workbook_sheet_lookup),
(Workbook_sheet_current): Updated corba_sheet's args.
* src/fn-lookup.c: Fixed choose help.
1999-05-06 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/corba-workbook.c (corba_sheet): Duplicate the object before
......
1999-05-07 Michael Meeks <michael@imaginator.com>
* src/corba-workbook.c (corba_sheet): Add CORBA_Environment
parameter, needed for Object_dupicate...
(Workbook_sheet_new, Workbook_sheet_lookup),
(Workbook_sheet_current): Updated corba_sheet's args.
* src/fn-lookup.c: Fixed choose help.
1999-05-06 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/corba-workbook.c (corba_sheet): Duplicate the object before
......
1999-05-07 Michael Meeks <michael@imaginator.com>
* src/corba-workbook.c (corba_sheet): Add CORBA_Environment
parameter, needed for Object_dupicate...
(Workbook_sheet_new, Workbook_sheet_lookup),
(Workbook_sheet_current): Updated corba_sheet's args.
* src/fn-lookup.c: Fixed choose help.
1999-05-06 Miguel de Icaza <miguel@nuclecu.unam.mx>
* src/corba-workbook.c (corba_sheet): Duplicate the object before
......
1999-05-07 Michael Meeks <michael@imaginator.com>
* ms-formula.c (ms_excel_parse_formula): Fixed horrible bug
in PTG_ATTR, not stopping on duff attr.
* ms-excel.c (ms_excel_read_cell): Cleans to ARRAY_FORMULA.
1999-05-06 Michael Meeks <michael@imaginator.com>
* ms-ole.c (ms_biff_query_new, ms_biff_merge_continues)
......
......@@ -1687,10 +1687,9 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
array_col_last = BIFF_GETBYTE(q->data + 5) ;
/* 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) ;
printf ("%s Formula of extent %d %d %d %d\n", q->ls_op==BIFF_ARRAY?"Array":"Shrfmla",
printf ("Array Formula of extent %d %d %d %d\n",
array_col_first, array_row_first, array_col_last, array_row_last) ;
for (xlp=array_col_first;xlp<=array_col_last;xlp++)
for (ylp=array_row_first;ylp<=array_row_last;ylp++)
......
......@@ -1687,10 +1687,9 @@ ms_excel_read_cell (BIFF_QUERY * q, MS_EXCEL_SHEET * sheet)
array_col_last = BIFF_GETBYTE(q->data + 5) ;
/* 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) ;
printf ("%s Formula of extent %d %d %d %d\n", q->ls_op==BIFF_ARRAY?"Array":"Shrfmla",
printf ("Array Formula of extent %d %d %d %d\n",
array_col_first, array_row_first, array_col_last, array_row_last) ;
for (xlp=array_col_first;xlp<=array_col_last;xlp++)
for (ylp=array_row_first;ylp<=array_row_last;ylp++)
......
......@@ -1040,8 +1040,7 @@ ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
default:
{
/* printf ("Search %d records\n", (int)FORMULA_OP_DATA_LEN) ; */
if (ptgbase >= FORMULA_OP_START && ptgbase < FORMULA_OP_START+FORMULA_OP_DATA_LEN)
{
if (ptgbase >= FORMULA_OP_START && ptgbase < FORMULA_OP_START+FORMULA_OP_DATA_LEN) {
FORMULA_OP_DATA *fd =
&formula_op_data[ptgbase - FORMULA_OP_START];
ExprTree *tr = expr_tree_new ();
......@@ -1050,9 +1049,11 @@ ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
tr->u.binary.value_b = parse_list_pop (&stack);
tr->u.binary.value_a = parse_list_pop (&stack);
parse_list_push (&stack, tr);
} else {
if (FORMULA_DEBUG>0)
printf ("Unknown PTG 0x%x base %x\n", ptg, ptgbase);
error=1 ;
}
else if (FORMULA_DEBUG>0)
printf ("Unknown PTG 0x%x base %x\n", ptg, ptgbase), error=1 ;
}
break ;
}
......
......@@ -1040,8 +1040,7 @@ ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
default:
{
/* printf ("Search %d records\n", (int)FORMULA_OP_DATA_LEN) ; */
if (ptgbase >= FORMULA_OP_START && ptgbase < FORMULA_OP_START+FORMULA_OP_DATA_LEN)
{
if (ptgbase >= FORMULA_OP_START && ptgbase < FORMULA_OP_START+FORMULA_OP_DATA_LEN) {
FORMULA_OP_DATA *fd =
&formula_op_data[ptgbase - FORMULA_OP_START];
ExprTree *tr = expr_tree_new ();
......@@ -1050,9 +1049,11 @@ ms_excel_parse_formula (MS_EXCEL_SHEET *sheet, guint8 *mem,
tr->u.binary.value_b = parse_list_pop (&stack);
tr->u.binary.value_a = parse_list_pop (&stack);
parse_list_push (&stack, tr);
} else {
if (FORMULA_DEBUG>0)
printf ("Unknown PTG 0x%x base %x\n", ptg, ptgbase);
error=1 ;
}
else if (FORMULA_DEBUG>0)
printf ("Unknown PTG 0x%x base %x\n", ptg, ptgbase), error=1 ;
}
break ;
}
......
......@@ -19,12 +19,12 @@ static char *help_choose = {
"@SYNTAX=CHOOSE(index[,value1][,value2]...)\n"
"@DESCRIPTION="
"CORREL returns the value of index @index."
"CHOOSE returns the value of index @index."
"index is rounded to an integer if it is not."
"\n"
"if index < 1 or index > number of values: returns #VAL!."
"\n"
"@SEEALSO=COVAR,FISHER,FISHERINV")
"@SEEALSO=IF")
};
static Value *
......
......@@ -31,9 +31,9 @@ workbook_from_servant (PortableServer_Servant servant)
}
static inline GNOME_Gnumeric_Sheet
corba_sheet (Sheet *sheet)
corba_sheet (Sheet *sheet, CORBA_Environment *ev)
{
return CORBA_Object_duplicate (sheet->corba_server);
return CORBA_Object_duplicate (sheet->corba_server, ev);
}
static GNOME_Gnumeric_Sheet
......@@ -52,7 +52,7 @@ Workbook_sheet_new (PortableServer_Servant servant, const CORBA_char * name, COR
workbook_attach_sheet (workbook, sheet);
return corba_sheet (sheet);
return corba_sheet (sheet, ev);
}
static GNOME_Gnumeric_Sheet
......@@ -65,7 +65,7 @@ Workbook_sheet_lookup (PortableServer_Servant servant, const CORBA_char * name,
if (sheet == NULL)
return CORBA_OBJECT_NIL;
return corba_sheet (sheet);
return corba_sheet (sheet, ev);
}
static void
......@@ -90,7 +90,7 @@ Workbook_sheet_current (PortableServer_Servant servant, CORBA_Environment * ev)
Workbook *workbook = workbook_from_servant (servant);
Sheet *sheet = workbook_get_current_sheet (workbook);
return corba_sheet (sheet);
return corba_sheet (sheet, ev);
}
static GNOME_Gnumeric_Sheet
......
......@@ -19,12 +19,12 @@ static char *help_choose = {
"@SYNTAX=CHOOSE(index[,value1][,value2]...)\n"
"@DESCRIPTION="
"CORREL returns the value of index @index."
"CHOOSE returns the value of index @index."
"index is rounded to an integer if it is not."
"\n"
"if index < 1 or index > number of values: returns #VAL!."
"\n"
"@SEEALSO=COVAR,FISHER,FISHERINV")
"@SEEALSO=IF")
};
static Value *
......
......@@ -19,12 +19,12 @@ static char *help_choose = {
"@SYNTAX=CHOOSE(index[,value1][,value2]...)\n"
"@DESCRIPTION="
"CORREL returns the value of index @index."
"CHOOSE returns the value of index @index."
"index is rounded to an integer if it is not."
"\n"
"if index < 1 or index > number of values: returns #VAL!."
"\n"
"@SEEALSO=COVAR,FISHER,FISHERINV")
"@SEEALSO=IF")
};
static Value *
......
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