Commit d1a91b40 authored by Morten Welinder's avatar Morten Welinder

XLSX: fix FMR

parent 89b40898
2011-11-21 Morten Welinder <terra@gnome.org>
* xlsx-read.c (start_update_progress): Handle NULL xin.
(xlsx_file_open): Use right input stream for progress update.
Fixes an FMR.
2011-11-20 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* ms-excel-read.c (excel_read_SETUP): rename
......@@ -6,13 +12,16 @@
2011-10-29 Jean Brefort <jean.brefort@normalesup.org>
* xlsx-read-drawing.c (xlsx_blip_start): don't set an invalid image type.
* xlsx-read-drawing.c (xlsx_blip_start): don't set an invalid
image type.
2011-10-27 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* ms-excel-read.c (ms_wb_get_font_markup): use subscript/superscript attributes
* ms-excel-write.c (excel_font_overlay_pango): export subscript/superscript
attributes (and fix PANGO_ATTR_RISE handling)
* ms-excel-read.c (ms_wb_get_font_markup): use
subscript/superscript attributes
* ms-excel-write.c (excel_font_overlay_pango): export
subscript/superscript attributes (and fix PANGO_ATTR_RISE
handling)
2011-10-17 Andreas J. Guelzow <aguelzow@pyrshep.ca>
......@@ -38,8 +47,8 @@
2011-08-28 Jean Brefort <jean.brefort@normalesup.org>
* ms-chart.c (end), (xl_chart_import_error_bar),
(ms_excel_chart_read), (store_dim), (chart_write_series): moved two helpers
to goffice.
(ms_excel_chart_read), (store_dim), (chart_write_series): moved
two helpers to goffice.
* xlsx-read-drawing.c (xlsx_tx_pr), (xlsx_draw_text_run_props),
(xlsx_ser_labels_show_val), (xlsx_ser_labels_show_cat),
(xlsx_ser_labels_pos), (xlsx_ser_labels_start),
......
......@@ -300,8 +300,11 @@ start_update_progress (XLSXReadState *state, GsfInput *xin,
char const *message, double min, double max)
{
go_io_progress_range_push (state->context, min, max);
go_io_value_progress_set (state->context, gsf_input_size (xin), 10000);
go_io_progress_message (state->context, message);
if (xin) {
go_io_value_progress_set (state->context,
gsf_input_size (xin), 10000);
go_io_progress_message (state->context, message);
}
}
static void
......@@ -4326,12 +4329,10 @@ xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
in = gsf_open_pkg_open_rel_by_type (wb_part,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme", NULL);
if (in != NULL) {
start_update_progress (&state, in, _("Reading theme..."),
0.05, 0.1);
xlsx_parse_stream (&state, in, xlsx_theme_dtd);
end_update_progress (&state);
}
start_update_progress (&state, in, _("Reading theme..."),
0.05, 0.1);
xlsx_parse_stream (&state, in, xlsx_theme_dtd);
end_update_progress (&state);
in = gsf_open_pkg_open_rel_by_type (wb_part,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles", NULL);
......@@ -4341,10 +4342,11 @@ xlsx_file_open (GOFileOpener const *fo, GOIOContext *context,
end_update_progress (&state);
}
start_update_progress (&state, in, _("Reading workbook..."),
start_update_progress (&state, wb_part, _("Reading workbook..."),
0.2, 0.3);
xlsx_parse_stream (&state, wb_part, xlsx_workbook_dtd);
/* end_update_progress (&state); moved into xlsx_wb_end */
/* MW 20111121: why? If parsing fails, I don't think that will ever be called. */
xlsx_read_docprops (&state);
......
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