From 65b4471afab568b148cf3c9329c663fafeb0d3b4 Mon Sep 17 00:00:00 2001 From: cris Date: Fri, 7 Aug 1998 10:04:30 +0000 Subject: [PATCH] Patch level : Files correlati : Ricompilazione Demo : [ ] Commento : Corretto ordine nella destroy() git-svn-id: svn://10.65.10.50/trunk@6929 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- at/at3100.cpp | 8 ++++---- at/at3200.cpp | 10 +++++----- at/at3300.cpp | 10 +++++----- at/at3400.cpp | 10 +++++----- at/at3500.cpp | 10 +++++----- at/at3600.cpp | 12 ++++++------ at/at3700.cpp | 8 ++++---- at/at3800.cpp | 12 ++++++------ at/at3900.cpp | 12 ++++++------ at/at4300.cpp | 4 ++-- at/at4500.cpp | 4 ++-- at/at4600.cpp | 4 ++-- at/at4700.cpp | 20 ++++++++++---------- at/at4800.cpp | 18 +++++++++--------- 14 files changed, 71 insertions(+), 71 deletions(-) diff --git a/at/at3100.cpp b/at/at3100.cpp index dd8b30ea1..eec41d3ca 100755 --- a/at/at3100.cpp +++ b/at/at3100.cpp @@ -186,12 +186,12 @@ bool TStatSogxEta::create() bool TStatSogxEta::destroy() { + delete _colonne; + delete _sezioni; + delete _atstats; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _atstats; - delete _sezioni; - delete _colonne; return TApplication::destroy(); } diff --git a/at/at3200.cpp b/at/at3200.cpp index 780120426..fde8ee885 100755 --- a/at/at3200.cpp +++ b/at/at3200.cpp @@ -274,13 +274,13 @@ bool TMensileDonxGr::create() bool TMensileDonxGr::destroy() { + delete _colonne; + delete _sezioni; + delete _atstatd; + delete _donaz; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _donaz; - delete _atstatd; - delete _sezioni; - delete _colonne; return TApplication::destroy(); } diff --git a/at/at3300.cpp b/at/at3300.cpp index 1b10b6128..feb7d61af 100755 --- a/at/at3300.cpp +++ b/at/at3300.cpp @@ -167,13 +167,13 @@ bool TStatSogxCat::create() bool TStatSogxCat::destroy() { + delete _categorie; + delete _colonne; + delete _sezioni; + delete _atstats; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _atstats; - delete _sezioni; - delete _colonne; - delete _categorie; return TApplication::destroy(); } diff --git a/at/at3400.cpp b/at/at3400.cpp index 14e9a1520..ad199b20d 100755 --- a/at/at3400.cpp +++ b/at/at3400.cpp @@ -226,13 +226,13 @@ bool TRiepilogoDonazioni::create() bool TRiepilogoDonazioni::destroy() { + delete _colonne; + delete _sezioni; + delete _atstatd; + delete _donaz; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _donaz; - delete _atstatd; - delete _sezioni; - delete _colonne; return TApplication::destroy(); } diff --git a/at/at3500.cpp b/at/at3500.cpp index 2c7c72630..2151960ee 100755 --- a/at/at3500.cpp +++ b/at/at3500.cpp @@ -159,13 +159,13 @@ bool TRiepilogoGiornaliero::create() bool TRiepilogoGiornaliero::destroy() { + delete _colonne; + delete _sezioni; + delete _atstatd; + delete _donaz; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _donaz; - delete _atstatd; - delete _sezioni; - delete _colonne; return TApplication::destroy(); } diff --git a/at/at3600.cpp b/at/at3600.cpp index 1a44df135..4ace8482b 100755 --- a/at/at3600.cpp +++ b/at/at3600.cpp @@ -214,14 +214,14 @@ bool TStatDonGrRh::create() bool TStatDonGrRh::destroy() { + delete _asoggetti; + delete _colonne; + delete _sezioni; + delete _atstatd; + delete _donaz; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _donaz; - delete _atstatd; - delete _sezioni; - delete _colonne; - delete _asoggetti; return TApplication::destroy(); } diff --git a/at/at3700.cpp b/at/at3700.cpp index dd937043a..ebaee3a82 100755 --- a/at/at3700.cpp +++ b/at/at3700.cpp @@ -211,12 +211,12 @@ bool TStatisticaSog::create() bool TStatisticaSog::destroy() { + delete _colonne; + delete _sezioni; + delete _atstats; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _atstats; - delete _sezioni; - delete _colonne; return TApplication::destroy(); } diff --git a/at/at3800.cpp b/at/at3800.cpp index c5f1b3ff1..d349ea928 100755 --- a/at/at3800.cpp +++ b/at/at3800.cpp @@ -171,14 +171,14 @@ bool TRiepilogoPunto::create() bool TRiepilogoPunto::destroy() { + delete _punti; + delete _colonne; + delete _sezioni; + delete _atstatd; + delete _donaz; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _donaz; - delete _atstatd; - delete _sezioni; - delete _colonne; - delete _punti; return TApplication::destroy(); } diff --git a/at/at3900.cpp b/at/at3900.cpp index a458c946a..8e57e62bd 100755 --- a/at/at3900.cpp +++ b/at/at3900.cpp @@ -193,14 +193,14 @@ bool TStatSogxCom::create() bool TStatSogxCom::destroy() { + delete _comprovincia; + delete _colonne; + delete _comuni; + delete _sezioni; + delete _atstats; + delete _soggetti; delete _rel; delete _msk; - delete _soggetti; - delete _atstats; - delete _sezioni; - delete _comuni; - delete _colonne; - delete _comprovincia; return TApplication::destroy(); } diff --git a/at/at4300.cpp b/at/at4300.cpp index 5245ab823..beff123f6 100755 --- a/at/at4300.cpp +++ b/at/at4300.cpp @@ -482,10 +482,10 @@ bool TStampaConvocazioni::user_create() bool TStampaConvocazioni::user_destroy() { + delete _form_car; + delete _form_eti; delete _msk; delete _rel; - delete _form_eti; - delete _form_car; return TRUE; } diff --git a/at/at4500.cpp b/at/at4500.cpp index f6eba271d..cd547e9f3 100755 --- a/at/at4500.cpp +++ b/at/at4500.cpp @@ -381,10 +381,10 @@ void TStampaTessere::crea_intestazione() bool TStampaTessere::user_destroy() { + printer().read_configuration(); + delete _form_pag; delete _msk; delete _rel; - delete _form_pag; - printer().read_configuration(); return TRUE; } diff --git a/at/at4600.cpp b/at/at4600.cpp index ca3b37fe9..af0efce17 100755 --- a/at/at4600.cpp +++ b/at/at4600.cpp @@ -317,10 +317,10 @@ bool TStampaTessereS::codice_handler(TMask_field& f, KEY k) bool TStampaTessereS::user_destroy() { - delete _sogtmp; + delete _form_pag; delete _msk; delete _rel; - delete _form_pag; + delete _sogtmp; printer().read_configuration(); return TRUE; } diff --git a/at/at4700.cpp b/at/at4700.cpp index bc4d6b19f..32376980c 100755 --- a/at/at4700.cpp +++ b/at/at4700.cpp @@ -224,14 +224,14 @@ void TStampeSingole::set_page(int file, int cnt) case schede: { TPrint_section& corpo = _form_sch->get_body(); - corpo.update_and_print(TRUE); + corpo.update_and_print(printmode_normal, TRUE); force_setpage(TRUE); } break; case donazioni: { TPrint_section& corpo = _form_don->get_body(); - corpo.update_and_print(TRUE); + corpo.update_and_print(printmode_normal, TRUE); force_setpage(TRUE); } break; @@ -501,17 +501,17 @@ bool TStampeSingole::codice_handler(TMask_field& f, KEY k) bool TStampeSingole::user_destroy() { - delete _sogtmp; - delete _msk; - delete _sdonazioni; - delete _sbenemerenze; - delete _donaz; - delete _benem; - delete _rel; delete _form_sch; - delete _form_car; delete _form_eti; delete _form_don; + delete _form_car; + delete _msk; + delete _sbenemerenze; + delete _sdonazioni; + delete _benem; + delete _donaz; + delete _rel; + delete _sogtmp; return TRUE; } diff --git a/at/at4800.cpp b/at/at4800.cpp index 68b7601ec..cad57f0e9 100755 --- a/at/at4800.cpp +++ b/at/at4800.cpp @@ -189,14 +189,14 @@ void TStampePerCodice::set_page(int file, int cnt) case schede: { TPrint_section& corpo = _form_sch->get_body(); - corpo.update_and_print(TRUE); + corpo.update_and_print(printmode_normal, TRUE); force_setpage(TRUE); } break; case donazioni: { TPrint_section& corpo = _form_don->get_body(); - corpo.update_and_print(TRUE); + corpo.update_and_print(printmode_normal,TRUE); force_setpage(TRUE); } break; @@ -348,16 +348,16 @@ bool TStampePerCodice::user_create() bool TStampePerCodice::user_destroy() { - delete _msk; - delete _sdonazioni; - delete _sbenemerenze; - delete _donaz; - delete _benem; - delete _rel; delete _form_sch; - delete _form_car; delete _form_eti; delete _form_don; + delete _form_car; + delete _msk; + delete _sbenemerenze; + delete _sdonazioni; + delete _benem; + delete _donaz; + delete _rel; return TRUE; }