PsppireVariableSheet: Do not immediately display dialogs of cell renderers

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

diff --git a/src/data/spreadsheet-reader.c b/src/data/spreadsheet-reader.c
index 3c5de65822fa5f231fa6d09d0885ba54bcffca52..86dfe48c0c43c296c2e21d4446585959a55ef018 100644 (file)
--- a/src/data/spreadsheet-reader.c
+++ b/src/data/spreadsheet-reader.c
@@ -30,30 +30,36 @@
 #include <stdlib.h>
 
 #ifdef ODF_READ_SUPPORT
-const bool ODF_READING_SUPPORTED = true;
+static const bool ODF_READING_SUPPORTED = true;
 #else
-const bool ODF_READING_SUPPORTED = false;
+static const bool ODF_READING_SUPPORTED = false;
 #endif
 
 #ifdef GNM_READ_SUPPORT
-const bool GNM_READING_SUPPORTED = true;
+static const bool GNM_READING_SUPPORTED = true;
 #else
-const bool GNM_READING_SUPPORTED = false;
+static const bool GNM_READING_SUPPORTED = false;
 #endif
 
-void 
-spreadsheet_destroy (struct spreadsheet *s)
+void
+spreadsheet_ref (struct spreadsheet *s)
+{
+  s->ref_cnt++;
+}
+
+void
+spreadsheet_unref (struct spreadsheet *s)
 {
   switch (s->type)
     {
     case SPREADSHEET_ODS:
       assert (ODF_READING_SUPPORTED);
-      ods_destroy (s);
+      ods_unref (s);
       break;
 
     case SPREADSHEET_GNUMERIC:
       assert (GNM_READING_SUPPORTED);
-      gnumeric_destroy (s);
+      gnumeric_unref (s);
       break;
     default:
       NOT_REACHED ();
@@ -62,7 +68,7 @@ spreadsheet_destroy (struct spreadsheet *s)
 }
 
 
-struct casereader * 
+struct casereader *
 spreadsheet_make_reader (struct spreadsheet *s,
                          const struct spreadsheet_read_options *opts)
 {
@@ -77,7 +83,7 @@ spreadsheet_make_reader (struct spreadsheet *s,
   return NULL;
 }
 
-const char * 
+const char *
 spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 {
   if (ODF_READING_SUPPORTED)
@@ -92,7 +98,7 @@ spreadsheet_get_sheet_name (struct spreadsheet *s, int n)
 }
 
 
-char * 
+char *
 spreadsheet_get_sheet_range (struct spreadsheet *s, int n)
 {
   if (ODF_READING_SUPPORTED)
@@ -168,7 +174,7 @@ int_to_ps26 (int i)
   while (i > lower + base - 1)
     {
       lower += base;
-      base *= RADIX;      
+      base *= RADIX;
       assert (base > 0);
       exp++;
     }