From a64ab297c65d7936248752f27559951c42aa3063 Mon Sep 17 00:00:00 2001 From: Jean-Marc Levecque Date: Sun, 16 Oct 2011 17:11:16 +0200 Subject: Various PDF reporting changes. - Fixed some memory leaks by correctly freeing objects - Updated the PDF Demo to use a local reporting variable - Removed the global Imprime variable - Some various other changes --- .../report_tool/reportengine/u_imprime.pas | 54 +--------------------- 1 file changed, 1 insertion(+), 53 deletions(-) (limited to 'extras/contributed/report_tool/reportengine/u_imprime.pas') diff --git a/extras/contributed/report_tool/reportengine/u_imprime.pas b/extras/contributed/report_tool/reportengine/u_imprime.pas index 87b304e1..9f706924 100644 --- a/extras/contributed/report_tool/reportengine/u_imprime.pas +++ b/extras/contributed/report_tool/reportengine/u_imprime.pas @@ -413,8 +413,6 @@ type end; var - Imprime: T_Imprime; - Infos: record Titre: string; Auteur: string; @@ -444,7 +442,6 @@ uses const PPI= 72; InchToMM= 25.4; - Cent= 100; function T_Imprime.Dim2Pixels(Value: Single): Single; begin @@ -712,48 +709,6 @@ with F_Visu do end; end; -procedure LibereCommandesPages(ACommandes: PPage); -var - Cpt: Integer; -begin -with T_Page(ACommandes) do - if Commandes.Count> 0 - then - begin - for Cpt:= 0 to Pred(Commandes.Count) do - T_Commande(Commandes[Cpt]).Free; - Commandes.Free; - end; -end; - -procedure LiberePages(APageSect: PSection); -var - Cpt: Integer; -begin -with T_Section(APageSect) do - if Pages.Count> 0 - then - begin - for Cpt:= 0 to Pred(Pages.Count) do - LibereCommandesPages(Pages[Cpt]); - Pages.Free; - end; -end; - -procedure LibereColonnes(AColSect: PSection); -var - Cpt: Integer; -begin -with T_Section(AColSect) do - if Colonnes.Count> 0 - then - begin - for Cpt:= 0 to Pred(Colonnes.Count) do - T_Colonne(Colonnes[Cpt]).Free; - Colonnes.Free; - end; -end; - procedure T_Imprime.ImprimePage(PageNumero: Integer); var CptSect,CptPage,CptCmd: Integer; @@ -2140,13 +2095,8 @@ var begin if Sections.Count> 0 then - begin for Cpt:= 0 to Pred(Sections.Count) do - begin - LiberePages(Sections[Cpt]); - LibereColonnes(Sections[Cpt]); - end; - end; + T_Section(Sections[Cpt]).Free; Sections.Free; if Fontes.Count> 0 then @@ -2736,8 +2686,6 @@ then end; procedure T_Imprime.FinGroupe(SautPage: Boolean= False); -var - Cpt: Integer; begin T_Section(Sections[Pred(Sections.Count)]).LoadCmdGroupeToPage; FGroupe:= False; -- cgit v1.2.3-70-g09d2