Commit 608aed5a authored by Michael Meeks's avatar Michael Meeks
Browse files

more delayed realization

parent ac6575bf
1999-09-26 Michael Meeks <michael@nuclecu.unam.mx>
* ms-escher.c (ms_escher_read_ClientData): Remove realize & queue
objects instead. Add precondition on state->sheet.
1999-09-26 Michael Meeks <michael@nuclecu.unam.mx> 1999-09-26 Michael Meeks <michael@nuclecu.unam.mx>
* ole.c (ms_biff_query_next_merge, ms_biff_query_new): inline. * ole.c (ms_biff_query_next_merge, ms_biff_query_new): inline.
......
...@@ -1731,12 +1731,14 @@ ms_escher_read_ClientTextbox (MSEscherState * state, MSEscherHeader * h) ...@@ -1731,12 +1731,14 @@ ms_escher_read_ClientTextbox (MSEscherState * state, MSEscherHeader * h)
} }
static gboolean static gboolean
ms_escher_read_ClientData (MSEscherState * state, MSEscherHeader * h) ms_escher_read_ClientData (MSEscherState *state, MSEscherHeader *h)
{ {
int i; int i;
guint16 opcode; guint16 opcode;
MSObj * obj; MSObj *obj;
ExcelSheet *sheet;
g_return_val_if_fail (state->sheet != NULL, TRUE);
g_return_val_if_fail (h->len == common_header_len, TRUE); g_return_val_if_fail (h->len == common_header_len, TRUE);
g_return_val_if_fail (h->offset + h->len == state->end_offset, TRUE); g_return_val_if_fail (h->offset + h->len == state->end_offset, TRUE);
...@@ -1745,7 +1747,8 @@ ms_escher_read_ClientData (MSEscherState * state, MSEscherHeader * h) ...@@ -1745,7 +1747,8 @@ ms_escher_read_ClientData (MSEscherState * state, MSEscherHeader * h)
g_return_val_if_fail (opcode == BIFF_OBJ, TRUE); g_return_val_if_fail (opcode == BIFF_OBJ, TRUE);
g_return_val_if_fail (ms_biff_query_next (state->q), TRUE); g_return_val_if_fail (ms_biff_query_next (state->q), TRUE);
obj = ms_read_OBJ (state->q, state->wb, state->sheet->gnum_sheet); sheet = state->sheet;
obj = ms_read_OBJ (state->q, state->wb, sheet->gnum_sheet);
if (obj == NULL) if (obj == NULL)
return FALSE; return FALSE;
...@@ -1766,7 +1769,9 @@ ms_escher_read_ClientData (MSEscherState * state, MSEscherHeader * h) ...@@ -1766,7 +1769,9 @@ ms_escher_read_ClientData (MSEscherState * state, MSEscherHeader * h)
break; break;
}; };
return ms_obj_realize(obj, state->wb, state->sheet); sheet->obj_queue = g_list_append (sheet->obj_queue,
obj);
return FALSE;
} }
/****************************************************************************/ /****************************************************************************/
......
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