projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into import-gui
[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 3a14ce6c4695202f31c50d86b3ba956fa1c013f6..5c004a8446f90999e1ca17e1ab8570d1c8e3a407 100644
(file)
--- a/
src/ui/gui/psppire-spreadsheet-model.c
+++ b/
src/ui/gui/psppire-spreadsheet-model.c
@@
-18,12
+18,14
@@
#include <config.h>
#include <glib.h>
#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/spreadsheet-reader.h"
-#include "data/gnumeric-reader.h"
-#include "data/ods-reader.h"
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
@@
-246,7
+248,7
@@
tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
{
const char *x =
case PSPPIRE_SPREADSHEET_MODEL_COL_NAME:
{
const char *x =
-
ods
_get_sheet_name (spreadsheetModel->spreadsheet,
+
spreadsheet
_get_sheet_name (spreadsheetModel->spreadsheet,
(gint) iter->user_data);
g_value_set_string (value, x);
(gint) iter->user_data);
g_value_set_string (value, x);
@@
-255,9
+257,10
@@
tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
{
char *x =
case PSPPIRE_SPREADSHEET_MODEL_COL_RANGE:
{
char *x =
-
ods
_get_sheet_range (spreadsheetModel->spreadsheet,
+
spreadsheet
_get_sheet_range (spreadsheetModel->spreadsheet,
(gint) iter->user_data);
(gint) iter->user_data);
- g_value_set_string (value, x);
+
+ g_value_set_string (value, x ? x : _("(empty)"));
g_free (x);
}
break;
g_free (x);
}
break;