[gnumeric] Fix loading of simple comments #584073
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnumeric] Fix loading of simple comments #584073
- Date: Thu, 28 May 2009 02:20:30 -0400 (EDT)
commit 7d0107c7806c12ba763ad4de5cc7bbb63b096fb2
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Thu May 28 00:19:12 2009 -0600
Fix loading of simple comments #584073
2009-05-28 Andreas J. Guelzow <aguelzow pyrshep ca>
* src/sheet-object-cell-comment.c (cell_comment_prep_sax_parser):
make sure we are having markup before retrieving it
---
ChangeLog | 5 +++++
src/sheet-object-cell-comment.c | 7 ++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8bf7bc6..5a17f58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-28 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * src/sheet-object-cell-comment.c (cell_comment_prep_sax_parser):
+ make sure we are having markup before retrieving it
+
2009-05-26 Morten Welinder <terra gnome org>
* src/dependent.c (dependent_changed): Handle NULL dep->sheet.
diff --git a/src/sheet-object-cell-comment.c b/src/sheet-object-cell-comment.c
index a6e5056..59cbdcc 100644
--- a/src/sheet-object-cell-comment.c
+++ b/src/sheet-object-cell-comment.c
@@ -316,9 +316,10 @@ cell_comment_prep_sax_parser (SheetObject *so, GsfXMLIn *xin,
cc->author = g_strdup (attrs[1]);
else if (!strcmp (attrs[0], "TextFormat")) {
GOFormat * fmt = go_format_new_from_XL (attrs[1]);
- g_object_set (G_OBJECT (cc),
- "markup", go_format_get_markup (fmt),
- NULL);
+ if (go_format_is_markup (fmt))
+ g_object_set (G_OBJECT (cc),
+ "markup", go_format_get_markup (fmt),
+ NULL);
go_format_unref (fmt);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]