From b02619ff404214a24e27a837c64ee389e47891b9 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 10 Oct 2005 17:06:07 +0000
Subject: [PATCH] Patch level         : 2.2 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
---
 include/report.cpp  | 5 ++---
 include/reprint.cpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/report.cpp b/include/report.cpp
index e6a162dfe..c5d50a683 100755
--- a/include/report.cpp
+++ b/include/report.cpp
@@ -2567,8 +2567,7 @@ void TReport::mask2report(const TMask & m)
         break;
       default: 
 				{
-					TString val(f.get());
-					
+					TString val(f.get());	
 					get_usr_val(name, var);
 					if (val.empty())
 						val = is_final ? MAX_STRING : "";
@@ -2579,7 +2578,7 @@ void TReport::mask2report(const TMask & m)
 
       set_usr_val(name, var);
       if (rset != NULL)
-        rset->set_var(name, var);
+        rset->set_var(name, var, true);
     }
   }
 }
diff --git a/include/reprint.cpp b/include/reprint.cpp
index f021327c3..a7e8147db 100755
--- a/include/reprint.cpp
+++ b/include/reprint.cpp
@@ -1776,7 +1776,7 @@ long TReport_book::print_section(TReport_section& rs)
   if (!rs.condition().blank())
   {
     TVariant var;
-    _report->evaluate(rs.condition(), var, _nullfld);
+    _report->evaluate(rs.condition(), var, _alfafld);
     if (!var.as_bool())
       return -2;
   }