Commit bd44eac1 authored by Morten Welinder's avatar Morten Welinder Committed by Morten Welinder

Use the right combo box when figuring out formatting to use. Don't set

2005-06-17  Morten Welinder  <terra@gnome.org>

	* dialog-stf-export.c (stf_export_dialog_finish): Use the right
	combo box when figuring out formatting to use.  Don't set
	quoting-triggers unless we're in auto-quote-mode.  Fixes #308109.
parent 65e5b6d6
......@@ -2,6 +2,8 @@ Gnumeric 1.5.3
Morten:
* Make changes to toolbar visibility permanent.
* Fix stf export quoting problem. [#308109]
* Fix stf export format problem.
--------------------------------------------------------------------------
Gnumeric 1.5.2
......
2005-06-17 Morten Welinder <terra@gnome.org>
* dialog-stf-export.c (stf_export_dialog_finish): Use the right
combo box when figuring out formatting to use. Don't set
quoting-triggers unless we're in auto-quote-mode. Fixes #308109.
2005-06-13 Morten Welinder <terra@gnome.org>
* dialog-plugin-manager.c (PLUGIN_MANAGER_DIALOG_KEY): Don't
......
......@@ -172,7 +172,7 @@ stf_export_dialog_finish (TextExportState *state)
GnmStfTransliterateMode transliteratemode;
GnmStfFormatMode format;
const char *eol;
GString *triggers = g_string_new (" \t");
GString *triggers = g_string_new (NULL);
char *separator, *quote;
const char *charset;
......@@ -197,7 +197,7 @@ stf_export_dialog_finish (TextExportState *state)
case 1 : transliteratemode = GNM_STF_TRANSLITERATE_MODE_ESCAPE; break;
}
switch (gtk_combo_box_get_active (state->format.quote)) {
switch (gtk_combo_box_get_active (state->format.format)) {
default:
case 0: format = GNM_STF_FORMAT_AUTO; break;
case 1: format = GNM_STF_FORMAT_RAW; break;
......@@ -225,9 +225,12 @@ stf_export_dialog_finish (TextExportState *state)
charset = go_charmap_sel_get_encoding (GO_CHARMAP_SEL (state->format.charset));
g_string_append (triggers, eol);
g_string_append (triggers, quote);
g_string_append (triggers, separator);
if (quotingmode == GSF_OUTPUT_CSV_QUOTING_MODE_AUTO) {
g_string_append (triggers, " \t");
g_string_append (triggers, eol);
g_string_append (triggers, quote);
g_string_append (triggers, separator);
}
state->result = g_object_new
(GNM_STF_EXPORT_TYPE,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment