From 8adadf091b75f9cbce20efdc5fd71c1ca17d9557 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 19 Apr 2010 11:15:39 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : ba8.exe
 Ricompilazione Demo : [ ] Commento            : Corretta gestione colore
 campi di solo testo

git-svn-id: svn://10.65.10.50/trunk@20355 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/printer.cpp | 12 +++---------
 include/report.cpp  |  9 ++++-----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/include/printer.cpp b/include/printer.cpp
index ced3a8fd1..5a235f67f 100755
--- a/include/printer.cpp
+++ b/include/printer.cpp
@@ -1370,15 +1370,9 @@ void TPrinter::read_configuration(
   	  xvt_sys_get_host_name(hostname, sizeof(hostname));
       read_rcd = (host == hostname);  // Safe to read
   		if (!read_rcd)
-      {
-  			read_rcd = yesno_box(FR("Attenzione: le impostazioni della stampante sono relative alla stazione di lavoro %s.\n"
-                                "Si desidera utilizzarle ugualmente sulla stazione %s?"), (const char*)host, hostname);
-        if (!read_rcd)
-        {
-          // Forza la lettura parametri della stampante di default
-          _prname.cut(0);
-          set_printrcd(); 
-        }
+      {      
+        _prname.cut(0); // Forza la lettura parametri della stampante di default
+        set_printrcd(); 
       }
   	}
   }
diff --git a/include/report.cpp b/include/report.cpp
index c084315fa..9e959f001 100755
--- a/include/report.cpp
+++ b/include/report.cpp
@@ -1502,11 +1502,9 @@ bool TReport_field::print_tools(TBook& book) const
   if (visible)
   {
     book.set_pen(fore_color(), border()-1);
+    book.set_text_color(text_color(), back_color());
     if (pattern() == PAT_SPECIAL)
-    {
-      book.set_text_color(text_color(), back_color());
       book.set_brush(shade_color(), pattern(), shade_angle());
-    }
     else
       book.set_brush(back_color(), pattern());
   }
@@ -1653,7 +1651,7 @@ void TReport_field::print(TBook& book) const
       book.set_font(print_font());
       const TReport_rct& pr = print_rect(book); // Calcolo rettangolo dopo aver settato il font!
       book.set_text_align(horizontal_alignment(), vertical_alignment());
-      book.set_text_color(fore_color(), back_color());
+      book.set_text_color(text_color(), back_color());
       TString8 sec_code; section().code(sec_code);
       if (pr.height() > 100) // Multiriga?
       {
@@ -3152,7 +3150,8 @@ HIDDEN bool fld2id(TReport_field* fld, TVariant& var)
     if (curr == NULL || &sec != &curr->section())
     {
       TString16 str;
-      str << sec.type() << sec.level() << '.' << fld->id();
+      sec.code(str);
+      str << '.' << fld->id();
       var.set(str);
     }
     else