[gnumeric] Lotus: fix problems reading 1-2-3 files containing zero-length records.



commit f47fd08af6c36c2dfeab0dcae3b2f34f43526c3c
Author: Morten Welinder <terra gnome org>
Date:   Sat May 7 18:11:16 2011 -0400

    Lotus: fix problems reading 1-2-3 files containing zero-length records.

 NEWS                        |    1 +
 plugins/lotus-123/ChangeLog |    4 ++++
 plugins/lotus-123/lotus.c   |    2 +-
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index c7e2000..18bfc52 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Morten:
 	* Fix minor problem reading old xls objects.
 	* Reduce memory usage when new glib is used.  [#644197]
 	* Eliminate col/row infos that are identical to the default.  [#155003]
+	* Fix problems reading some Lotus 1-2-3 files.
 
 Urmas:
 	* Initial support for Works files.  [#647492]
diff --git a/plugins/lotus-123/ChangeLog b/plugins/lotus-123/ChangeLog
index 66dcf7d..79a48d8 100644
--- a/plugins/lotus-123/ChangeLog
+++ b/plugins/lotus-123/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-07  Morten Welinder  <terra gnome org>
+
+	* lotus.c (record_next): Lack of data in a record is not an error.
+
 2011-05-07  Andreas J Guelzow  <aguelzow pyrshep ca>
 
 	* lotus-formula.c (functions): rename to functions_lotus
diff --git a/plugins/lotus-123/lotus.c b/plugins/lotus-123/lotus.c
index dabe4f3..8963b52 100644
--- a/plugins/lotus-123/lotus.c
+++ b/plugins/lotus-123/lotus.c
@@ -848,7 +848,7 @@ record_next (record_t *r)
 		gsf_mem_dump (r->data, r->len);
 #endif
 
-	return (r->data != NULL);
+	return TRUE;
 }
 
 /* ------------------------------------------------------------------------- */



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