mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-29 14:50:32 +02:00
TAChart: Fix AV after TChart.ClearSeries call (issue #15173)
git-svn-id: trunk@22757 -
This commit is contained in:
parent
aa050e518f
commit
86af12370d
@ -99,10 +99,11 @@ type
|
||||
FList: TFPList;
|
||||
function GetItem(AIndex: Integer): TBasicChartSeries;
|
||||
public
|
||||
function Count: Integer;
|
||||
constructor Create;
|
||||
destructor Destroy; override;
|
||||
|
||||
public
|
||||
procedure Clear;
|
||||
function Count: Integer;
|
||||
public
|
||||
property Items[AIndex: Integer]: TBasicChartSeries read GetItem; default;
|
||||
end;
|
||||
@ -531,7 +532,7 @@ end;
|
||||
|
||||
procedure TChart.ClearSeries;
|
||||
begin
|
||||
FSeries.FList.Clear;
|
||||
FSeries.Clear;
|
||||
Invalidate;
|
||||
end;
|
||||
|
||||
@ -691,6 +692,7 @@ begin
|
||||
i := FSeries.FList.IndexOf(ASeries);
|
||||
if i < 0 then exit;
|
||||
FSeries.FList.Delete(i);
|
||||
ASeries.FChart := nil;
|
||||
Invalidate;
|
||||
end;
|
||||
|
||||
@ -1159,6 +1161,17 @@ end;
|
||||
|
||||
{ TChartSeriesList }
|
||||
|
||||
procedure TChartSeriesList.Clear;
|
||||
var
|
||||
i: Integer;
|
||||
begin
|
||||
for i := 0 to FList.Count - 1 do begin
|
||||
Items[i].FChart := nil;
|
||||
Items[i].Free;
|
||||
end;
|
||||
FList.Clear;
|
||||
end;
|
||||
|
||||
function TChartSeriesList.Count: Integer;
|
||||
begin
|
||||
Result := FList.Count;
|
||||
@ -1170,13 +1183,8 @@ begin
|
||||
end;
|
||||
|
||||
destructor TChartSeriesList.Destroy;
|
||||
var
|
||||
i: Integer;
|
||||
begin
|
||||
for i := 0 to FList.Count - 1 do begin
|
||||
Items[i].FChart := nil;
|
||||
Items[i].Free;
|
||||
end;
|
||||
Clear;
|
||||
FList.Free;
|
||||
inherited Destroy;
|
||||
end;
|
||||
|
Loading…
Reference in New Issue
Block a user