From 2d3b07b9ca8b75575c176c7faa96ecd13f7bc619 Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 29 Jul 2004 14:39:13 +0000
Subject: [PATCH] Patch level         : 2.1 98 Files correlati     : ba3 ba8
 ve1 (nuovi report) Ricompilazione Demo : [ ] Commento            :

Correzione dimensione font di stampa quando non dipendenti dalla stamapante


git-svn-id: svn://10.65.10.50/trunk@12274 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/report.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/include/report.cpp b/include/report.cpp
index ba87bc4d2..4e78700d5 100755
--- a/include/report.cpp
+++ b/include/report.cpp
@@ -389,16 +389,17 @@ void TReport_section::compute_print_font(const TReport_font& oldfont, const TRep
 
 const TReport_font& TReport_section::print_font() const
 {
-  const TReport_font* f = _print_font;
-  if (f == NULL)
-  {
-    TReport_section* father = father_section();
-    if (father == NULL)
-      f = &_report.print_font();
-    else
-      f = &father->print_font();
-  }
-  return *f;
+  if (_print_font != NULL && _report.use_printer_font())
+    return *_print_font;
+  
+  if (_font != NULL)
+    return *_font;
+
+  TReport_section* father = father_section();
+  if (father != NULL)
+    return father->print_font();
+  
+  return _report.print_font();
 }
 
 const TString& TReport_section::prescript() const 
@@ -1017,7 +1018,11 @@ const TReport_font& TReport_field::font() const
 
 const TReport_font& TReport_field::print_font() const
 {
-  return _print_font != NULL ? *_print_font : _section->print_font();
+  if (_print_font != NULL)
+    return *_print_font;
+  if (_font != NULL)
+    return *_font;
+  return _section->print_font();
 }
 
 void TReport_field::compute_print_font(const TReport_font& oldfont, const TReport_font& newfont)