[gnumeric] Suppress range markers that should be in an external workbook. [Part of #680718]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 7e8634851c74eb61c2da641dcd9288f29ccc5c19
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Jul 29 18:39:32 2012 -0600

    Suppress range markers that should be in an external workbook. [Part of #680718]
    
    2012-07-29  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* gnm_expr_entry_colour_ranges: don't miscolour a range in the
    	current workbook that is really in an external workbook.

 NEWS                              |    2 ++
 src/widgets/ChangeLog             |    5 +++++
 src/widgets/gnumeric-expr-entry.c |    7 ++++++-
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index c011c10..cd9f800 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Andreas:
 	* Add FLIP function. [#680511]
 	* Allow unordered abscissae in INTERPOLATION. [#680510]
 	* Fix INTERPOLATION crash. [#680711]
+	* Suppress range markers that should be in an external workbook.
+	[Part of #680718]
 
 Jean:
 	* Fix component references issues. [#680190]
diff --git a/src/widgets/ChangeLog b/src/widgets/ChangeLog
index 15864fa..9185b1f 100644
--- a/src/widgets/ChangeLog
+++ b/src/widgets/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-29  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* gnm_expr_entry_colour_ranges: don't miscolour a range in the
+	current workbook that is really in an external workbook.
+
 2012-07-15  Morten Welinder <terra gnome org>
 
 	* Release 1.11.5
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 2053bea..16f3b66 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -617,6 +617,11 @@ gnm_expr_entry_colour_ranges (GnmExprEntry *gee, int start, int end, GnmRangeRef
 	Sheet *sheet = scg_sheet (gee->scg);
 	SheetControlGUI *scg = NULL;
 
+	if (rr->a.sheet->workbook != gee->sheet->workbook) {
+		/* We should show the range in an external workbook! */
+		return;
+	}
+
 	if (*attrs == NULL)
 		*attrs = pango_attr_list_new ();
 
@@ -694,7 +699,7 @@ gee_scan_for_range (GnmExprEntry *gee)
 						g_hash_table_insert (hash, rrr, GINT_TO_POINTER (this_colour));
 						insert_cursor = TRUE;
 						rtext = NULL;
- 					} else {
+					} else {
 						this_colour = GPOINTER_TO_INT (val);
 						insert_cursor = FALSE;
 					}