[gnumeric] Fix IRR and other functions acting on paired data set when called with fixed arrays.



commit 422a12794153555d7fa7353a848f9e9988450b2f
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Sep 30 15:31:51 2011 -0600

    Fix IRR and other functions acting on paired data set when called with fixed arrays.
    
    2011-09-30 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/collect.c (collect_float_pairs): check whetehr these are
    	in fact references

 ChangeLog     |    5 +++++
 NEWS          |    2 ++
 src/collect.c |    6 ++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6788b78..52e3a25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-30 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/collect.c (collect_float_pairs): check whetehr these are
+	in fact references
+
 2011-09-29 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/print.c (gnm_print_so): enable pagesetup combos
diff --git a/NEWS b/NEWS
index b64eae0..cdeeec0 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ Andreas:
 	* Allow for the omission of a string indicator (quote) in configurable
 	text import. [#658981]
 	* Add a print item to the sheet object context menu. [#660248]
+	* Fix IRR and other functions acting on paired data set when called
+	with fixed arrays.
 
 Jean:
 	* Make things build against gtk+-3.0.
diff --git a/src/collect.c b/src/collect.c
index d805be2..11a4a98 100644
--- a/src/collect.c
+++ b/src/collect.c
@@ -754,8 +754,10 @@ collect_float_pairs (GnmValue const *vx, GnmValue const *vy,
 	PairsFloatsCacheEntry *ce = NULL;
 	gboolean use_cache, free_keys = TRUE;
 
-	key_x = get_single_cache_key_from_value (vx, ep);
-	key_y = get_single_cache_key_from_value (vy, ep);
+	if (vx->type == VALUE_CELLRANGE)
+		key_x = get_single_cache_key_from_value (vx, ep);
+	if (vy->type == VALUE_CELLRANGE)
+		key_y = get_single_cache_key_from_value (vy, ep);
 
 	if ((use_cache = (key_x && key_y)))
 		ce = get_or_fake_pairs_cache_entry (key_x, key_y, flags, ep);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]