Commit 37a91d75 authored by Morten Welinder's avatar Morten Welinder

Compilation: catch up to goffice.

parent a209292a
......@@ -88,7 +88,7 @@ go_gnm_component_get_data (GOComponent *component, gpointer *data, int *length,
GOGnmComponent *gognm = GO_GNM_COMPONENT (component);
if (gognm->edited) {
GOCmdContext *cc = go_component_get_command_context ();
IOContext *io_context = gnumeric_io_context_new (cc);
GOIOContext *io_context = go_io_context_new (cc);
GsfOutput *output = gsf_output_memory_new ();
WorkbookView *wbv = wb_control_view (WORKBOOK_CONTROL (gognm->edited));
Workbook *wb = wb_view_get_workbook (wbv);
......@@ -112,7 +112,7 @@ go_gnm_component_set_data (GOComponent *component)
SheetView *sv;
GnmRange const *range;
GOCmdContext *cc = go_component_get_command_context ();
IOContext *io_context = gnumeric_io_context_new (cc);
GOIOContext *io_context = go_io_context_new (cc);
GsfInput *input = gsf_input_memory_new (component->data, component->length, FALSE);
g_object_set (G_OBJECT (io_context), "exec-main-loop", FALSE, NULL);
......@@ -190,7 +190,7 @@ go_gnm_component_edit (GOComponent *component)
wv = workbook_view_new (workbook_new_with_sheets (1));
} else {
GOCmdContext *cc = go_component_get_command_context ();
IOContext *io_context = gnumeric_io_context_new (cc);
GOIOContext *io_context = go_io_context_new (cc);
GsfInput *input = gsf_input_memory_new (component->data, component->length, FALSE);
g_object_set (G_OBJECT (io_context), "exec-main-loop", FALSE, NULL);
......
......@@ -1632,7 +1632,7 @@ applix_conventions_new (void)
}
void
applix_read (IOContext *io_context, WorkbookView *wb_view, GsfInput *src)
applix_read (GOIOContext *io_context, WorkbookView *wb_view, GsfInput *src)
{
int i;
int res;
......@@ -1702,7 +1702,7 @@ applix_read (IOContext *io_context, WorkbookView *wb_view, GsfInput *src)
g_ptr_array_free (state.font_names, TRUE);
if (state.parse_error != NULL)
gnumeric_io_go_error_info_set (io_context, state.parse_error);
go_io_error_info_set (io_context, state.parse_error);
gnm_conventions_free (state.convs);
}
......@@ -83,7 +83,7 @@ applix_write_colormap (ApplixWriteState *state)
}
void
applix_write (IOContext *io_context, WorkbookView const *wb_view, GsfOutput *sink)
applix_write (GOIOContext *io_context, WorkbookView const *wb_view, GsfOutput *sink)
{
ApplixWriteState state;
......@@ -99,5 +99,5 @@ applix_write (IOContext *io_context, WorkbookView const *wb_view, GsfOutput *sin
d (1, fprintf (stderr, "------------Finish writing"););
if (state.parse_error != NULL)
gnumeric_io_go_error_info_set (io_context, state.parse_error);
go_io_error_info_set (io_context, state.parse_error);
}
......@@ -5,8 +5,8 @@
#include <gsf/gsf.h>
#include <stdio.h>
void applix_read (IOContext *io_context, WorkbookView *wbv, GsfInput *src);
void applix_write (IOContext *io_context, WorkbookView const *wbv,
void applix_read (GOIOContext *io_context, WorkbookView *wbv, GsfInput *src);
void applix_write (GOIOContext *io_context, WorkbookView const *wbv,
GsfOutput *sink);
#endif /* PLUGIN_APPLIX_H */
......@@ -37,9 +37,9 @@ GNM_PLUGIN_MODULE_HEADER;
gboolean applix_file_probe (GOFileOpener const *fo, GsfInput *input,
FileProbeLevel pl);
void applix_file_open (GOFileOpener const *fo, IOContext *io_context,
void applix_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
void applix_file_save (GOFileSaver const *fs, IOContext *io_context,
void applix_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
gboolean
......@@ -54,14 +54,14 @@ applix_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
}
void
applix_file_open (GOFileOpener const *fo, IOContext *io_context,
applix_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
applix_read (io_context, wb_view, input);
}
void
applix_file_save (GOFileSaver const *fs, IOContext *io_context,
applix_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
applix_write (io_context, wb_view, output);
......
......@@ -67,7 +67,7 @@ capp_workbook_open (PortableServer_Servant ignore,
wbv = NULL;
} else {
GOCmdContext *cc = cmd_context_stderr_new ();
IOContext *io_context = gnumeric_io_context_new (cc);
GOIOContext *io_context = go_io_context_new (cc);
wbv = wb_view_new_from_uri (file_name, NULL, io_context, NULL);
g_object_unref (G_OBJECT (io_context));
g_object_unref (G_OBJECT (cc));
......
......@@ -33,13 +33,13 @@ GNM_PLUGIN_MODULE_HEADER;
#define N_INPUT_LINES_BETWEEN_UPDATES 50
void dif_file_open (GOFileOpener const *fo, IOContext *io_context,
void dif_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wbv, GsfInput *input);
void dif_file_save (GOFileSaver const *fs, IOContext *io_context,
void dif_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wbv, GsfOutput *out);
typedef struct {
IOContext *io_context;
GOIOContext *io_context;
GsfInputTextline *input;
gint line_no;
......@@ -53,7 +53,7 @@ typedef struct {
static DifInputContext *
dif_input_context_new (IOContext *io_context, Workbook *wb, GsfInput *input)
dif_input_context_new (GOIOContext *io_context, Workbook *wb, GsfInput *input)
{
DifInputContext *ctxt = NULL;
......@@ -170,7 +170,7 @@ dif_parse_data (DifInputContext *ctxt)
if (val_type == 0) {
gchar const *comma = strchr (ctxt->line, ',');
if (comma == NULL)
gnm_io_warning (ctxt->io_context,
go_io_warning (ctxt->io_context,
_("Syntax error at line %d. Ignoring."),
ctxt->line_no);
else if (col > gnm_sheet_get_max_cols (ctxt->sheet)) {
......@@ -192,7 +192,7 @@ dif_parse_data (DifInputContext *ctxt)
} else if (0 == strcmp (ctxt->line, "FALSE")) { /* FALSE bool F res must be O */
v = value_new_bool (TRUE);
} else if (0 == strcmp (ctxt->line, "ERROR")) { /* ERROR err res must be O */
gnm_io_warning (ctxt->io_context,
go_io_warning (ctxt->io_context,
_("Unknown value type '%s' at line %d. Ignoring."),
ctxt->line, ctxt->line_no);
}
......@@ -265,11 +265,11 @@ dif_parse_sheet (DifInputContext *ctxt)
GnmLocale *locale = gnm_push_C_locale ();
if (!dif_parse_header (ctxt)) {
gnumeric_io_go_error_info_set (ctxt->io_context, go_error_info_new_printf (
go_io_error_info_set (ctxt->io_context, go_error_info_new_printf (
_("Unexpected end of file at line %d while reading header."),
ctxt->line_no));
} else if (!dif_parse_data(ctxt)) {
gnumeric_io_go_error_info_set (ctxt->io_context, go_error_info_new_printf (
go_io_error_info_set (ctxt->io_context, go_error_info_new_printf (
_("Unexpected end of file at line %d while reading data."),
ctxt->line_no));
}
......@@ -278,7 +278,7 @@ dif_parse_sheet (DifInputContext *ctxt)
}
void
dif_file_open (GOFileOpener const *fo, IOContext *io_context,
dif_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wbv, GsfInput *input)
{
Workbook *wb = wb_view_get_workbook (wbv);
......@@ -288,19 +288,19 @@ dif_file_open (GOFileOpener const *fo, IOContext *io_context,
go_file_saver_for_id ("Gnumeric_dif:dif"));
if (ctxt != NULL) {
dif_parse_sheet (ctxt);
if (gnumeric_io_error_occurred (io_context))
gnumeric_io_error_push (io_context,
if (go_io_error_occurred (io_context))
go_io_error_push (io_context,
go_error_info_new_str (_("Error while reading DIF file.")));
dif_input_context_destroy (ctxt);
} else if (!gnumeric_io_error_occurred (io_context))
gnumeric_io_error_unknown (io_context);
} else if (!go_io_error_occurred (io_context))
go_io_error_unknown (io_context);
}
/*
* Write _current_ sheet of the workbook to a DIF format file
*/
void
dif_file_save (GOFileSaver const *fs, IOContext *io_context,
dif_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wbv, GsfOutput *out)
{
GnmLocale *locale;
......@@ -311,7 +311,7 @@ dif_file_save (GOFileSaver const *fs, IOContext *io_context,
sheet = wb_view_cur_sheet (wbv);
if (sheet == NULL) {
gnumeric_io_error_string (io_context, _("Cannot get default sheet."));
go_io_error_string (io_context, _("Cannot get default sheet."));
return;
}
......@@ -363,5 +363,5 @@ dif_file_save (GOFileSaver const *fs, IOContext *io_context,
gnm_pop_C_locale (locale);
if (!ok)
gnumeric_io_error_string (io_context, _("Error while saving DIF file."));
go_io_error_string (io_context, _("Error while saving DIF file."));
}
......@@ -66,10 +66,10 @@ gint ms_excel_write_debug = 0;
gint ms_excel_object_debug = 0;
gboolean excel_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl);
void excel_file_open (GOFileOpener const *fo, IOContext *context, WorkbookView *wbv, GsfInput *input);
void excel_biff7_file_save (GOFileSaver const *fs, IOContext *context, WorkbookView const *wbv, GsfOutput *output);
void excel_biff8_file_save (GOFileSaver const *fs, IOContext *context, WorkbookView const *wbv, GsfOutput *output);
void excel_dsf_file_save (GOFileSaver const *fs, IOContext *context, WorkbookView const *wbv, GsfOutput *output);
void excel_file_open (GOFileOpener const *fo, GOIOContext *context, WorkbookView *wbv, GsfInput *input);
void excel_biff7_file_save (GOFileSaver const *fs, GOIOContext *context, WorkbookView const *wbv, GsfOutput *output);
void excel_biff8_file_save (GOFileSaver const *fs, GOIOContext *context, WorkbookView const *wbv, GsfOutput *output);
void excel_dsf_file_save (GOFileSaver const *fs, GOIOContext *context, WorkbookView const *wbv, GsfOutput *output);
static GsfInput *
find_content_stream (GsfInfile *ole, gboolean *is_97)
......@@ -122,14 +122,14 @@ excel_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl)
static void
excel_read_metadata (GsfDocMetaData *meta_data, GsfInfile *ole, char const *name,
IOContext *context)
GOIOContext *context)
{
GsfInput *stream = gsf_infile_child_by_name (ole, name);
if (stream != NULL) {
GError *err = gsf_msole_metadata_read (stream, meta_data);
if (err != NULL) {
gnm_io_warning (context, "%s", err->message);
go_io_warning (context, "%s", err->message);
g_error_free (err);
}
......@@ -147,7 +147,7 @@ cb_dump_vba (char const *name, guint8 const *src_code)
/* Service entry point */
void
excel_file_open (GOFileOpener const *fo, IOContext *context,
excel_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wbv, GsfInput *input)
{
GsfInput *stream = NULL;
......@@ -241,7 +241,7 @@ excel_file_open (GOFileOpener const *fo, IOContext *context,
}
static void
excel_save (IOContext *context, WorkbookView const *wbv, GsfOutput *output,
excel_save (GOIOContext *context, WorkbookView const *wbv, GsfOutput *output,
gboolean biff7, gboolean biff8)
{
Workbook *wb;
......@@ -300,20 +300,20 @@ excel_save (IOContext *context, WorkbookView const *wbv, GsfOutput *output,
}
void
excel_dsf_file_save (GOFileSaver const *fs, IOContext *context,
excel_dsf_file_save (GOFileSaver const *fs, GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
excel_save (context, wbv, output, TRUE, TRUE);
}
void
excel_biff8_file_save (GOFileSaver const *fs, IOContext *context,
excel_biff8_file_save (GOFileSaver const *fs, GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
excel_save (context, wbv, output, FALSE, TRUE);
}
void
excel_biff7_file_save (GOFileSaver const *fs, IOContext *context,
excel_biff7_file_save (GOFileSaver const *fs, GOIOContext *context,
WorkbookView const *wbv, GsfOutput *output)
{
excel_save (context, wbv, output, TRUE, FALSE);
......
......@@ -60,7 +60,7 @@
typedef struct {
GnumericXMLVersion version;
IOContext *context; /* The IOcontext managing things */
GOIOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
Workbook *wb; /* The new workbook */
Sheet *sheet; /* The current sheet */
......@@ -112,7 +112,7 @@ xl_xml_warning (GsfXMLIn *xin, char const *fmt, ...)
msg = tmp;
}
gnm_io_warning (state->context, "%s", msg);
go_io_warning (state->context, "%s", msg);
g_warning ("%s", msg);
g_free (msg);
......@@ -127,7 +127,7 @@ unknown_attr (GsfXMLIn *xin,
g_return_if_fail (attrs != NULL);
if (state->version == GNM_XML_LATEST)
gnm_io_warning (state->context,
go_io_warning (state->context,
_("Unexpected attribute %s::%s == '%s'."),
name, attrs[0], attrs[1]);
}
......@@ -1011,7 +1011,7 @@ GSF_XML_IN_NODE_FULL (START, WORKBOOK, XL_NS_SS, "Workbook", GSF_XML_NO_CONTENT,
};
G_MODULE_EXPORT void
excel_xml_file_open (GOFileOpener const *fo, IOContext *context,
excel_xml_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wbv, GsfInput *input);
G_MODULE_EXPORT gboolean
......@@ -1048,7 +1048,7 @@ excel_xml_file_probe (GOFileOpener const *fo, GsfInput *input, FileProbeLevel pl
}
void
excel_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
excel_xml_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
GsfXMLInDoc *doc;
......@@ -1066,7 +1066,7 @@ excel_xml_file_open (GOFileOpener const *fo, IOContext *io_context,
doc = gsf_xml_in_doc_new (excel_xml_dtd, content_ns);
if (!gsf_xml_in_doc_parse (doc, input, &state))
gnumeric_io_error_string (io_context, _("XML document not well formed!"));
go_io_error_string (io_context, _("XML document not well formed!"));
gsf_xml_in_doc_free (doc);
g_hash_table_destroy (state.style_hash);
......
......@@ -15,12 +15,12 @@
#include "gnumeric.h"
#include "ms-biff.h"
void excel_read_workbook (IOContext *context, WorkbookView *new_wb, GsfInput *input,
void excel_read_workbook (GOIOContext *context, WorkbookView *new_wb, GsfInput *input,
gboolean *is_double_stream_file);
typedef struct _XLSExporter ExcelWriteState;
void excel_write_state_free (ExcelWriteState *ewb);
ExcelWriteState *excel_write_state_new (IOContext *context, WorkbookView const *wbv,
ExcelWriteState *excel_write_state_new (GOIOContext *context, WorkbookView const *wbv,
gboolean biff7, gboolean biff8);
void excel_write_v7 (ExcelWriteState *ewb, GsfOutfile *output);
......
......@@ -2998,7 +2998,7 @@ ms_wb_get_font_markup (MSContainer const *c, unsigned indx)
}
static GnmXLImporter *
gnm_xl_importer_new (IOContext *context, WorkbookView *wb_view)
gnm_xl_importer_new (GOIOContext *context, WorkbookView *wb_view)
{
static MSContainerClass const vtbl = {
NULL, NULL,
......@@ -3260,7 +3260,7 @@ excel_parse_name (GnmXLImporter *importer, Sheet *sheet, char *name,
TRUE, NULL);
if (texpr == NULL) {
gnm_io_warning (importer->context, _("Failure parsing name '%s'"), name);
go_io_warning (importer->context, _("Failure parsing name '%s'"), name);
texpr = gnm_expr_top_new_constant (value_new_error_REF (NULL));
} else d (2, {
char *tmp;
......@@ -3295,7 +3295,7 @@ excel_parse_name (GnmXLImporter *importer, Sheet *sheet, char *name,
texpr,
&err, link_to_container, stub);
if (nexpr == NULL) {
gnm_io_warning (importer->context, "%s", err);
go_io_warning (importer->context, "%s", err);
g_free (err);
return NULL;
}
......@@ -3378,16 +3378,16 @@ excel_read_EXTERNNAME (BiffQuery *q, MSContainer *container)
expr_len = el;
expr_data = q->data + 9 + namelen;
} else
gnm_io_warning (container->importer->context,
go_io_warning (container->importer->context,
_("Incorrect expression for name '%s': content will be lost.\n"),
name);
}
} else if ((flags & 0x10) == 0) /* DDE */
gnm_io_warning (container->importer->context,
go_io_warning (container->importer->context,
_("DDE links are not supported yet.\nName '%s' will be lost.\n"),
name ? name : "NULL");
else /* OLE */
gnm_io_warning (container->importer->context,
go_io_warning (container->importer->context,
_("OLE links are not supported yet.\nName '%s' will be lost.\n"),
name ? name : "NULL");
......@@ -5802,7 +5802,7 @@ excel_read_EXTERNSHEET_v7 (BiffQuery const *q, MSContainer *container)
default:
/* Fix when we get placeholders to external workbooks */
d (1, gsf_mem_dump (q->data, q->length););
gnm_io_warning_unsupported_feature (container->importer->context,
go_io_warning_unsupported_feature (container->importer->context,
_("external references"));
}
......@@ -6536,7 +6536,7 @@ static void
excel_read_BOF (BiffQuery *q,
GnmXLImporter *importer,
WorkbookView *wb_view,
IOContext *context,
GOIOContext *context,
MsBiffBofData **version, unsigned *current_sheet)
{
/* The first BOF seems to be OK, the rest lie ? */
......@@ -6646,7 +6646,7 @@ excel_read_CODEPAGE (BiffQuery *q, GnmXLImporter *importer)
}
void
excel_read_workbook (IOContext *context, WorkbookView *wb_view, GsfInput *input,
excel_read_workbook (GOIOContext *context, WorkbookView *wb_view, GsfInput *input,
gboolean *is_double_stream_file)
{
GnmXLImporter *importer;
......
......@@ -100,7 +100,7 @@ typedef struct {
struct _GnmXLImporter {
MSContainer container;
IOContext *context;
GOIOContext *context;
WorkbookView *wbv;
Workbook *wb;
MsBiffVersion ver;
......
......@@ -203,7 +203,7 @@ map_color_to_palette (XLExportBase const *xle,
void
excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
int maxcols, int maxrows, IOContext *io_context)
int maxcols, int maxrows, GOIOContext *io_context)
{
int i;
......@@ -211,7 +211,7 @@ excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
*extent = sheet_get_extent (sheet, FALSE);
if (extent->end.col >= maxcols) {
gnm_io_warning (io_context,
go_io_warning (io_context,
ngettext("Some content will be lost when saving. "
"This format only supports %u column, and "
"this workbook has %d",
......@@ -223,7 +223,7 @@ excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
extent->end.col = maxcols - 1;
}
if (extent->end.row >= maxrows) {
gnm_io_warning (io_context,
go_io_warning (io_context,
ngettext("Some content will be lost when saving. "
"This format only supports %u row, and "
"this workbook has %d",
......@@ -5862,7 +5862,7 @@ free_excel_func (ExcelFunc *efunc)
}
ExcelWriteState *
excel_write_state_new (IOContext *context, WorkbookView const *wb_view,
excel_write_state_new (GOIOContext *context, WorkbookView const *wb_view,
gboolean biff7, gboolean biff8)
{
ExcelWriteState *ewb = g_new (ExcelWriteState, 1);
......
......@@ -80,7 +80,7 @@ typedef struct {
struct _XLSExporter {
XLExportBase base;
IOContext *io_context;
GOIOContext *io_context;
BiffPut *bp;
GPtrArray *esheets;
......@@ -170,7 +170,7 @@ GHashTable *excel_collect_hlinks (GnmStyleList *ptr,
GHashTable *excel_collect_pivot_caches (Workbook const *wb);
void excel_sheet_extent (Sheet const *sheet, GnmRange *extent, GnmStyle **col_styles,
int maxcols, int maxrows, IOContext *io_context);
int maxcols, int maxrows, GOIOContext *io_context);
int excel_font_from_go_font (XLExportBase *ewb, GOFont const *font);
......
......@@ -525,7 +525,7 @@ write_funcall (PolishData *pd, GnmExpr const *expr,
for (arg = 0; arg < expr->func.argc; arg++)
if (ef->efunc != NULL && arg >= ef->efunc->max_args) {
gnm_io_warning (pd->ewb->io_context,
go_io_warning (pd->ewb->io_context,
_("Too many arguments for function '%s', MS Excel can only handle %d not %d"),
ef->efunc->name, ef->efunc->max_args, expr->func.argc);
break;
......
......@@ -106,7 +106,7 @@ typedef struct {
typedef struct {
GsfInfile *zip;
IOContext *context; /* The IOcontext managing things */
GOIOContext *context; /* The IOcontext managing things */
WorkbookView *wb_view; /* View for the new workbook */
Workbook *wb; /* The new workbook */
......@@ -241,7 +241,7 @@ xlsx_parse_stream (XLSXReadState *state, GsfInput *in, GsfXMLInNode const *dtd)
success = gsf_xml_in_doc_parse (doc, in, state);
if (!success)
gnm_io_warning (state->context,
go_io_warning (state->context,
_("'%s' is corrupt!"),
gsf_input_name (in));
......@@ -266,7 +266,7 @@ xlsx_parse_rel_by_id (GsfXMLIn *xin, char const *part_id,
err = gsf_open_pkg_parse_rel_by_id (xin, part_id, dtd, ns);
if (NULL != err) {
XLSXReadState *state = (XLSXReadState *)xin->user_state;
gnm_io_warning (state->context, "%s", err->message);
go_io_warning (state->context, "%s", err->message);
g_error_free (err);
}
......@@ -305,7 +305,7 @@ xlsx_warning (GsfXMLIn *xin, char const *fmt, ...)
msg = tmp;
}
gnm_io_warning (state->context, "%s", msg);
go_io_warning (state->context, "%s", msg);
g_printerr ("%s\n", msg);
g_free (msg);
......@@ -5103,11 +5103,11 @@ xlsx_style_array_free (GPtrArray *styles)
}
G_MODULE_EXPORT void
xlsx_file_open (GOFileOpener const *fo, IOContext *context,
xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wb_view, GsfInput *input);
void
xlsx_file_open (GOFileOpener const *fo, IOContext *context,
xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
WorkbookView *wb_view, GsfInput *input)
{
XLSXReadState state;
......
......@@ -79,7 +79,7 @@ typedef struct {
GHashTable *shared_string_hash;
GPtrArray *shared_string_array;
GnmConventions *convs;
IOContext *io_context;
GOIOContext *io_context;
GsfOutfile *xl_dir;
struct {
......@@ -1489,10 +1489,10 @@ xlsx_write_workbook (XLSXWriteState *state, GsfOutfile *root_part)
}
G_MODULE_EXPORT void
xlsx_file_save (GOFileSaver const *fs, IOContext *io_context,
xlsx_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output);
void
xlsx_file_save (GOFileSaver const *fs, IOContext *io_context,
xlsx_file_save (GOFileSaver const *fs, GOIOContext *io_context,
gconstpointer wb_view, GsfOutput *output)
{
XLSXWriteState state;
......
......@@ -595,7 +595,7 @@ write_sheet (GsfOutput *output, Sheet *sheet,
* write the html file (version of html according to version argument)
*/
static void
html_file_save (GOFileSaver const *fs, IOContext *io_context,
html_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output, html_version_t version)
{
GSList *sheets, *ptr;
......@@ -690,35 +690,35 @@ html_file_save (GOFileSaver const *fs, IOContext *io_context,
}
void
html40_file_save (GOFileSaver const *fs, IOContext *io_context,
html40_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, HTML40);
}
void
html32_file_save (GOFileSaver const *fs, IOContext *io_context,
html32_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, HTML32);
}
void
html40frag_file_save (GOFileSaver const *fs, IOContext *io_context,
html40frag_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, HTML40F);
}
void
xhtml_file_save (GOFileSaver const *fs, IOContext *io_context,
xhtml_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
html_file_save (fs, io_context, wb_view, output, XHTML);
}
void
xhtml_range_file_save (GOFileSaver const *fs, IOContext *io_context,
xhtml_range_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
/* Identical, but fs->save_scope is different */
......
......@@ -25,18 +25,18 @@
#include "gnumeric.h"
#include <goffice/goffice.h>
void html32_file_save (GOFileSaver const *fs, IOContext *io_context,
void html32_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
void html40_file_save (GOFileSaver const *fs, IOContext *io_context,
void html40_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
void html40frag_file_save (GOFileSaver const *fs, IOContext *io_context,
void html40frag_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
void xhtml_file_save (GOFileSaver const *fs, IOContext *io_context,
void xhtml_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
void xhtml_range_file_save (GOFileSaver const *fs, IOContext *io_context,
void xhtml_range_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
void html_file_open (GOFileOpener const *fo, IOContext *io_context,
void html_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input);
gboolean html_file_probe (GOFileOpener const *fo, GsfInput *input,
......
......@@ -463,7 +463,7 @@ html_search_for_tables (htmlNodePtr cur, htmlDocPtr doc,
}
void
html_file_open (GOFileOpener const *fo, IOContext *io_context,
html_file_open (GOFileOpener const *fo, GOIOContext *io_context,
WorkbookView *wb_view, GsfInput *input)
{
guint8 const *buf;
......@@ -545,7 +545,7 @@ html_file_open (GOFileOpener const *fo, IOContext *io_context,
html_search_for_tables (ptr, doc, wb_view, &tc);
xmlFreeDoc (doc);
} else
gnumeric_io_go_error_info_set (io_context,
go_io_error_info_set (io_context,
go_error_info_new_str (_("Unable to parse the html.")));
}
......
......@@ -1175,7 +1175,7 @@ latex2e_print_hhline (GsfOutput *output, GnmStyleBorderType *clines, int n, GnmS
* to render the format and contents of the cell.
*/
void
latex_file_save (GOFileSaver const *fs, IOContext *io_context,
latex_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
GnmCell *cell;
......@@ -1445,7 +1445,7 @@ latex2e_table_write_file_header(GsfOutput *output)
* We try to avoid all formatting.
*/
void
latex_table_file_save (GOFileSaver const *fs, IOContext *io_context,
latex_table_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
GnmCell *cell;
......
......@@ -25,10 +25,10 @@
#include <gnumeric.h>
#include <goffice/goffice.h>
void latex_file_save (GOFileSaver const *fs, IOContext *io_context,
void latex_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
void latex_table_file_save (GOFileSaver const *fs, IOContext *io_context,
void latex_table_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
#endif
......@@ -83,7 +83,7 @@ roff_fprintf (GsfOutput *output, GnmCell *cell)
* FIXME: Should roff quote sheet name (and everything else)
*/
void
roff_file_save (GOFileSaver const *fs, IOContext *io_context,
roff_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)