Patch level : 10.0

Files correlati     : ve0, lv3
Ricompilazione Demo : [ ]
Commento            :
Corretti metodi row2mask e mask2row utilizzando la corretta maschera di riga


git-svn-id: svn://10.65.10.50/trunk@17802 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-12-04 10:20:51 +00:00
parent 50abc1e005
commit 2aed67fa1d

View File

@ -3008,7 +3008,7 @@ void TSheet_field::on_idle()
// Ricopia i campi della maschera nel record dato // Ricopia i campi della maschera nel record dato
void TSheet_field::mask2row(int n, TToken_string & rec) void TSheet_field::mask2row(int n, TToken_string & rec)
{ {
const TMask& m = sheet_mask(); const TMask& m = sheet_row_mask(n);
rec.cut(0); rec.cut(0);
const TSpreadsheet& s = (const TSpreadsheet&)*_ctl; const TSpreadsheet& s = (const TSpreadsheet&)*_ctl;
@ -3062,10 +3062,9 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
{ {
TString val(80); TString val(80);
TMask& m = sheet_mask(); TMask& m = sheet_row_mask(n);
const int campi = m.fields(); const int campi = m.fields();
const TSpreadsheet& s = (const TSpreadsheet&)*_ctl; const TSpreadsheet& s = (const TSpreadsheet&)*_ctl;
int i; // Contatore di tutti i cicli successivi
for (short id = FIRST_FIELD; id <= _last_column_id; id++) for (short id = FIRST_FIELD; id <= _last_column_id; id++)
{ {
@ -3084,7 +3083,7 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
if (mode > 0) if (mode > 0)
{ {
for (i = 0; i < campi; i++) for (int i = 0; i < campi; i++)
{ {
TMask_field& f = m.fld(i); TMask_field& f = m.fld(i);
const short id = f.dlg(); const short id = f.dlg();
@ -3102,14 +3101,14 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
} }
} }
for (i = 0; i < campi; i++) for (int i = 0; i < campi; i++)
{ {
TMask_field& f = m.fld(i); TMask_field& f = m.fld(i);
if (f.dirty() == TRUE) if (f.dirty() == TRUE)
f.set_dirty(FALSE); f.set_dirty(FALSE);
} }
val.format("Riga %d", n+1); val = TR("Riga"); val << ' ' << (n+1);
m.set_caption(val); m.set_caption(val);
} }