Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / psppire-data-sheet.c

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index ca22471c8897d059730ab4b6aa6e5bc8ccede32d..089ab8f4795c5a8cf365fdd4f29c8c138fc88670 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -102,16 +102,9 @@ change_data_value (PsppireDataSheet *sheet, gint col, gint row, GValue *value)
   value_destroy_from_variant (&v, vrnt);
 }
 
-static gchar *
-data_store_value_to_string (SswSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v)
-{
-  return psppire_data_store_value_to_string (store, col, row, v);
-}
-
 gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in,
                    GValue *out);
 
-
 \f
 
 static void
@@ -355,7 +348,7 @@ psppire_data_sheet_new (void)
 {
   GObject *obj =
     g_object_new (PSPPIRE_TYPE_DATA_SHEET,
-                 "forward-conversion", data_store_value_to_string,
+                 "forward-conversion", psppire_data_store_value_to_string,
                  "reverse-conversion", myreversefunc,
                  NULL);