[gnumeric] Fix recently introduced bug #675836
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix recently introduced bug #675836
- Date: Thu, 10 May 2012 19:21:35 +0000 (UTC)
commit a56c9da1c1b1c5b527953bd29e08658fd5dfde8c
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Thu May 10 13:21:20 2012 -0600
Fix recently introduced bug #675836
2012-05-10 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (od_draw_text_frame_end): check for empty
text content
plugins/openoffice/ChangeLog | 5 +++++
plugins/openoffice/openoffice-read.c | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index ca33b77..1da999e 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-10 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-read.c (od_draw_text_frame_end): check for empty
+ text content
+
2012-05-01 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_attrs_as_string): handle font colour
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 1946222..2c9e051 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7122,7 +7122,8 @@ od_draw_text_frame_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin->user_state;
oo_text_p_t *ptr;
- if (state->text_p_stack != NULL && (NULL != (ptr = state->text_p_stack->data)))
+ if (state->text_p_stack != NULL && (NULL != (ptr = state->text_p_stack->data))
+ && ptr->gstr != NULL)
g_object_set (state->chart.so, "text", ptr->gstr->str, "markup", ptr->attrs, NULL);
od_draw_frame_end (xin, NULL);
odf_pop_text_p (state);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]