projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into import-gui
[pspp]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index a9cf86054e907f7675f19ae2c1b93cd28c883963..d24a23242d7a03810de1fff1545cbd679d82767d 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-95,10
+95,8
@@
text_data_import_assistant (PsppireDataWindow *dw)
else
{
ia->intro = intro_page_create (ia);
else
{
ia->intro = intro_page_create (ia);
- ia->separators = separators_page_create (ia);
ia->first_line = first_line_page_create (ia);
ia->first_line = first_line_page_create (ia);
-
- printf ("%s:%d %p\n", __FILE__, __LINE__, ia->intro);
+ ia->separators = separators_page_create (ia);
}
ia->formats = formats_page_create (ia);
}
ia->formats = formats_page_create (ia);
@@
-244,7
+242,6
@@
generate_syntax (const struct import_assistant *ia)
if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
syntax_gen_pspp (&s, " /ENCODING=%sq\n", ia->file.encoding);
if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
syntax_gen_pspp (&s, " /ENCODING=%sq\n", ia->file.encoding);
-
intro_append_syntax (ia->intro, &s);
intro_append_syntax (ia->intro, &s);
@@
-261,7
+258,7
@@
generate_syntax (const struct import_assistant *ia)
{
return sheet_spec_gen_syntax (ia);
}
{
return sheet_spec_gen_syntax (ia);
}
-
+
return ds_cstr (&s);
}
return ds_cstr (&s);
}