paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FPSpreadsheet: Fix ods crashing when a series has no title.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9440 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-09-15 20:49:59 +00:00
parent 869788e744
commit 1e765d0178
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@ -9314,12 +9314,15 @@ begin
series.YRange.Row2, series.YRange.Col2,
rfAllRel, false
);
titleAddr := GetSheetCellRangeString_ODS(
sheet.Name, sheet.Name,
series.TitleAddr.row, series.TitleAddr.Col,
series.TitleAddr.row, series.TitleAddr.Col,
rfAllRel, false
);
if series.TitleAddr.IsUsed then
titleAddr := GetSheetCellRangeString_ODS(
sheet.Name, sheet.Name,
series.TitleAddr.row, series.TitleAddr.Col,
series.TitleAddr.row, series.TitleAddr.Col,
rfAllRel, false
)
else
titleAddr := '';
xml := Format(
'<draw:frame draw:z-index="%d" ' +

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

@ -3926,12 +3926,15 @@ begin
end;
// And this is the title of the series for the legend
titleAddr := GetSheetCellRangeString_ODS(
series.TitleAddr.GetSheetName, series.TitleAddr.GetSheetName,
series.TitleAddr.Row, series.TitleAddr.Col,
series.TitleAddr.Row, series.TitleAddr.Col,
rfAllRel, false
);
if series.TitleAddr.IsUsed then
titleAddr := GetSheetCellRangeString_ODS(
series.TitleAddr.GetSheetName, series.TitleAddr.GetSheetName,
series.TitleAddr.Row, series.TitleAddr.Col,
series.TitleAddr.Row, series.TitleAddr.Col,
rfAllRel, false
)
else
titleAddr := '';
// Number of data points
if series.YValuesInCol then