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

fpspreadsheet: Fix merged ranges sometimes being read incorrectly from ods files.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6032 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-10-04 17:19:53 +00:00
parent 709be76b4f
commit ea22d330d4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3585,7 +3585,7 @@ var
if nodeName = 'table:covered-table-cell' then
begin
s := GetAttrValue(cellNode, 'table:number-columns-repeated');
if s = '' then colsRepeated := 1;
if s = '' then colsRepeated := 1 else colsRepeated := StrToInt(s);
end else
colsRepeated := 0;

2
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@@ -4419,7 +4419,7 @@ begin
end;
end;
// Here begins the drawing loop of all cells in the row between gc and gclast
// Here begins the drawing loop of all cells in the row between gc and gcLast
while (gc <= gcLast) do begin
gr := ARow;
rct := AClipRect;