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

Fix "and" semantics.

2002-12-12  Morten Welinder  <terra@diku.dk>

	* src/sheet-filter.c (cb_filter_expr): Fix "and" semantics.
parent 987aa907
2002-12-12 Morten Welinder <terra@diku.dk>
* src/sheet-filter.c (cb_filter_expr): Fix "and" semantics.
2002-12-11 Jon K Hellan <hellan@acm.org>
* src/bonobo-io.c: Remove 10 unnecessary includes.
......
2002-12-12 Morten Welinder <terra@diku.dk>
* src/sheet-filter.c (cb_filter_expr): Fix "and" semantics.
2002-12-11 Jon K Hellan <hellan@acm.org>
* src/bonobo-io.c: Remove 10 unnecessary includes.
......
2002-12-12 Morten Welinder <terra@diku.dk>
* src/sheet-filter.c (cb_filter_expr): Fix "and" semantics.
2002-12-11 Jon K Hellan <hellan@acm.org>
* src/bonobo-io.c: Remove 10 unnecessary includes.
......
......@@ -666,6 +666,8 @@ cb_filter_expr (Sheet *sheet, int col, int row, Cell *cell,
gboolean res = filter_expr_eval (data->cond->op[0],
data->val[0], data->regexp + 0, cell->value);
if (data->cond->op[1] != GNM_FILTER_UNUSED) {
if (data->cond->is_and && !res)
goto nope;
if (res && !data->cond->is_and)
return NULL;
res = filter_expr_eval (data->cond->op[1],
......@@ -675,6 +677,7 @@ cb_filter_expr (Sheet *sheet, int col, int row, Cell *cell,
return NULL;
}
nope:
colrow_set_visibility (sheet, FALSE, FALSE, row, row);
return NULL;
}
......
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