gnumeric r16713 - in branches/gnumeric-1-8: . src src/widgets

[jody svn gnome org]

Author: jody
Date: Fri Jul 11 09:53:34 2008
New Revision: 16713
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16713&view=rev

Log:
Backport.
2008-06-16  Jody Goldberg <jody gnome org>

	* src/item-edit.c (item_edit_dispose) : delete the feedback ranges.
	  Don't disable their creation into the future.  [#542439]


Modified:
   branches/gnumeric-1-8/ChangeLog
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/src/item-edit.c
   branches/gnumeric-1-8/src/widgets/ChangeLog
   branches/gnumeric-1-8/src/widgets/gnumeric-expr-entry.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Fri Jul 11 09:53:34 2008
@@ -3,6 +3,8 @@
 Jody:
 	* Fix ODS import failure on win32. [#536552]
 	* Add mnemonics to the quit dialog. [#132131]
+	* Fix range highlighting while editing. [#542439]
+	* Fix highlighting of merged cells. [#127415]
 
 Morten:
 	* Fix text export problem for times with fractional seconds.  [#534514]

Modified: branches/gnumeric-1-8/src/item-edit.c
==============================================================================
--- branches/gnumeric-1-8/src/item-edit.c	(original)
+++ branches/gnumeric-1-8/src/item-edit.c	Fri Jul 11 09:53:34 2008
@@ -418,12 +418,8 @@
 	item_edit_cursor_blink_stop (ie);
 
 	/* to destroy the feedback ranges */
-	gnm_expr_entry_disable_highlight (
-		wbcg_get_entry_logical (scg_wbcg (ie->scg)));
-#if 0
-	/* Why?  */
-	scg_set_display_cursor (ie->scg);
-#endif
+	SCG_FOREACH_PANE (ie->scg, pane,
+		gnm_pane_expr_cursor_stop (pane););
 
 	if (ie->gfont != NULL) {
 		gnm_font_unref (ie->gfont);

Modified: branches/gnumeric-1-8/src/widgets/gnumeric-expr-entry.c
==============================================================================
--- branches/gnumeric-1-8/src/widgets/gnumeric-expr-entry.c	(original)
+++ branches/gnumeric-1-8/src/widgets/gnumeric-expr-entry.c	Fri Jul 11 09:53:34 2008
@@ -379,6 +379,12 @@
 		gnm_expr_entry_find_range (gee);
 		if (gnm_expr_entry_get_rangesel (gee, &range, &parse_sheet) &&
 		    parse_sheet == sheet) {
+
+			GnmRange const *merge; /* [#127415] */
+			if (range_is_singleton  (&range) &&
+			    NULL != (merge = gnm_sheet_merge_is_corner (parse_sheet, &range.start)))
+				range = *merge;
+
 			SCG_FOREACH_PANE (gee->scg, pane,
 				gnm_pane_expr_cursor_bound_set (pane, &range););
 			return;