paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 21:19:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport, cleanup and fix memleak by Javier Villarroya, issue #16038

Browse Source 
git-svn-id: trunk@24106 -
This commit is contained in:
jesus 2010-03-20 04:13:20 +00:00
parent 95c4d44c8d
commit 6a78f28957
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/lazreport/source/lr_class.pas
View File

@ -15,11 +15,10 @@ interface
{$I LR_Vers.inc} {$I LR_Vers.inc}
uses uses
SysUtils, Classes, MaskUtils, Controls, FileUtil, SysUtils, Classes, MaskUtils, Controls, FileUtil, Forms, ComCtrls, Dialogs,
Forms, ComCtrls, Dialogs, Menus, Menus, Variants, DB, Graphics, Printers, osPrinters, XMLConf, LCLType, LCLIntf,
Variants, DB,Graphics,Printers,osPrinters,XMLConf, TypInfo, LCLProc,{$IFDEF UNIX}SysUtilsAdds,{$ENDIF} LR_View, LR_Pars, LR_Intrp,
LCLType,LCLIntf,TypInfo,LCLProc, SysUtilsAdds, LR_DSet, LR_DBSet, LR_DBRel, LR_Const;
LR_View, LR_Pars, LR_Intrp, LR_DSet, LR_DBSet, LR_DBRel, LR_Const;
const const
// object flags // object flags
@ -2453,7 +2452,6 @@ type
const const
gl:string='ÀŨÈÎÓÛÝÞßàåèîóûýþ'; gl:string='ÀŨÈÎÓÛÝÞßàåèîóûýþ';
r_sogl:string='ÚÜúü'; r_sogl:string='ÚÜúü';
spaces: set of Char = [' ', '.', ',', '-'];
function BreakWord(s: string): TWordBreaks; function BreakWord(s: string): TWordBreaks;
@ -2703,9 +2701,6 @@ begin
OutMemo; OutMemo;
end; end;
var
DxArray: Array[0..2047] of Integer;
procedure TfrMemoView.ShowMemo; procedure TfrMemoView.ShowMemo;
var var
DR : TRect; DR : TRect;
@ -4247,7 +4242,10 @@ begin
// todo: TBlobField.AssignTo is not implemented yet // todo: TBlobField.AssignTo is not implemented yet
s := TDataset(FDataset).CreateBlobStream(TField(b),bmRead); s := TDataset(FDataset).CreateBlobStream(TField(b),bmRead);
if s.Size = 0 then if s.Size = 0 then
Picture.Clear begin
Picture.Clear;
s.Free;
end
else else
begin begin
try try
@ -8893,7 +8891,7 @@ end;
function TfrReport.FindObject(const aName: String): TfrObject; function TfrReport.FindObject(const aName: String): TfrObject;
var var
i, j: Integer; i: Integer;
begin begin
Result := nil; Result := nil;
for i := 0 to Pages.Count - 1 do for i := 0 to Pages.Count - 1 do
@ -9008,7 +9006,6 @@ function TfrExportFilter.AddData(x, y: Integer; view: TfrView):pointer;
var var
p: PfrTextRec; p: PfrTextRec;
s: string; s: string;
i: Integer;
begin begin
result := nil; result := nil;
@ -9806,7 +9803,6 @@ begin
end; end;
procedure TfrObject.SetName(const AValue: string); procedure TfrObject.SetName(const AValue: string);
var i : Integer;
begin begin
if fName=AValue then exit; if fName=AValue then exit;
@ -10061,7 +10057,6 @@ begin
end; end;
procedure TfrPageDialog.InitReport; procedure TfrPageDialog.InitReport;
var i : Integer;
begin begin
//inherited InitReport; //inherited InitReport;
fHasVisibleControls:=False; fHasVisibleControls:=False;