diff --git a/src/include/alex.cpp b/src/include/alex.cpp index d68eb2e06..9986022e4 100755 --- a/src/include/alex.cpp +++ b/src/include/alex.cpp @@ -340,11 +340,27 @@ bool TAVM_monitor::on_field_event(TOperable_field& o, TField_event e, long jolly { switch (o.dlg()) { - case DLG_CANCEL: - if (e == fe_button) - set_ignore_mon(true); - break; - default: break; + case DLG_CANCEL: + if (e == fe_button) + set_ignore_mon(true); + break; + case DLG_NEXTREC: + if (e == fe_button) + stop_run(K_F11); + break; + case DLG_LASTREC: + if (e == fe_button) + stop_run(K_F10); + break; + case DLG_ELABORA: + if (e == fe_button) + stop_run(K_F5); + break; + case DLG_QUIT: + if (e == fe_button) + stop_run(K_QUIT); + break; + default: break; } return true; } @@ -1143,7 +1159,7 @@ TAVM::~TAVM() TAVM& TAlex_virtual_machine::avm() { - if (_avm == NULL) + if (_avm == nullptr) _avm = new TAVM(this); return *_avm; } diff --git a/src/include/isam.cpp b/src/include/isam.cpp index ea3245fe2..f25730491 100755 --- a/src/include/isam.cpp +++ b/src/include/isam.cpp @@ -2723,7 +2723,7 @@ int TSystemisamfile::overwrite( // @comm Se

e' TRUE e trova alcune stringhe col formato %stringa% (es. %frm%) // ne sostituisce i valori (es. ditta corrente). -// @xref +// @xref { int err=NOERR; diff --git a/src/include/report.h b/src/include/report.h index ab6fa048f..29d935eb3 100755 --- a/src/include/report.h +++ b/src/include/report.h @@ -703,6 +703,7 @@ public: const TFilename& filename() const { return _path; } bool save(const char* fname) const; bool load(const char* fname); + void show_all_sections(); // Used by TReport_printer void set_page(word r, word p) { _rep_page = r; _book_page = p; } diff --git a/src/include/reprint.cpp b/src/include/reprint.cpp index 73227a8dc..b51744e89 100755 --- a/src/include/reprint.cpp +++ b/src/include/reprint.cpp @@ -2798,6 +2798,7 @@ long TReport_book::print_section(TReport_section& rs) if (rs.condition().full()) { TVariant var; + _report->evaluate(rs.condition(), var, _alfafld); if (!var.as_bool()) return -2;