Make the gnumeric reader behave the same as the odsreader

[pspp] / src / data / gnumeric-reader.c

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 71dc4a1be7de28d2abbca4d52b13dfbeb13dfd4b..9193cfb061c4949be89b8467877174bcbf1a0264 100644 (file)
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -138,8 +138,10 @@ struct gnumeric_reader
 void
 gnumeric_destroy (struct spreadsheet *s)
 {
-  struct gnumeric_reader *r = s;
+  struct gnumeric_reader *r = (struct gnumeric_reader *) s;
 
+
+#if 0
   if (0 == --r->ref_cnt)
     {
       int i;
@@ -153,6 +155,7 @@ gnumeric_destroy (struct spreadsheet *s)
 
       free (r);
     }
+#endif
 }
 
 
@@ -199,9 +202,11 @@ static void
 gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
 {
   struct gnumeric_reader *r = r_;
+
   if ( r == NULL)
        return ;
 
+#if 0
   if ( r->xtr)
     xmlFreeTextReader (r->xtr);
   r->xtr = NULL;
@@ -211,7 +216,8 @@ gnm_file_casereader_destroy (struct casereader *reader UNUSED, void *r_)
 
   caseproto_unref (r->proto);
 
-  gnumeric_destroy (r);
+  gnumeric_destroy (&r->spreadsheet);
+#endif
 }