diff --git a/include/printer.cpp b/include/printer.cpp index e1caa4247..9786ac7fb 100755 --- a/include/printer.cpp +++ b/include/printer.cpp @@ -1514,26 +1514,15 @@ bool TPrinter::printrow( _vf->add_line(rw); else _frozen = TRUE; - return TRUE; } - - if (_printertype == winprinter || _printertype == exportprinter) + else { // add line to txt if (!_frozen) _txt.append(rw); - return TRUE; } - if (_printertype == fileprinter) - { - // add line to txt - if (!_frozen) - _txt.append (rw); - return TRUE; - } - - return TRUE; + return true; } word TPrinter::rows_left() const @@ -1706,12 +1695,9 @@ bool TPrinter::open() } else { - if (_printertype == winprinter || _printertype == exportprinter || _printertype == fileprinter) - { - // prepare text object for new text - _txt.destroy(); - _txt.interactive(FALSE); - } + // prepare text object for new text + _txt.destroy(); + _txt.interactive(FALSE); } _currentrow = 1; @@ -1882,7 +1868,6 @@ void TPrinter::close () else if (_printertype == winprinter && _txt.lines() > 0L) { print_txt(_txt); -// xvt_print_set_default_device(_defPrinter); } else if (_printertype == fileprinter) { diff --git a/include/recset.cpp b/include/recset.cpp index 7fae736d5..7cfcff3ba 100755 --- a/include/recset.cpp +++ b/include/recset.cpp @@ -1732,7 +1732,7 @@ TCursor_parser::TCursor_parser(istream& instr, TArray& col) if (_cursor == NULL) _cursor = new TCursor(_relation, "", key); - TRectype rec_start(_relation->curr().num()); + TRectype rec_start(_relation->curr()); TRectype rec_stop(rec_start); while (true) diff --git a/include/reprint.cpp b/include/reprint.cpp index d111ffb72..6f31e5fbb 100755 --- a/include/reprint.cpp +++ b/include/reprint.cpp @@ -1392,7 +1392,7 @@ bool TReport_book::add(TReport& rep, bool progind) TRecordset* rex = _report->recordset(); if (rex == NULL || rex->items() <= 0) - return false; + return true; TString msg = TR("Elaborazione report"); msg << ' ' << _report->filename();