Commit 5366cac5 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

new function to chain to parent. (ms_excel_chart) : use it here.

2001-10-29  Jody Goldberg <jgoldberg@home.com>

	* ms-chart.c (chart_get_fmt) : new function to chain to parent.
	(ms_excel_chart) : use it here.

2001-10-29  Jody Goldberg <jgoldberg@home.com>

	* src/number-match.c (format_create_regexp) : escape escaped
	  characters in regexps.
parent cf2b2c94
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* src/number-match.c (format_create_regexp) : escape escaped
characters in regexps.
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* configure.in : fix python test
......
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* src/number-match.c (format_create_regexp) : escape escaped
characters in regexps.
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* configure.in : fix python test
......
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* src/number-match.c (format_create_regexp) : escape escaped
characters in regexps.
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* configure.in : fix python test
......
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* src/number-match.c (format_create_regexp) : escape escaped
characters in regexps.
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* configure.in : fix python test
......
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* ms-chart.c (chart_get_fmt) : new function to chain to parent.
(ms_excel_chart) : use it here.
2001-10-29 Jody Goldberg <jgoldberg@home.com>
* Release 0.73
......
......@@ -2363,6 +2363,12 @@ chart_parse_expr (MSContainer *container, guint8 const *data, int length)
return NULL;
}
static StyleFormat *
chart_get_fmt (MSContainer const *container, guint16 indx)
{
return ms_container_get_fmt (container->parent_container, indx);
}
gboolean
ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GtkObject *graph)
{
......@@ -2370,7 +2376,8 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GtkObje
chart_realize_obj,
chart_create_obj,
chart_parse_expr,
NULL, NULL
NULL,
chart_get_fmt
};
int const num_handler = sizeof(chart_biff_handler) /
sizeof(ExcelChartHandler *);
......
......@@ -1089,7 +1089,7 @@ ms_excel_get_xf (ExcelSheet *esheet, int xfidx)
g_return_val_if_fail (p != NULL, NULL);
if (0 > xfidx || xfidx >= (int)p->len) {
g_warning ("XL: Xf index 0x%x is not in the range[0..0x%x)", xfidx, p->len);
g_warning ("XL: Xf index 0x%X is not in the range[0..0x%X)", xfidx, p->len);
return NULL;
}
xf = g_ptr_array_index (p, xfidx);
......@@ -3855,21 +3855,16 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb,
const guint8 *ptr = q->data;
Value *v;
/* printf ("MULRK\n");
ms_ole_dump (q->data, q->length); */
row = MS_OLE_GET_GUINT16 (q->data);
col = MS_OLE_GET_GUINT16 (q->data + 2);
ptr += 4;
lastcol = MS_OLE_GET_GUINT16 (q->data + q->length - 2);
/* g_assert ((lastcol-firstcol) * 6 == q->length - 6 */
g_assert (lastcol>=col);
while (col<=lastcol) {
for (; col <= lastcol ; col++) {
/* 2byte XF, 4 byte RK */
v = biff_get_rk (ptr + 2);
ms_excel_sheet_insert_val (esheet, MS_OLE_GET_GUINT16 (ptr),
col, row, v);
col++;
ms_excel_sheet_insert_val (esheet,
MS_OLE_GET_GUINT16 (ptr), col, row, v);
ptr += 6;
}
break;
......
......@@ -150,15 +150,14 @@ format_create_regexp (unsigned char const *format, GByteArray **dest)
format++;
break;
case '\\':
if (*(format + 1)) {
case '\\': {
char buf[3];
if (format[1] != '\0')
format++;
g_string_append_c (regexp, *format);
}
break;
g_string_append_c (regexp, *format);
char_to_re (buf, *format);
g_string_append (regexp, buf);
break;
}
case '[' :
/* Currency symbol */
......
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