Created wrappers for the ods/gnumeric functions

[pspp] / src / ui / gui / psppire-spreadsheet-model.c

diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index 240356f294cb87f3b6239e752bcafed70314b2c5..5c004a8446f90999e1ca17e1ab8570d1c8e3a407 100644 (file)
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -18,11 +18,14 @@
 #include <config.h>
 #include <glib.h>
 
-#include "psppire-spreadsheet-model.h"
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 
+#include "psppire-spreadsheet-model.h"
 #include "data/spreadsheet-reader.h"
 
-#include "data/gnumeric-reader.h"
 
 static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
                                             spreadsheetModel);
@@ -217,7 +220,7 @@ tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter)
   if (iter == NULL)
     return FALSE;
 
-  if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->sheets - 1)
+  if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
     {
       iter->user_data = NULL;
       iter->stamp = 0;
@@ -245,17 +248,19 @@ tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
     case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
       {
         const char *x =
-          gnumeric_get_sheet_name (spreadsheetModel->spreadsheet,
+          spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
                                    (gint) iter->user_data);
+       
         g_value_set_string (value, x);
       }
       break;
     case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
       {
         char *x =
-          gnumeric_get_sheet_range (spreadsheetModel->spreadsheet,
+          spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet,
                                     (gint) iter->user_data);
-        g_value_set_string (value, x);
+
+       g_value_set_string (value, x ? x : _("(empty)"));
        g_free (x);
       }
       break;
@@ -276,7 +281,7 @@ tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
   if (parent)
     return FALSE;
 
-  if (n >= spreadsheetModel->spreadsheet->sheets)
+  if (n >= spreadsheetModel->spreadsheet->n_sheets)
     return FALSE;
 
   iter->stamp = spreadsheetModel->stamp;
@@ -292,7 +297,7 @@ tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
     PSPPIRE_SPREADSHEET_MODEL (model);
 
   if (iter == NULL)
-    return spreadsheetModel->spreadsheet->sheets;
+    return spreadsheetModel->spreadsheet->n_sheets;
 
   return 0;
 }