[goffice] revert previous changes, need more work.
- From: Jean Bréfort <jbrefort src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [goffice] revert previous changes, need more work.
- Date: Thu, 26 Nov 2009 13:44:17 +0000 (UTC)
commit 05ff28fc0d32ab0d40a659c42f1378f664bd09a3
Author: Jean Brefort <jean brefort normalesup org>
Date: Thu Nov 26 14:42:26 2009 +0100
revert previous changes, need more work.
ChangeLog | 6 ++++++
goffice/graph/gog-object-xml.c | 2 --
goffice/graph/gog-object.c | 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6f4f2ae..6d88105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-11-26 Jean Brefort <jean brefort normalesup org>
+ * goffice/graph/gog-object-xml.c (gogo_start): revert previous change,
+ needs more work.
+ * goffice/graph/gog-object.c (gog_object_add_by_role): ditto.
+
+2009-11-26 Jean Brefort <jean brefort normalesup org>
+
* goffice/graph/gog-object-xml.c (gogo_start): set axis set to all to
allow axis loading.
* plugins/plot_distrib/gog-probability-plot.c
diff --git a/goffice/graph/gog-object-xml.c b/goffice/graph/gog-object-xml.c
index bf7f128..7b91025 100644
--- a/goffice/graph/gog-object-xml.c
+++ b/goffice/graph/gog-object-xml.c
@@ -567,8 +567,6 @@ gogo_start (GsfXMLIn *xin, xmlChar const **attrs)
res = gog_object_add_by_name (state->obj, role, res);
}
if (res != NULL) {
- if (GOG_IS_CHART (res))
- GOG_CHART (res)->axis_set = GOG_AXIS_SET_ALL;
res->explicitly_typed_role = (type != NULL);
if (GO_IS_PERSIST (res))
go_persist_prep_sax (GO_PERSIST (res), xin, attrs);
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index 67de08f..2ffdbaf 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -1526,12 +1526,15 @@ gog_object_add_by_role (GogObject *parent, GogObjectRole const *role, GogObject
g_return_val_if_fail (is_a != 0, NULL);
+
+#if 0
/* do not perform a not allowed addition */
if (role->can_add != NULL && !(role->can_add) (parent)) {
if (child)
g_object_unref (child);
return NULL;
}
+#endif
if (child == NULL) {
child = (role->allocate)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]