Commit 55be42f8 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

add Helv.

2002-01-31  Jody Goldberg <jody@gnome.org>

	* ms-excel-util.c (init_xl_font_widths) : add Helv.

	* ms-excel-read.c (ms_sheet_create_obj) : GObject vs GtkObject
	* ms-obj.c (ms_obj_delete) : ditto.
	* ms-chart.c (ms_excel_read_chart) : ditto.
parent 10a5bf7a
2002-01-31 Jody Goldberg <jody@gnome.org>
* ms-excel-util.c (init_xl_font_widths) : add Helv.
* ms-excel-read.c (ms_sheet_create_obj) : GObject vs GtkObject
* ms-obj.c (ms_obj_delete) : ditto.
* ms-chart.c (ms_excel_read_chart) : ditto.
2002-01-30 Jody Goldberg <jody@gnome.org>
* ms-formula-read.c (ms_excel_parse_formula) : give a warning when
......
......@@ -2358,7 +2358,7 @@ chart_realize_obj (MSContainer *container, MSObj *obj)
return FALSE;
}
static GtkObject *
static GObject *
chart_create_obj (MSContainer *container, MSObj *obj)
{
return NULL;
......@@ -2377,7 +2377,7 @@ chart_get_fmt (MSContainer const *container, guint16 indx)
}
gboolean
ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GtkObject *graph)
ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject *graph)
{
static MSContainerClass const vtbl = {
chart_realize_obj,
......@@ -2543,7 +2543,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GtkObje
}
gboolean
ms_excel_read_chart (BiffQuery *q, MSContainer *container, GtkObject *graph)
ms_excel_read_chart (BiffQuery *q, MSContainer *container, GObject *graph)
{
MsBiffBofData *bof;
gboolean res = TRUE;
......
......@@ -15,9 +15,9 @@
/* Reads charts */
gboolean ms_excel_chart (BiffQuery *q, MSContainer *container,
MsBiffVersion ver, GtkObject *so);
MsBiffVersion ver, GObject *so);
/* A wrapper which reads and checks the BOF record then calls ms_excel_chart */
gboolean ms_excel_read_chart (BiffQuery *q, MSContainer *container, GtkObject *so);
gboolean ms_excel_read_chart (BiffQuery *q, MSContainer *container, GObject *so);
#endif /* GNUMERIC_MS_CHART_H */
......@@ -11,7 +11,7 @@ typedef struct _MSObj MSObj;
typedef struct
{
gboolean (*realize_obj) (MSContainer *container, MSObj *obj);
GtkObject * (*create_obj) (MSContainer *container, MSObj *obj);
GObject * (*create_obj) (MSContainer *container, MSObj *obj);
ExprTree * (*parse_expr) (MSContainer *container,
guint8 const *data, int length);
Sheet * (*sheet) (MSContainer const *container);
......
......@@ -2161,7 +2161,7 @@ ms_sheet_map_color (ExcelSheet const *esheet, MSObj const *obj, MSObjAttrID id)
return style_color_new ((r << 8) | r, (g << 8) | g, (b << 8) | b);
}
static GtkObject *
static GObject *
ms_sheet_create_obj (MSContainer *container, MSObj *obj)
{
SheetObject *so = NULL;
......@@ -2239,14 +2239,14 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj)
g_warning ("Failed to load '%s' from "
"stream: %s", blip->obj_id,
bonobo_exception_get_text (&ev));
gtk_object_unref (GTK_OBJECT (so));
g_object_unref (G_OBJECT (so));
so = NULL;
}
CORBA_exception_free (&ev);
} else {
g_warning ("Could not set object iid '%s'!",
blip->obj_id);
gtk_object_unref (GTK_OBJECT (so));
g_object_unref (G_OBJECT (so));
so = NULL;
}
}
......@@ -2287,7 +2287,7 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj)
return NULL;
}
return so ? GTK_OBJECT (so) : NULL;
return so ? G_OBJECT (so) : NULL;
}
static ExprTree *
......@@ -3844,7 +3844,7 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb,
#endif
ms_excel_chart (q, sheet_container (esheet),
esheet->container.ver,
GTK_OBJECT (graph));
G_OBJECT (graph));
} else
puts ("EXCEL: How are we seeing chart records in a sheet ?");
continue;
......@@ -4484,7 +4484,7 @@ ms_excel_read_bof (BiffQuery *q,
NULL;
#endif
ms_excel_chart (q, &wb->container, ver->version,
GTK_OBJECT (graph));
G_OBJECT (graph));
} else if (ver->type == MS_BIFF_TYPE_VBModule ||
ver->type == MS_BIFF_TYPE_Macrosheet) {
/* Skip contents of Module, or MacroSheet */
......
......@@ -226,6 +226,7 @@ init_xl_font_widths (void)
{ 95, 102, "Haettenscheiler" },
{ 103, 110, "HE_TERMINAL" },
{ 95, 102, "Helvetica" },
{ 95, 102, "Helv" },
{ 95, 102, "Helvetica-Black" },
{ 95, 102, "Helvetica-Light" },
{ 95, 102, "Helvetica-Narrow" },
......
......@@ -233,7 +233,7 @@ ms_obj_delete (MSObj *obj)
{
if (obj) {
if (obj->gnum_obj) {
gtk_object_unref (obj->gnum_obj);
g_object_unref (obj->gnum_obj);
obj->gnum_obj = NULL;
}
if (obj->attrs) {
......
......@@ -84,7 +84,7 @@ struct _MSObj
int id;
/* Type specific parameters */
GtkObject *gnum_obj;
GObject *gnum_obj;
int excel_type;
char const *excel_type_name;
......
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