pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix memory leaks

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9041 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-11-23 22:13:52 +00:00
parent cb2cb5ef60
commit c86abab97c
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/fpspreadsheet/examples/other/chart/barchart_write_demo.lpr
View File

@ -51,8 +51,8 @@ begin
ser.SetLabelRange(3, 0, 10, 0);
ser.SetYRange(3, 1, 10, 1);
ser.Line.Color := scDarkRed;
ser.Fill.Style := cfsHatched;
ser.Fill.Hatch := ch.Hatches.AddHatch('Crossed', chsDouble, scDarkRed, 2, 45, true);
ser.Fill.Style := cfsSolidHatched;
ser.Fill.Hatch := ch.Hatches.AddHatch('Crossed', chsDouble, scDarkRed, 2, 45);
ser.Fill.Color := scRed;
// Add 2nd bar series ("Student 2")
@ -61,8 +61,8 @@ begin
ser.SetLabelRange(3, 0, 10, 0);
ser.SetYRange(3, 2, 10, 2);
ser.Line.Color := scDarkBlue;
ser.Fill.Style := cfsHatched;
ser.Fill.Hatch := ch.Hatches.AddHatch('Forward', chsSingle, scWhite, 1.5, 45, true);
ser.Fill.Style := cfsSolidHatched;
ser.Fill.Hatch := ch.Hatches.AddHatch('Forward', chsSingle, scWhite, 1.5, 45);
ser.Fill.Color := scBlue;
{

3
components/fpspreadsheet/examples/other/chart/read_chart_demo.lpr
View File

@ -112,8 +112,7 @@ begin
GetEnumName(TypeInfo(TsChartHatchStyle), ord(chart.Hatches[j].Style)), ' ',
'LineColor:', IntToHex(chart.Hatches[j].LineColor, 6), ' ',
'Distance:', chart.Hatches[j].LineDistance:0:0, 'mm ',
'Angle:', chart.Hatches[j].LineAngle:0:0, 'deg ',
'Filled:', chart.Hatches[j].Filled);
'Angle:', chart.Hatches[j].LineAngle:0:0, 'deg ');
WriteLn (' GRADIENT STYLES: ');
for j := 0 to chart.Gradients.Count-1 do

4
components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas
View File

@ -35,9 +35,9 @@ implementation
{$R *.lfm}
const
// FILE_NAME = '../../../other/chart/bars.ods';
FILE_NAME = '../../../other/chart/bars.ods';
// FILE_NAME = '../../../other/chart/area.ods';
FILE_NAME = '../../../other/chart/area-sameImg.ods';
// FILE_NAME = '../../../other/chart/area-sameImg.ods';
// FILE_NAME = '../../../other/chart/pie.ods';
// FILE_NAME = '../../../other/chart/scatter.ods';
// FILE_NAME = '../../../other/chart/regression.ods';

6
components/fpspreadsheet/source/common/fpschart.pas
View File

@ -495,7 +495,7 @@ type
property Regression: TsChartRegression read FRegression write FRegression;
end;
TsChartSeriesList = class(TFPList)
TsChartSeriesList = class(TFPObjectList)
private
function GetItem(AIndex: Integer): TsChartSeries;
procedure SetItem(AIndex: Integer; AValue: TsChartSeries);
@ -1169,7 +1169,6 @@ begin
FLine.Width := PtsToMM(DEFAULT_CHART_LINEWIDTH);
FLine.Color := DEFAULT_SERIES_COLORS[idx mod Length(DEFAULT_SERIES_COLORS)];
FLabelFont := TsFont.Create;
FLabelFont := TsFont.Create;
FLabelFont.Size := 9;
@ -1557,6 +1556,7 @@ end;
constructor TsChartRegression.Create;
begin
inherited Create;
Line := TsChartLine.Create;
Line.Style := clsSolid;
Line.Width := PtsToMM(DEFAULT_CHART_LINEWIDTH);
@ -1567,6 +1567,7 @@ end;
destructor TsChartRegression.Destroy;
begin
Equation.Free;
Line.Free;
inherited;
end;
@ -1664,6 +1665,7 @@ destructor TsChart.Destroy;
begin
FSeriesList.Free;
FXAxis.Free;
FX2Axis.Free;
FYAxis.Free;
FY2Axis.Free;
FLegend.Free;

2
components/fpspreadsheet/source/common/fpsopendocumentchart.pas
View File

@ -2132,7 +2132,7 @@ begin
end;
if (AChart.Series.Count > 0) and (AChart.Series[0] is TsPieSeries) then
startAngleStr := Format('chart:angle-offset="%.0f" ', [TsPieSeries(AChart.Series[0]).StartAngle]);
startAngleStr := Format('chart:angle-offset="%d" ', [TsPieSeries(AChart.Series[0]).StartAngle]);
case AChart.Interpolation of
ciLinear: ;