Commit f2835414 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg
Browse files

Use cell_get_rendered_text rather than entered_text. (parse_criteria_rang)


2000-08-10  Jody Goldberg <jgoldberg@home.com>

	* src/functions/fn-database.c (find_column_of_field) : Use
	  cell_get_rendered_text rather than entered_text.
	(parse_criteria_rang) : Ditto.
	(find_rows_that_match) : Ditto.

	* src/formats.c (cell_format_currency) : Add some versions without
	  trailing _), it was causing problems now that we handle spaces.
	  We should not be using these lists to do this.
parent b28e5bd8
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
2000-08-10 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-database.c (find_column_of_field) : Use
cell_get_rendered_text rather than entered_text.
(parse_criteria_rang) : Ditto.
(find_rows_that_match) : Ditto.
* src/formats.c (cell_format_currency) : Add some versions without
trailing _), it was causing problems now that we handle spaces.
We should not be using these lists to do this.
2000-08-09 Jody Goldberg <jgoldberg@home.com>
* src/functions/fn-date.c (gnumeric_datevalue) : Handle error values.
......
......@@ -139,7 +139,7 @@ find_column_of_field (const EvalPos *ep, Value *database, Value *field)
if (cell == NULL)
continue;
txt = cell_get_entered_text (cell);
txt = cell_get_rendered_text (cell);
match = (g_strcasecmp (field_name, txt) == 0);
g_free (txt);
if (match) {
......@@ -251,7 +251,7 @@ parse_criteria_range(Sheet *sheet, int b_col, int b_row, int e_col, int e_row,
}
/* Other conditions (in string format) */
cell_str = cell_get_entered_text(cell);
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];
......@@ -426,8 +426,8 @@ find_rows_that_match (Sheet *sheet, int first_col, int first_row,
sheet_cell_get(sheet, i, trow);
cell =
sheet_cell_get(sheet, i, row);
t1 = cell_get_entered_text (cell);
t2 = cell_get_entered_text (test_cell);
t1 = cell_get_rendered_text (cell);
t2 = cell_get_rendered_text (test_cell);
if (strcmp (t1, t2) != 0)
goto row_ok;
}
......
......@@ -35,8 +35,10 @@ cell_format_numbers [] = {
static char const * const
cell_format_currency [] = {
N_("$#,##0;"),
N_("$#,##0_);($#,##0)"),
N_("$#,##0_);[Red]($#,##0)"),
N_("$#,##0.00"),
N_("$#,##0.00_);($#,##0.00)"),
N_("$#,##0.00_);[Red]($#,##0.00)"),
NULL,
......
......@@ -139,7 +139,7 @@ find_column_of_field (const EvalPos *ep, Value *database, Value *field)
if (cell == NULL)
continue;
txt = cell_get_entered_text (cell);
txt = cell_get_rendered_text (cell);
match = (g_strcasecmp (field_name, txt) == 0);
g_free (txt);
if (match) {
......@@ -251,7 +251,7 @@ parse_criteria_range(Sheet *sheet, int b_col, int b_row, int e_col, int e_row,
}
/* Other conditions (in string format) */
cell_str = cell_get_entered_text(cell);
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];
......@@ -426,8 +426,8 @@ find_rows_that_match (Sheet *sheet, int first_col, int first_row,
sheet_cell_get(sheet, i, trow);
cell =
sheet_cell_get(sheet, i, row);
t1 = cell_get_entered_text (cell);
t2 = cell_get_entered_text (test_cell);
t1 = cell_get_rendered_text (cell);
t2 = cell_get_rendered_text (test_cell);
if (strcmp (t1, t2) != 0)
goto row_ok;
}
......
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