2
0
Эх сурвалжийг харах

* Clear needs an argument to clear data or not

git-svn-id: trunk@41569 -
michael 6 жил өмнө
parent
commit
2430174213

+ 4 - 3
packages/fcl-report/src/fpreport.pp

@@ -1664,7 +1664,7 @@ type
     destructor  Destroy; override;
     destructor  Destroy; override;
     class function ReportKindToResultType(const AType: TFPReportFieldKind): TResultType;
     class function ReportKindToResultType(const AType: TFPReportFieldKind): TResultType;
     Function StreamToReportElements(aStream : TStream) : TFPObjectList;
     Function StreamToReportElements(aStream : TStream) : TFPObjectList;
-    Procedure Clear;
+    Procedure Clear(ClearData : Boolean = True);
     Procedure SaveDataToNames;
     Procedure SaveDataToNames;
     Procedure RestoreDataFromNames;
     Procedure RestoreDataFromNames;
     procedure WriteElement(AWriter: TFPReportStreamer; AOriginal: TFPReportElement = nil); override;
     procedure WriteElement(AWriter: TFPReportStreamer; AOriginal: TFPReportElement = nil); override;
@@ -8520,7 +8520,7 @@ begin
   inherited Destroy;
   inherited Destroy;
 end;
 end;
 
 
-procedure TFPCustomReport.Clear;
+procedure TFPCustomReport.Clear(ClearData : Boolean = True);
 
 
 Var
 Var
   P : TFPReportCustomPage;
   P : TFPReportCustomPage;
@@ -8535,7 +8535,8 @@ begin
   FIsFirstPass := False;
   FIsFirstPass := False;
   // Collections
   // Collections
   FreeAndNil(FExpr); // Special case, recreated on run
   FreeAndNil(FExpr); // Special case, recreated on run
-  FReportData.Clear;
+  if ClearData then
+    FReportData.Clear;
   if Assigned(FPages) then
   if Assigned(FPages) then
     begin
     begin
     While PageCount>0 do
     While PageCount>0 do