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

fpspreadsheet: Fix csv writer to no longer skip non-existent cells.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4676 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-06-03 14:00:45 +00:00
parent cd66ccd8a9
commit 28e2ae0453
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/fpspreadsheet/fpscsv.pas
View File

@ -376,9 +376,9 @@ end;
procedure TsCSVWriter.WriteSheet(AStream: TStream; AWorksheet: TsWorksheet); procedure TsCSVWriter.WriteSheet(AStream: TStream; AWorksheet: TsWorksheet);
var var
r: Cardinal; r, c: Cardinal;
firstRow: Cardinal; firstRow, lastRow: Cardinal;
lastRow: Cardinal; firstCol, lastCol: Cardinal;
cell: PCell; cell: PCell;
n: Integer; n: Integer;
begin begin
@ -399,13 +399,26 @@ begin
end else end else
begin begin
if FClipboardMode then if FClipboardMode then
firstRow := FWorksheet.GetFirstRowIndex else begin
firstRow := FWorksheet.GetFirstRowIndex;
firstCol := FWorksheet.GetFirstColIndex;
end else
begin
firstRow := 0; firstRow := 0;
firstCol := 0;
end;
lastRow := FWorksheet.GetLastOccupiedRowIndex; lastRow := FWorksheet.GetLastOccupiedRowIndex;
lastCol := FWorksheet.GetLastOccupiedColIndex;
for r := firstRow to lastRow do for r := firstRow to lastRow do
begin begin
for cell in FWorksheet.Cells.GetRowEnumerator(r) do for c := firstCol to lastCol do
WriteCellToStream(AStream, cell); begin
cell := FWorksheet.FindCell(r, c);
if cell = nil then
FCSVBuilder.AppendCell('')
else
WriteCellToStream(AStream, cell);
end;
FCSVBuilder.AppendRow; FCSVBuilder.AppendRow;
end; end;
end; end;