gnumeric r17245 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Sat Mar 28 14:07:52 2009
New Revision: 17245
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17245&view=rev

Log:
2009-03-28  Morten Welinder  <terra gnome org>

	* src/graph.c: Stop accessing private members of values.  Use
	value_peek_string instead.



Modified:
   trunk/ChangeLog
   trunk/src/graph.c

Modified: trunk/src/graph.c
==============================================================================
--- trunk/src/graph.c	(original)
+++ trunk/src/graph.c	Sat Mar 28 14:07:52 2009
@@ -29,7 +29,6 @@
 #include "mathfunc.h"
 #include "sheet.h"
 #include "workbook.h"
-#include "str.h"
 #include "position.h"
 #include "gnm-format.h"
 #include "auto-format.h"
@@ -74,10 +73,7 @@
 	if (a->texpr == NULL && b->texpr == NULL) {
 		char const *str_a = g_object_get_data (G_OBJECT (data_a), "from-str");
 		char const *str_b = g_object_get_data (G_OBJECT (data_b), "from-str");
-
-		if (str_a != NULL && str_b != NULL)
-			return 0 == strcmp (str_a, str_b);
-		return FALSE;
+		return go_str_compare (str_a, str_b) == 0;
 	}
 
 	return gnm_expr_top_equal (a->texpr, b->texpr);
@@ -110,7 +106,7 @@
 		gnm_conventions_default);
 }
 
-static  gboolean
+static gboolean
 gnm_go_data_from_str (GOData *dat, char const *str)
 {
 	GnmExprTop const *texpr;
@@ -449,7 +445,7 @@
 
 	dat->last = dat->i;
 	if (VALUE_IS_STRING (v)) {
-		v = format_match_number (v->v_str.val->str, NULL,
+		v = format_match_number (value_peek_string (v), NULL,
 					 dat->date_conv);
 		if (v == NULL) {
 			dat->vals[dat->i++] = gnm_pinf;
@@ -541,7 +537,7 @@
 				continue;
 			} else if (VALUE_IS_STRING (v)) {
 				GnmValue *tmp = format_match_number
-					(v->v_str.val->str, NULL,
+					(value_peek_string (v), NULL,
 					 closure.date_conv);
 				if (tmp == NULL) {
 					vals[len] = go_nan;