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

fpspreadsheet: Fix ods writer crashing occasionally due to uninitialized local rowheight variaible.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4577 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-03-19 21:33:01 +00:00
parent a46928c3a3
commit 5b524a1262
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpr
View File

@@ -43,6 +43,7 @@ begin
MyWorksheet.WriteNumber(0, 1, 2.0); // B1 MyWorksheet.WriteNumber(0, 1, 2.0); // B1
MyWorksheet.WriteNumber(0, 2, 3.0); // C1 MyWorksheet.WriteNumber(0, 2, 3.0); // C1
MyWorksheet.WriteNumber(0, 3, 4.0); // D1 MyWorksheet.WriteNumber(0, 3, 4.0); // D1
MyWorksheet.WriteText(4, 2, 'Total:'); // C5 MyWorksheet.WriteText(4, 2, 'Total:'); // C5
MyWorksheet.WriteNumber(4, 3, 10); // D5 MyWorksheet.WriteNumber(4, 3, 10); // D5
MyWorksheet.WriteDateTime(5, 0, now); MyWorksheet.WriteDateTime(5, 0, now);
@@ -281,7 +282,7 @@ begin
MyWorksheet := MyWorkbook.AddWorksheet('My Worksheet 2'); MyWorksheet := MyWorkbook.AddWorksheet('My Worksheet 2');
// Save the spreadsheet to a file // Save the spreadsheet to a file
MyWorkbook.WriteToFile(MyDir + 'test.ods', sfOpenDocument); MyWorkbook.WriteToFile(MyDir + 'test1.ods', sfOpenDocument, true);
MyWorkbook.Free; MyWorkbook.Free;
end. end.

7
components/fpspreadsheet/fpsopendocument.pas
View File

@@ -5257,9 +5257,10 @@ begin
// Look for the row style of the current row (r) // Look for the row style of the current row (r)
row := ASheet.FindRow(r); row := ASheet.FindRow(r);
if row = nil then if row = nil then begin
styleName := 'ro1' styleName := 'ro1';
else h := ASheet.ReadDefaultRowHeight(FWorkbook.Units);
end else
begin begin
styleName := ''; styleName := '';