Commit 8adf2128 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

silence a few warnings.

Fix a problem with the new expr_relocate flag for pasting when soring.

2000-06-05  Jody Goldberg <jgoldberg@home.com>

	* src/cell.c (cell_relocate) : when relocating the expression
	  be careful to use the offsets when calculating the validity.

	* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
	  signal if it has been activated.  Only delete the completer if it
	  exists.
parent 6d0bdb8a
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
2000-06-05 Jody Goldberg <jgoldberg@home.com>
* src/cell.c (cell_relocate) : when relocating the expression
be careful to use the offsets when calculating the validity.
* src/workbook-edit.c (workbook_auto_complete_destroy) : Only remove
signal if it has been activated. Only delete the completer if it
exists.
2000-06-05 Miguel de Icaza <miguel@helixcode.com>
* src/gnumeric-util.c (gtk_radio_button_select): Add
......
......@@ -249,8 +249,6 @@ Office 2000 and 'explorer' compatibility.
of the input range.
* Undo
* Commands to do
- autofill
* Commands to link in
- Row/Col resize. The current linkage between itembar and sheet is odd.
we seem to set the column size for the sheet several times.
......@@ -262,7 +260,6 @@ Office 2000 and 'explorer' compatibility.
* Excel Import
* Localise sheet/workbook Name import,
* Import names even if they arn't referenced.
* The big SST re-write.
* Excel Export
* Detect large style ranges and correctly set the default row/col/sheet styles.
......
......@@ -233,14 +233,14 @@ cell_relocate (Cell *cell, int col_offset, int row_offset, gboolean check_bounds
rwinfo.type = EXPR_REWRITE_RELOCATE;
rinfo = &rwinfo.u.relocate;
rinfo->origin.start.col =
rinfo->origin.end.col = cell->col_info->pos;
rinfo->origin.start.row =
rinfo->origin.end.row = cell->row_info->pos;
rinfo->origin.start.col = rinfo->origin.end.col =
cell->col_info->pos - col_offset;
rinfo->origin.start.row = rinfo->origin.end.row =
cell->row_info->pos - row_offset;
rinfo->origin_sheet = rinfo->target_sheet = cell->sheet;
rinfo->col_offset = col_offset;
rinfo->row_offset = row_offset;
eval_pos_init_cell (&rinfo->pos, cell);
eval_pos_init (&rinfo->pos, cell->sheet, &rinfo->origin.start);
expr = expr_rewrite (expr, &rwinfo);
if (expr != NULL) {
......
......@@ -31,13 +31,17 @@ workbook_auto_complete_destroy (Workbook *wb)
wb_priv->auto_complete_text = NULL;
}
gtk_signal_disconnect (GTK_OBJECT (workbook_get_entry (wb)),
wb_priv->edit_line.signal_changed);
wb_priv->edit_line.signal_changed = -1;
if (wb_priv->edit_line.signal_changed >= 0) {
gtk_signal_disconnect (GTK_OBJECT (workbook_get_entry (wb)),
wb_priv->edit_line.signal_changed);
wb_priv->edit_line.signal_changed = -1;
}
if (application_use_auto_complete_get ()){
gtk_object_unref (GTK_OBJECT (wb_priv->auto_complete));
wb_priv->auto_complete = NULL;
if (wb_priv->auto_complete) {
gtk_object_unref (GTK_OBJECT (wb_priv->auto_complete));
wb_priv->auto_complete = NULL;
}
} else
g_assert (wb_priv->auto_complete == NULL);
......
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