Commit df48a66b authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

fragment the selection just in case. (cb_unmerge_cells) : ditto. Thanks


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

	* src/workbook-format-toolbar.c (cb_merge_cells) : fragment the
	  selection just in case.
	(cb_unmerge_cells) : ditto.  Thanks Juan Pablo.

	* src/commands.c (cmd_unmerge_cells) : remove ugly hack cast.
	(cmd_merge_cells) : ditto.  DO NOT DO THAT !

	* src/sheet.c (sheet_range_splits_region) : implement the optional
	  ignore feature for merged regions too.
parent 49119f78
......@@ -12,11 +12,8 @@ Release Critical
- defining file patterns in plugin spec overrides 'has_probe' flag silently.
- Get the i18n XL patches verified and in
: smarter support for unicode characters that do not convert to the
current encoding.
- Fix XL named expr import for sheet local names
- smarter support for unicode characters that do not convert to the
current encoding during XL import.
- outline mode
: finish implementing optionally putting markers above/left
......@@ -26,6 +23,10 @@ Release Critical
Long term breakage
------------------
- Fix XL named expr import for sheet local names
- externsheet for biff7 type=3
- test for unicode
- When using the new range-selector for dialogs with only one range, it
should not be necessary to select the range field before selecting the
range. As long as the selector is in a modal dialog.
......@@ -35,8 +36,6 @@ Long term breakage
An off-by-one pixel problem. For details see :
http://bugzilla.gnome.org/show_bug.cgi?id=52240
- XL import should honour style requests for full columns.
- Search-and-replace.
- It is doubtful whether the regexp selection belongs on the first page.
- Querying is not implemented.
......
2001-05-06 Jody Goldberg <jgoldberg@home.com>
* src/workbook-format-toolbar.c (cb_merge_cells) : fragment the
selection just in case.
(cb_unmerge_cells) : ditto. Thanks Juan Pablo.
* src/commands.c (cmd_unmerge_cells) : remove ugly hack cast.
(cmd_merge_cells) : ditto. DO NOT DO THAT !
* src/sheet.c (sheet_range_splits_region) : implement the optional
ignore feature for merged regions too.
2001-05-06 Almer S. Tigelaar <almer@gnome.org>
* src/colrow.c (colrow_restore_sizes): Don't free things
......
2001-05-06 Jody Goldberg <jgoldberg@home.com>
* src/workbook-format-toolbar.c (cb_merge_cells) : fragment the
selection just in case.
(cb_unmerge_cells) : ditto. Thanks Juan Pablo.
* src/commands.c (cmd_unmerge_cells) : remove ugly hack cast.
(cmd_merge_cells) : ditto. DO NOT DO THAT !
* src/sheet.c (sheet_range_splits_region) : implement the optional
ignore feature for merged regions too.
2001-05-06 Almer S. Tigelaar <almer@gnome.org>
* src/colrow.c (colrow_restore_sizes): Don't free things
......
2001-05-06 Jody Goldberg <jgoldberg@home.com>
* src/workbook-format-toolbar.c (cb_merge_cells) : fragment the
selection just in case.
(cb_unmerge_cells) : ditto. Thanks Juan Pablo.
* src/commands.c (cmd_unmerge_cells) : remove ugly hack cast.
(cmd_merge_cells) : ditto. DO NOT DO THAT !
* src/sheet.c (sheet_range_splits_region) : implement the optional
ignore feature for merged regions too.
2001-05-06 Almer S. Tigelaar <almer@gnome.org>
* src/colrow.c (colrow_restore_sizes): Don't free things
......
2001-05-06 Jody Goldberg <jgoldberg@home.com>
* src/workbook-format-toolbar.c (cb_merge_cells) : fragment the
selection just in case.
(cb_unmerge_cells) : ditto. Thanks Juan Pablo.
* src/commands.c (cmd_unmerge_cells) : remove ugly hack cast.
(cmd_merge_cells) : ditto. DO NOT DO THAT !
* src/sheet.c (sheet_range_splits_region) : implement the optional
ignore feature for merged regions too.
2001-05-06 Almer S. Tigelaar <almer@gnome.org>
* src/colrow.c (colrow_restore_sizes): Don't free things
......
2001-05-06 Jody Goldberg <jgoldberg@home.com>
* src/workbook-format-toolbar.c (cb_merge_cells) : fragment the
selection just in case.
(cb_unmerge_cells) : ditto. Thanks Juan Pablo.
* src/commands.c (cmd_unmerge_cells) : remove ugly hack cast.
(cmd_merge_cells) : ditto. DO NOT DO THAT !
* src/sheet.c (sheet_range_splits_region) : implement the optional
ignore feature for merged regions too.
2001-05-06 Almer S. Tigelaar <almer@gnome.org>
* src/colrow.c (colrow_restore_sizes): Don't free things
......
......@@ -2886,7 +2886,7 @@ cmd_unmerge_cells_destroy (GtkObject *cmd)
* Return value: TRUE if there was a problem
**/
gboolean
cmd_unmerge_cells (WorkbookControl *wbc, Sheet *sheet, GList const *selection)
cmd_unmerge_cells (WorkbookControl *wbc, Sheet *sheet, GSList const *selection)
{
GtkObject *obj;
CmdUnmergeCells *me;
......@@ -2900,7 +2900,7 @@ cmd_unmerge_cells (WorkbookControl *wbc, Sheet *sheet, GList const *selection)
me->parent.sheet = sheet;
me->parent.size = 1;
names = range_list_to_string ((GSList *) selection);
names = range_list_to_string (selection);
me->parent.cmd_descriptor = g_strdup_printf (_("Unmerging %s"), names->str);
g_string_free (names, TRUE);
......@@ -3014,7 +3014,7 @@ cmd_merge_cells_destroy (GtkObject *cmd)
* Return value: TRUE if there was a problem
**/
gboolean
cmd_merge_cells (WorkbookControl *wbc, Sheet *sheet, GList const *selection)
cmd_merge_cells (WorkbookControl *wbc, Sheet *sheet, GSList const *selection)
{
GtkObject *obj;
CmdMergeCells *me;
......@@ -3028,7 +3028,7 @@ cmd_merge_cells (WorkbookControl *wbc, Sheet *sheet, GList const *selection)
me->parent.sheet = sheet;
me->parent.size = 1;
names = range_list_to_string ((GSList *) (selection));
names = range_list_to_string (selection);
me->parent.cmd_descriptor = g_strdup_printf (_("Merging %s"),
names->str);
g_string_free (names, TRUE);
......
......@@ -64,9 +64,9 @@ gboolean cmd_colrow_outline_change (WorkbookControl *wbc, Sheet *sheet,
gboolean is_cols, int index, int depth);
gboolean cmd_merge_cells (WorkbookControl *wbc, Sheet *sheet,
GList const *selection);
GSList const *selection);
gboolean cmd_unmerge_cells (WorkbookControl *wbc, Sheet *sheet,
GList const *selection);
GSList const *selection);
gboolean cmd_search_replace (WorkbookControl *wbc, Sheet *sheet, SearchReplace *sr);
......
......@@ -1919,6 +1919,8 @@ sheet_range_splits_region (Sheet const *sheet,
for (ptr = merged ; ptr != NULL ; ptr = ptr->next) {
Range const *m = ptr->data;
if (ignore != NULL && range_contained (m, ignore))
continue;
if (!range_contained (m, r))
break;
}
......
......@@ -114,7 +114,9 @@ cb_merge_cells (GtkWidget *ignore, WorkbookControlGUI *wbcg)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
cmd_merge_cells (wbc, sheet, sheet->selections);
GSList *range_list = selection_get_ranges (sheet, FALSE);
cmd_merge_cells (wbc, sheet, range_list);
g_slist_free (range_list);
}
static void
......@@ -122,7 +124,9 @@ cb_unmerge_cells (GtkWidget *ignore, WorkbookControlGUI *wbcg)
{
WorkbookControl *wbc = WORKBOOK_CONTROL (wbcg);
Sheet *sheet = wb_control_cur_sheet (wbc);
cmd_unmerge_cells (wbc, sheet, sheet->selections);
GSList *range_list = selection_get_ranges (sheet, FALSE);
cmd_unmerge_cells (wbc, sheet, range_list);
g_slist_free (range_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