Commit b518ab58 authored by Morten Welinder's avatar Morten Welinder

xml: plug leak.

parent f22daa2a
2010-08-23 Morten Welinder <terra@gnome.org>
* src/xml-sax-read.c (xml_sax_colrow): Simplify and plug leak.
2010-08-20 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* samples/chart-tests.gnumeric: update tab colours
......@@ -31,14 +35,14 @@
* samples/chart-tests.gnumeric: make sure the images match the graphs
(and fix the data to make it more likely to stay in this way.)
2010-08-14 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/commands.c (CmdPasteCopy): new fields
(cmd_paste_copy_impl): store sizes for rows and columns and restore them
(cmd_paste_copy_finalize): finalize new fields
(cmd_paste_copy): iitalize new fields
2010-08-13 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/commands.c (cmd_area_set_array_expr): autofit rows and columns.
......@@ -57,7 +61,7 @@
2010-08-13 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/commands.c (cmd_set_text_full): check whether the same-text and
* src/commands.c (cmd_set_text_full): check whether the same-text and
not same-markup situation in fact applies.
2010-08-13 Andreas J. Guelzow <aguelzow@pyrshep.ca>
......
......@@ -14,6 +14,7 @@ Jean:
Morten:
* Plug sylk importer leak.
* Plug xml importer leak.
--------------------------------------------------------------------------
Gnumeric 1.10.9
......
......@@ -1292,33 +1292,29 @@ xml_sax_colrow (GsfXMLIn *xin, xmlChar const **attrs)
maybe_update_progress (xin);
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2) {
if (gnm_xml_attr_int (attrs, "No", &pos)) {
g_return_if_fail (cri == NULL);
cri = is_col
? sheet_col_fetch (state->sheet, pos)
: sheet_row_fetch (state->sheet, pos);
} else {
if (gnm_xml_attr_double (attrs, "Unit", &size)) ;
else if (gnm_xml_attr_int (attrs, "Count", &count)) ;
else if (gnm_xml_attr_int (attrs, "HardSize", &hard_size)) ;
else if (gnm_xml_attr_int (attrs, "Hidden", &hidden)) ;
else if (gnm_xml_attr_int (attrs, "Collapsed", &is_collapsed)) ;
else if (gnm_xml_attr_int (attrs, "OutlineLevel", &outline_level)) ;
else if (gnm_xml_attr_int (attrs, "MarginA", &val))
; /* deprecated in 1.7.1 */
else if (gnm_xml_attr_int (attrs, "MarginB", &val))
; /* deprecated in 1.7.1 */
else
unknown_attr (xin, attrs);
}
if (gnm_xml_attr_int (attrs, "No", &pos)) ;
else if (gnm_xml_attr_double (attrs, "Unit", &size)) ;
else if (gnm_xml_attr_int (attrs, "Count", &count)) ;
else if (gnm_xml_attr_int (attrs, "HardSize", &hard_size)) ;
else if (gnm_xml_attr_int (attrs, "Hidden", &hidden)) ;
else if (gnm_xml_attr_int (attrs, "Collapsed", &is_collapsed)) ;
else if (gnm_xml_attr_int (attrs, "OutlineLevel", &outline_level)) ;
else if (gnm_xml_attr_int (attrs, "MarginA", &val))
; /* deprecated in 1.7.1 */
else if (gnm_xml_attr_int (attrs, "MarginB", &val))
; /* deprecated in 1.7.1 */
else
unknown_attr (xin, attrs);
}
XML_CHECK (size > -1);
XML_CHECK (pos >= 0 && pos < colrow_max (is_col, sheet));
XML_CHECK (count >= 1);
XML_CHECK (count <= colrow_max (is_col, sheet) - pos);
g_return_if_fail (cri != NULL && size > -1.);
cri = is_col
? sheet_col_fetch (state->sheet, pos)
: sheet_row_fetch (state->sheet, pos);
cri->hard_size = hard_size;
cri->visible = !hidden;
cri->is_collapsed = is_collapsed;
......
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