[goffice] fix critical in chart-tests.gnumeric



commit 2ef82bc2deadeae2d1e1d522f345e46ac29df1bc
Author: Jean Brefort <jean brefort normalesup org>
Date:   Thu Nov 19 12:56:12 2009 +0100

    fix critical in chart-tests.gnumeric

 ChangeLog              |    5 +++++
 goffice/data/go-data.c |   12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7a57738..85306a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-19  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/data/go-data.c (go_data_vector_get_str),
+	(go_data_matrix_get_str): no need to load values, just length or size.
+
 2009-11-17  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* goffice/utils/go-format.c (go_format_odf_style_map): use %g rather than %f
diff --git a/goffice/data/go-data.c b/goffice/data/go-data.c
index 0d3b2ca..fc56d43 100644
--- a/goffice/data/go-data.c
+++ b/goffice/data/go-data.c
@@ -707,9 +707,9 @@ go_data_vector_get_str (GODataVector *vec, unsigned i)
 	char *res;
 
 	g_return_val_if_fail (klass != NULL, g_strdup (""));
-	if (! (vec->base.flags & GO_DATA_CACHE_IS_VALID)) {
-		(*klass->load_values) (vec);
-		g_return_val_if_fail (vec->base.flags & GO_DATA_CACHE_IS_VALID, g_strdup (""));
+	if (! (vec->base.flags & GO_DATA_VECTOR_LEN_CACHED)) {
+		(*klass->load_len) (vec);
+		g_return_val_if_fail (vec->base.flags & GO_DATA_VECTOR_LEN_CACHED, g_strdup (""));
 	}
 	g_return_val_if_fail ((int)i < vec->len, g_strdup (""));
 
@@ -887,9 +887,9 @@ go_data_matrix_get_str (GODataMatrix *mat, unsigned i, unsigned j)
 	char *res;
 
 	g_return_val_if_fail (klass != NULL, NULL);
-	if (! (mat->base.flags & GO_DATA_CACHE_IS_VALID)) {
-		(*klass->load_values) (mat);
-		g_return_val_if_fail (mat->base.flags & GO_DATA_CACHE_IS_VALID, g_strdup (""));
+	if (! (mat->base.flags & GO_DATA_MATRIX_SIZE_CACHED)) {
+		(*klass->load_size) (mat);
+		g_return_val_if_fail (mat->base.flags & GO_DATA_MATRIX_SIZE_CACHED, g_strdup (""));
 	}
 	g_return_val_if_fail (((int)i < mat->size.rows) && ((int)j < mat->size.columns), g_strdup (""));
 



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