Patch level : 2.1 nopatch
Files correlati : Ricompilazione Demo : [ ] Commento : Correzioni per stampa tabelle git-svn-id: svn://10.65.10.50/trunk@12171 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
1f179123b4
commit
4cbc74e8f5
@ -1514,26 +1514,15 @@ bool TPrinter::printrow(
|
|||||||
_vf->add_line(rw);
|
_vf->add_line(rw);
|
||||||
else
|
else
|
||||||
_frozen = TRUE;
|
_frozen = TRUE;
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
if (_printertype == winprinter || _printertype == exportprinter)
|
|
||||||
{
|
{
|
||||||
// add line to txt
|
// add line to txt
|
||||||
if (!_frozen)
|
if (!_frozen)
|
||||||
_txt.append(rw);
|
_txt.append(rw);
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_printertype == fileprinter)
|
return true;
|
||||||
{
|
|
||||||
// add line to txt
|
|
||||||
if (!_frozen)
|
|
||||||
_txt.append (rw);
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
word TPrinter::rows_left() const
|
word TPrinter::rows_left() const
|
||||||
@ -1706,12 +1695,9 @@ bool TPrinter::open()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (_printertype == winprinter || _printertype == exportprinter || _printertype == fileprinter)
|
// prepare text object for new text
|
||||||
{
|
_txt.destroy();
|
||||||
// prepare text object for new text
|
_txt.interactive(FALSE);
|
||||||
_txt.destroy();
|
|
||||||
_txt.interactive(FALSE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_currentrow = 1;
|
_currentrow = 1;
|
||||||
@ -1882,7 +1868,6 @@ void TPrinter::close ()
|
|||||||
else if (_printertype == winprinter && _txt.lines() > 0L)
|
else if (_printertype == winprinter && _txt.lines() > 0L)
|
||||||
{
|
{
|
||||||
print_txt(_txt);
|
print_txt(_txt);
|
||||||
// xvt_print_set_default_device(_defPrinter);
|
|
||||||
}
|
}
|
||||||
else if (_printertype == fileprinter)
|
else if (_printertype == fileprinter)
|
||||||
{
|
{
|
||||||
|
@ -1732,7 +1732,7 @@ TCursor_parser::TCursor_parser(istream& instr, TArray& col)
|
|||||||
if (_cursor == NULL)
|
if (_cursor == NULL)
|
||||||
_cursor = new TCursor(_relation, "", key);
|
_cursor = new TCursor(_relation, "", key);
|
||||||
|
|
||||||
TRectype rec_start(_relation->curr().num());
|
TRectype rec_start(_relation->curr());
|
||||||
TRectype rec_stop(rec_start);
|
TRectype rec_stop(rec_start);
|
||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
|
@ -1392,7 +1392,7 @@ bool TReport_book::add(TReport& rep, bool progind)
|
|||||||
|
|
||||||
TRecordset* rex = _report->recordset();
|
TRecordset* rex = _report->recordset();
|
||||||
if (rex == NULL || rex->items() <= 0)
|
if (rex == NULL || rex->items() <= 0)
|
||||||
return false;
|
return true;
|
||||||
|
|
||||||
TString msg = TR("Elaborazione report");
|
TString msg = TR("Elaborazione report");
|
||||||
msg << ' ' << _report->filename();
|
msg << ' ' << _report->filename();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user