[gnumeric] xls: handle missing text in object.



commit 3d356f5daed68bca738579823965a2f3c975bf78
Author: Morten Welinder <terra gnome org>
Date:   Tue May 12 20:06:42 2015 -0400

    xls: handle missing text in object.

 NEWS                           |    2 +-
 plugins/excel/ChangeLog        |    4 ++++
 plugins/excel/ms-excel-write.c |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index dad3b93..0bc78b1 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Morten:
        * Plug leaks.
        * Fuzzed file fixes.  [#748595] [#748597] [#749031] [#749030]
          [#749069] [#748533] [#749118] [#749166] [#749181] [#749184]
-         [#749236] [#749240] [#749234] [#749235]
+         [#749236] [#749240] [#749234] [#749235] [#749271]
        * Make solver check linearity of model.
        * Fix xls saving of marker style.  [#749185]
 
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 29fe5c5..c2a17ad 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-12  Morten Welinder  <terra gnome org>
+
+       * ms-excel-write.c (extract_txomarkup): Handle missing text.
+
 2015-05-11  Morten Welinder  <terra gnome org>
 
        * ms-excel-util.c (xls_header_footer_import): Handle terminating
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 862679e..c83ea03 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -6663,7 +6663,7 @@ extract_txomarkup (ExcelWriteState *ewb, SheetObject *so)
                return;
 
        g_object_get (G_OBJECT (so), "text", &text, NULL);
-       txo = txomarkup_new (ewb, text, markup, ewb->base.xf.default_style);
+       txo = txomarkup_new (ewb, text ? text : "", markup, ewb->base.xf.default_style);
        g_free (text);
 
        /* It isn't a cell, but that doesn't matter here */


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