paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 09:30:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Properly reset aggregates between runs (bug ID 33357)

Browse Source 
git-svn-id: trunk@38459 -
This commit is contained in:
michael 2018-03-08 17:05:54 +00:00
parent 98b48ccded
commit 1b023f0697
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1453,6 +1453,7 @@ type
procedure SetV(aIndex : Integer; AValue: TFPReportVariable);
Protected
public
Procedure ReleaseExpressionNodes;
procedure PrepareExpressionValues;
Function IndexOfVariable(aName : String) : Integer;
Function FindVariable(aName : String) : TFPReportVariable;
@ -2777,6 +2778,14 @@ begin
Items[aIndex]:=AValue;
end;
procedure TFPReportVariables.ReleaseExpressionNodes;
var
i: Integer;
begin
for i:=0 to Count-1 do
GetV(i).ReleaseExpressionNodes;
end;
procedure TFPReportVariables.PrepareExpressionValues;
var
i: Integer;
@ -2968,6 +2977,8 @@ procedure TFPReportVariable.ReleaseExpressionNodes;
begin
FreeAndNil(FExpressionNode);
FreeAndNil(FResetValueExpressionNode);
FResetValue:='';
FResetValueExpression:='';
end;
function TFPReportVariable.GetValue: String;
@ -8108,6 +8119,7 @@ end;
procedure TFPCustomReport.ClearPreparedReport;
begin
EmptyRTObjects;
FVariables.ReleaseExpressionNodes;
end;
function TFPCustomReport.Prepared: Boolean;