From 736cad34a833704f6052319d66d57f4fd839e892 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 20 Feb 2010 12:34:25 -0800 Subject: [PATCH] gui: Fix File|Export in output viewer. Commit f51ecb480 "Greatly simplify PSPP configuration" changed how PSPP output drivers are configured but failed to completely update the implementation of File|Export to match. This commit fixes the problem. A few problems, perhaps not connected, linger: * The CSV driver appears to always output to "pspp.csv" when invoked from the GUI, regardless of the requested file name. * The ODT driver appears to be broken. Reported by John Darrington . --- src/ui/gui/psppire-output-window.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index ebf29c01..e217c0ed 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -450,29 +450,25 @@ psppire_output_window_export (PsppireOutputWindow *window) string_map_insert (&options, "output-file", filename); if (filter == pdf_filter) { - string_map_insert (&options, "output-type", "pdf"); - export_output (window, &options, "cairo"); + export_output (window, &options, "pdf"); } else if (filter == html_filter) export_output (window, &options, "html"); else if (filter == odt_filter) - export_output (window, &options, "odf"); + export_output (window, &options, "odt"); else if (filter == txt_filter) { string_map_insert (&options, "headers", "false"); string_map_insert (&options, "paginate", "false"); string_map_insert (&options, "squeeze", "true"); string_map_insert (&options, "emphasis", "none"); - string_map_insert (&options, "chart-type", "none"); + string_map_insert (&options, "charts", "none"); string_map_insert (&options, "top-margin", "0"); string_map_insert (&options, "bottom-margin", "0"); - export_output (window, &options, "ascii"); + export_output (window, &options, "txt"); } else if (filter == ps_filter) - { - string_map_insert (&options, "output-type", "ps"); - export_output (window, &options, "cairo"); - } + export_output (window, &options, "ps"); else if (filter == csv_filter) export_output (window, &options, "csv"); else -- 2.30.2