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

Patch level : 2.1 98

Browse Source 
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
This commit is contained in:
guy 2004-07-29 14:39:13 +00:00
parent 132cd3e790
commit 2d3b07b9ca
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/report.cpp
View File

@ -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& TReport_section::print_font() const
{ {
const TReport_font* f = _print_font; if (_print_font != NULL && _report.use_printer_font())
if (f == NULL) return *_print_font;
{
TReport_section* father = father_section(); if (_font != NULL)
if (father == NULL) return *_font;
f = &_report.print_font();
else TReport_section* father = father_section();
f = &father->print_font(); if (father != NULL)
} return father->print_font();
return *f;
return _report.print_font();
} }
const TString& TReport_section::prescript() const 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 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) void TReport_field::compute_print_font(const TReport_font& oldfont, const TReport_font& newfont)