[gnumeric] xlsx: fix FMR.



commit 4169dd2ff331a0b56be55eee6e70b94f3a4f1bdd
Author: Morten Welinder <terra gnome org>
Date:   Sun Mar 1 12:44:56 2015 -0500

    xlsx: fix FMR.

 NEWS                          |    1 +
 plugins/excel/ChangeLog       |    5 +++++
 plugins/excel/ms-excel-read.c |    3 +--
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index d9e2407..7dee582 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ Morten:
        * Fix undo problems with scrollbars.
        * Fix spinner properties dialog.
        * SheetObjectImage fixes.
+       * Fix problem reading images from xls.
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.20
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 2e63540..dfc4d79 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-01  Morten Welinder  <terra gnome org>
+
+       * ms-excel-read.c (ms_sheet_realize_obj): Don't let the sheet
+       object take over the memory.  We might need it later.
+
 2015-02-25  Morten Welinder  <terra gnome org>
 
        * xlsx-write.c (xlsx_write_sheet): Also write combos and lists.
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 57a52e9..5e2217a 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -649,8 +649,7 @@ ms_sheet_realize_obj (MSContainer *container, MSObj *obj)
                                } else {
                                        sheet_object_image_set_image (SHEET_OBJECT_IMAGE (so),
                                                                      blip->type, blip->data, blip->data_len,
-                                                                     !blip->needs_free);
-                                       blip->needs_free = FALSE; /* image took over managing data */
+                                                                     TRUE);
                                }
                        }
                } else if ((attr = ms_obj_attr_bag_lookup (obj->attrs,


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