[gnumeric] fix role request (capitalization of role name)
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] fix role request (capitalization of role name)
- Date: Mon, 23 Aug 2010 04:19:13 +0000 (UTC)
commit 7ac7826f4e00f30ac4f1c3b145ec01dcada6883b
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Sun Aug 22 22:18:47 2010 -0600
fix role request (capitalization of role name)
2010-08-22 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_graph_content): fix role request (capitalization of
role name)
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-read.c | 3 ++-
plugins/openoffice/openoffice-write.c | 5 ++---
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 35a1b0f..da52e17 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
2010-08-22 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-write.c (odf_write_graph_content): fix role request (capitalization of
+ role name)
+
+2010-08-22 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-read.c (oo_plot_area): handle OO_PLOT_UNKNOWN:
(oo_chart): set type to OO_PLOT_UNKNOWN on unknown charts and raise a warning
(oo_warning): make sure we are showing the first error
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 40c9118..11c08cb 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -326,7 +326,8 @@ oo_warning (GsfXMLIn *xin, char const *fmt, ...)
char *msg;
va_list args;
- if (state->context->warning_occurred)
+ if (go_io_error_occurred (state->context) ||
+ go_io_warning_occurred (state->context))
return;
va_start (args, fmt);
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 8e4b23d..d1a4084 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -4753,11 +4753,10 @@ odf_write_graph_content (GnmOOExport *state, GsfOutput *child, SheetObject *so)
graph = sheet_object_graph_get_gog (so);
if (graph != NULL) {
GogObjectRole const *role =
- gog_object_find_role_by_name (GOG_OBJECT (graph), "chart");
+ gog_object_find_role_by_name (GOG_OBJECT (graph), "Chart");
if (role != NULL) {
GSList *charts = gog_object_get_children
- (GOG_OBJECT (graph),
- gog_object_find_role_by_name (GOG_OBJECT (graph), "chart"));
+ (GOG_OBJECT (graph), role);
if (charts != NULL && charts->data != NULL) {
GogObject const *chart = charts->data;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]