Commit 96291ef4 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

Init CellRegion::merged. Ditto. Ditto.


2001-02-02  Jody Goldberg <jgoldberg@home.com>

	* src/gui-clipboard.c (x_selection_to_cell_region) : Init
	  CellRegion::merged.
	* src/stf-parse.c (stf_parse_region) : Ditto.
	* src/xml-io.c (xml_read_selection_clipboard) : Ditto.
parent eb9c56bc
2001-02-02 Jody Goldberg <jgoldberg@home.com> 2001-02-02 Jody Goldberg <jgoldberg@home.com>
* src/gui-clipboard.c (x_selection_to_cell_region) : Init
CellRegion::merged.
* src/stf-parse.c (stf_parse_region) : Ditto.
* src/xml-io.c (xml_read_selection_clipboard) : Ditto.
* src/sheet-control-gui.c (scg_object_move) : split out from the * src/sheet-control-gui.c (scg_object_move) : split out from the
control point motion handler. control point motion handler.
(cb_control_point_event) : Use it here. (cb_control_point_event) : Use it here.
......
2001-02-02 Jody Goldberg <jgoldberg@home.com> 2001-02-02 Jody Goldberg <jgoldberg@home.com>
* src/gui-clipboard.c (x_selection_to_cell_region) : Init
CellRegion::merged.
* src/stf-parse.c (stf_parse_region) : Ditto.
* src/xml-io.c (xml_read_selection_clipboard) : Ditto.
* src/sheet-control-gui.c (scg_object_move) : split out from the * src/sheet-control-gui.c (scg_object_move) : split out from the
control point motion handler. control point motion handler.
(cb_control_point_event) : Use it here. (cb_control_point_event) : Use it here.
......
2001-02-02 Jody Goldberg <jgoldberg@home.com> 2001-02-02 Jody Goldberg <jgoldberg@home.com>
* src/gui-clipboard.c (x_selection_to_cell_region) : Init
CellRegion::merged.
* src/stf-parse.c (stf_parse_region) : Ditto.
* src/xml-io.c (xml_read_selection_clipboard) : Ditto.
* src/sheet-control-gui.c (scg_object_move) : split out from the * src/sheet-control-gui.c (scg_object_move) : split out from the
control point motion handler. control point motion handler.
(cb_control_point_event) : Use it here. (cb_control_point_event) : Use it here.
......
2001-02-02 Jody Goldberg <jgoldberg@home.com> 2001-02-02 Jody Goldberg <jgoldberg@home.com>
* src/gui-clipboard.c (x_selection_to_cell_region) : Init
CellRegion::merged.
* src/stf-parse.c (stf_parse_region) : Ditto.
* src/xml-io.c (xml_read_selection_clipboard) : Ditto.
* src/sheet-control-gui.c (scg_object_move) : split out from the * src/sheet-control-gui.c (scg_object_move) : split out from the
control point motion handler. control point motion handler.
(cb_control_point_event) : Use it here. (cb_control_point_event) : Use it here.
......
2001-02-02 Jody Goldberg <jgoldberg@home.com> 2001-02-02 Jody Goldberg <jgoldberg@home.com>
* src/gui-clipboard.c (x_selection_to_cell_region) : Init
CellRegion::merged.
* src/stf-parse.c (stf_parse_region) : Ditto.
* src/xml-io.c (xml_read_selection_clipboard) : Ditto.
* src/sheet-control-gui.c (scg_object_move) : split out from the * src/sheet-control-gui.c (scg_object_move) : split out from the
control point motion handler. control point motion handler.
(cb_control_point_event) : Use it here. (cb_control_point_event) : Use it here.
......
...@@ -55,6 +55,7 @@ x_selection_to_cell_region (WorkbookControlGUI *wbcg, const char *src, int len) ...@@ -55,6 +55,7 @@ x_selection_to_cell_region (WorkbookControlGUI *wbcg, const char *src, int len)
crerr->cols = -1; crerr->cols = -1;
crerr->rows = -1; crerr->rows = -1;
crerr->styles = NULL; crerr->styles = NULL;
crerr->merged = NULL;
if (!stf_parse_convert_to_unix (data)) { if (!stf_parse_convert_to_unix (data)) {
g_free (data); g_free (data);
......
...@@ -1804,6 +1804,7 @@ stf_parse_region (StfParseOptions_t *parseoptions, const char *data) ...@@ -1804,6 +1804,7 @@ stf_parse_region (StfParseOptions_t *parseoptions, const char *data)
cr->cols = (colhigh > 0) ? colhigh : 1; cr->cols = (colhigh > 0) ? colhigh : 1;
cr->rows = row; cr->rows = row;
cr->styles = NULL; cr->styles = NULL;
cr->merged = NULL;
return cr; return cr;
} }
...@@ -2732,6 +2732,7 @@ xml_read_selection_clipboard (XmlParseContext *ctxt, xmlNodePtr tree) ...@@ -2732,6 +2732,7 @@ xml_read_selection_clipboard (XmlParseContext *ctxt, xmlNodePtr tree)
cr->cols = -1; cr->cols = -1;
cr->rows = 0; cr->rows = 0;
cr->styles = NULL; cr->styles = NULL;
cr->merged = NULL;
/* /*
* This nicely puts all the styles into the cr->styles list * This nicely puts all the styles into the cr->styles list
......
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