Commit a81cad5c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

http://bugzilla.gnome.org/show_bug.cgi?id=82847 Check for null in both


2002-06-01  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=82847
	* src/value.c (parse_criteria_range) : Check for null in both cases.
	  Clean up a touch while we are in here.
parent e67f9f6d
......@@ -291,11 +291,12 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of verson 2 of the GNU General Public License as
published by the Free Software Foundation.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -312,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......
2002-06-01 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=82847
* src/value.c (parse_criteria_range) : Check for null in both cases.
Clean up a touch while we are in here.
2002-05-29 Jody Goldberg <jody@gnome.org>
* src/Makefile.am (EXTRA_DIST) : include main-component.c
......
2002-06-01 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=82847
* src/value.c (parse_criteria_range) : Check for null in both cases.
Clean up a touch while we are in here.
2002-05-29 Jody Goldberg <jody@gnome.org>
* src/Makefile.am (EXTRA_DIST) : include main-component.c
......
2002-06-01 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=82847
* src/value.c (parse_criteria_range) : Check for null in both cases.
Clean up a touch while we are in here.
2002-05-29 Jody Goldberg <jody@gnome.org>
* src/Makefile.am (EXTRA_DIST) : include main-component.c
......
......@@ -1282,22 +1282,15 @@ parse_criteria_range (Sheet *sheet, int b_col, int b_row, int e_col, int e_row,
/* Equality condition (in number format) */
if (VALUE_IS_NUMBER (cell->value)) {
cond->x = value_duplicate (cell->value);
cond->fun =
(criteria_test_fun_t) criteria_test_equal;
cond->column = field_ind[j - b_col];
conditions = g_slist_append (conditions, cond);
continue;
cond->fun = (criteria_test_fun_t) criteria_test_equal;
} else {
/* Other conditions (in string format) */
cell_str = cell_get_rendered_text (cell);
parse_criteria (cell_str, &cond->fun, &cond->x);
g_free (cell_str);
}
/* Other conditions (in string format) */
cell_str = cell_get_rendered_text (cell);
parse_criteria (cell_str, &cond->fun, &cond->x);
if (field_ind != NULL)
cond->column = field_ind[j - b_col];
else
cond->column = j - b_col;
g_free (cell_str);
cond->column = (field_ind != NULL) ? field_ind[j - b_col] : j - b_col;
conditions = g_slist_append (conditions, cond);
}
......
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