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

Patch level :2.1 nopatch

Browse Source 
Files correlati     :libs
Ricompilazione Demo : [ ]
Commento            :sostituite un tot di chiamate field(i) con 1 solo TForm_item& fi = field(i)


git-svn-id: svn://10.65.10.50/trunk@11806 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2004-03-04 14:09:44 +00:00
parent 518d0c9868
commit 25a91f6837
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/form.cpp
View File

@ -2276,11 +2276,12 @@ int TPrint_section::tab(int col)
short maxcolreached = 0,mincolreached = MAXCOLUMNS+1; short maxcolreached = 0,mincolreached = MAXCOLUMNS+1;
for (word i = 0; i < fields(); i++) for (word i = 0; i < fields(); i++)
{ {
if (!field(i).is_section() && field(i).shown()) const TForm_item& fi = field(i);
if (!fi.is_section() && fi.shown())
{ {
const int curr_col=field(i)._x; const int curr_col=fi._x;
CHECKD (curr_col >=0 && curr_col < MAXCOLUMNS, "Colonna ammessa e non concessa: ", field(i)._x); CHECKD (curr_col >=0 && curr_col < MAXCOLUMNS, "Colonna ammessa e non concessa: ", field(i)._x);
_tab[curr_col] = field(i)._width + 1; // one is for separation _tab[curr_col] = fi._width + 1; // one is for separation
if (curr_col < mincolreached) mincolreached = curr_col; if (curr_col < mincolreached) mincolreached = curr_col;
if (curr_col > maxcolreached) maxcolreached = curr_col; if (curr_col > maxcolreached) maxcolreached = curr_col;
_nfld++; _nfld++;
@ -3188,16 +3189,17 @@ bool TPrint_section::update_and_print(const sec_print_mode show_fields, bool new
int last_hpos=0; int last_hpos=0;
for (word i = 0; i < fields(); i++) for (word i = 0; i < fields(); i++)
{ {
if (!field(i).is_section()) TForm_item& fi = field(i);
if (!fi.is_section())
{ {
// compose rows using "simple" fields // compose rows using "simple" fields
field(i).update(); fi.update();
} }
else else
{ {
last_hpos=min(word(field(i).y()-1), height()); last_hpos=min(word(fi.y()-1), height());
// found a subsection // found a subsection
TForm_subsection & ss=(TForm_subsection & )field(i); TForm_subsection & ss=(TForm_subsection & )fi;
last_printed_row=print_rows(show_fields,last_printed_row,last_hpos); last_printed_row=print_rows(show_fields,last_printed_row,last_hpos);