Commit 0dcffe28 authored by Andreas J. Guelzow's avatar Andreas J. Guelzow Committed by Andreas J. Guelzow

colour -> color

2003-07-06  Andreas J. Guelzow <aguelzow@taliesin.ca>

	* graph/plugins/plot_pie/gog-ring-prefs.glade: colour -> color

2003-07-06  Andreas Guelzow <aguelzow@taliesin.ca>

	* en_ca: Updated Canadian English translation

2003-07-06  Andreas J. Guelzow  <aguelzow@taliesin.ca>

	* src/stf-parse.c (stf_parse_sheet): no col_import_array means
	  we want to import all columns
	(stf_parse_region): ditto
	* src/stf.c (stf_apply_formats): ditto
parent b72fc248
2003-07-06 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/stf-parse.c (stf_parse_sheet): no col_import_array means
we want to import all columns
(stf_parse_region): ditto
* src/stf.c (stf_apply_formats): ditto
2003-07-06 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in:
......
2003-07-06 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/stf-parse.c (stf_parse_sheet): no col_import_array means
we want to import all columns
(stf_parse_region): ditto
* src/stf.c (stf_apply_formats): ditto
2003-07-06 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in:
......
2003-07-06 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/stf-parse.c (stf_parse_sheet): no col_import_array means
we want to import all columns
(stf_parse_region): ditto
* src/stf.c (stf_apply_formats): ditto
2003-07-06 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in:
......
2003-07-06 Andreas Guelzow <aguelzow@taliesin.ca>
* en_ca: Updated Canadian English translation
2003-07-06 Valek Filippov <frob@df.ru>
* ru.po: Updated russian translation.
......
This diff is collapsed.
2003-07006 Andreas J. Guelzow <aguelzow@taliesin.ca>
2003-07-06 Andreas J. Guelzow <aguelzow@taliesin.ca>
* graph/plugins/plot_pie/gog-ring-prefs.glade: colour -> color
2003-07-06 Andreas J. Guelzow <aguelzow@taliesin.ca>
* graph/plugins/plot_pie/gog-pie-prefs.glade: colour -> color
......
......@@ -74,7 +74,7 @@
<widget class="GtkCheckButton" id="vary_style_by_element">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Vary colours by slice</property>
<property name="label" translatable="yes">_Vary colors by slice</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="active">False</property>
......
......@@ -1131,7 +1131,8 @@ stf_parse_sheet (StfParseOptions_t *parseoptions,
GPtrArray *line = g_ptr_array_index (lines, lrow);
for (lcol = 0; lcol < line->len; lcol++) {
if (parseoptions->col_import_array[lcol]) {
if (parseoptions->col_import_array == NULL ||
parseoptions->col_import_array[lcol]) {
char *text = g_ptr_array_index (line, lcol);
if (text) {
Value *v;
......@@ -1181,7 +1182,8 @@ stf_parse_region (StfParseOptions_t *parseoptions, char const *data, char const
GnmDateConventions date_conv = {FALSE};
for (col = 0; col < line->len; col++) {
if (parseoptions->col_import_array[col]) {
if (parseoptions->col_import_array == NULL ||
parseoptions->col_import_array[col]) {
char *text = g_ptr_array_index (line, col);
if (text) {
......
......@@ -121,13 +121,18 @@ stf_apply_formats (StfParseOptions_t *parseoptions,
unsigned int ui;
Range range;
/* If we didn't use the stf dialog, then formats will be NULL */
if (parseoptions->formats == NULL)
return;
range.start.col = col;
range.start.row = start_row;
range.end.col = col;
range.end.row = end_row;
for (ui = 0; ui < parseoptions->formats->len; ui++) {
if (parseoptions->col_import_array[ui]) {
if (parseoptions->col_import_array == NULL ||
parseoptions->col_import_array[ui]) {
MStyle *style = mstyle_new ();
StyleFormat *sf = g_ptr_array_index
(parseoptions->formats, ui);
......
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