X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-spreadsheet-model.c;h=f5be69d8705981d52300008499046662675ebafc;hb=cd8cb77fd12c77417f7c50acc135de77afd335f1;hp=f64f35ad096141bb0914ae56a6b580d126a8228b;hpb=32b010ba3a0cfcd82f6d274a64b709777a848421;p=pspp
diff --git a/src/ui/gui/psppire-spreadsheet-model.c b/src/ui/gui/psppire-spreadsheet-model.c
index f64f35ad09..f5be69d870 100644
--- a/src/ui/gui/psppire-spreadsheet-model.c
+++ b/src/ui/gui/psppire-spreadsheet-model.c
@@ -14,15 +14,23 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
+/* This file implements a GtkTreeModel. It allows GtkComboBox and
+ GtkTreeView to display the names and non-empty cell ranges of the
+ sheets aka "Tables" of spreadsheet files.
+ It doesn't take any notice of the spreadsheet data itself.
+*/
#include
#include
-#include "psppire-spreadsheet-model.h"
+#include
+#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);
@@ -245,17 +253,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;