paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 13:06:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Implement clear for report (bug ID 33286)

Browse Source 
git-svn-id: trunk@38399 -
This commit is contained in:
michael 2018-03-03 11:41:55 +00:00
parent cf07d30bfd
commit 18d7b29b2f
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/fcl-report/src/fpreport.pp
View File

@ -1531,16 +1531,17 @@ type
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
Procedure SaveDataToNames; Procedure Clear;
Procedure RestoreDataFromNames; Procedure SaveDataToNames;
procedure WriteElement(AWriter: TFPReportStreamer; AOriginal: TFPReportElement = nil); override; Procedure RestoreDataFromNames;
procedure ReadElement(AReader: TFPReportStreamer); override; procedure WriteElement(AWriter: TFPReportStreamer; AOriginal: TFPReportElement = nil); override;
procedure AddPage(APage: TFPReportCustomPage); procedure ReadElement(AReader: TFPReportStreamer); override;
procedure RemovePage(APage: TFPReportCustomPage); procedure AddPage(APage: TFPReportCustomPage);
function FindRecursive(const AName: string): TFPReportElement; procedure RemovePage(APage: TFPReportCustomPage);
procedure RunReport; function FindRecursive(const AName: string): TFPReportElement;
Procedure ClearPreparedReport; virtual; procedure RunReport;
Function Prepared : Boolean; Procedure ClearPreparedReport; virtual;
Function Prepared : Boolean;
Procedure StartDesigning; virtual; Procedure StartDesigning; virtual;
Procedure EndDesigning; virtual; Procedure EndDesigning; virtual;
procedure RenderReport(const AExporter: TFPReportExporter); procedure RenderReport(const AExporter: TFPReportExporter);
@ -7506,6 +7507,25 @@ begin
inherited Destroy; inherited Destroy;
end; end;
procedure TFPCustomReport.Clear;
begin
// Variables
FRTCurPageIdx := -1;
FDateCreated := Now;
FTwoPass := False;
FIsFirstPass := False;
// Collections
FreeAndNil(FExpr); // Special case, recreated on run
FReportData.Clear;
While FPages.Count>0 do
RemovePage(Pages[FPages.Count-1]);
FPages.Clear;
ClearReferenceList;
FImages.Clear;
FVariables.Clear;
end;
procedure TFPCustomReport.SaveDataToNames; procedure TFPCustomReport.SaveDataToNames;
Var Var