root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.2

Browse Source 
Files correlati     : ba8
Ricompilazione Demo : [ ]
Commento            :

Corretta valutazione espressioni contenenti esclusivamente variabili di tipo data


git-svn-id: svn://10.65.10.50/trunk@13407 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2005-10-10 17:06:07 +00:00
parent 3055c3feac
commit b02619ff40
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/report.cpp
View File

@ -2567,8 +2567,7 @@ void TReport::mask2report(const TMask & m)
break; break;
default: default:
{ {
TString val(f.get()); TString val(f.get());
get_usr_val(name, var); get_usr_val(name, var);
if (val.empty()) if (val.empty())
val = is_final ? MAX_STRING : ""; val = is_final ? MAX_STRING : "";
@ -2579,7 +2578,7 @@ void TReport::mask2report(const TMask & m)
set_usr_val(name, var); set_usr_val(name, var);
if (rset != NULL) if (rset != NULL)
rset->set_var(name, var); rset->set_var(name, var, true);
} }
} }
} }

2
include/reprint.cpp
View File

@ -1776,7 +1776,7 @@ long TReport_book::print_section(TReport_section& rs)
if (!rs.condition().blank()) if (!rs.condition().blank())
{ {
TVariant var; TVariant var;
_report->evaluate(rs.condition(), var, _nullfld); _report->evaluate(rs.condition(), var, _alfafld);
if (!var.as_bool()) if (!var.as_bool())
return -2; return -2;
} }