Removed an unsed variable and used an unused macro

diff --git a/src/ui/gui/psppire-data-store.c b/src/ui/gui/psppire-data-store.c
index f21dfbd68031156dbb2001cb40ffb97aad679cbb..4d5ffcf1da36e7665bdf81eee666eb881ec0f96e 100644 (file)
--- a/src/ui/gui/psppire-data-store.c
+++ b/src/ui/gui/psppire-data-store.c
@@ -736,13 +736,11 @@ static const gchar null_var_name[]=N_("var");
 static gchar *
 get_row_button_label (const GSheetModel *model, gint unit)
 {
-  gchar *text;
-  gchar *s;
   PsppireDataStore *ds = PSPPIRE_DATA_STORE (model);
 
-  s = g_strdup_printf (_("%d"), unit + 1);
+  gchar *s = g_strdup_printf (_("%d"), unit + FIRST_CASE_NUMBER);
 
-  text =  pspp_locale_to_utf8 (s, -1, 0);
+  gchar *text =  pspp_locale_to_utf8 (s, -1, 0);
 
   g_free (s);
 

diff --git a/src/ui/gui/psppire-data-store.h b/src/ui/gui/psppire-data-store.h
index b6160651e535666f506b3ab83d5e80c7f4a484b7..058f9e1420be2990a83b06b8af1bd0708a3e6c15 100644 (file)
--- a/src/ui/gui/psppire-data-store.h
+++ b/src/ui/gui/psppire-data-store.h
@@ -82,9 +82,6 @@ struct _PsppireDataStore
 
   gboolean show_labels;
 
-  /* Geometry */
-  gint margin_width;
-
   gint cf_handler_id [n_cf_signals];
   gint dict_handler_id [n_dict_signals];
 };