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

fpspreadsheet: Fix xlsx reader getting dimension of an empty worksheet incorrectly.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5988 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-07-25 09:40:05 +00:00
parent 05bdb8bb88
commit e688582c1c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/fpspreadsheet/source/common/xlsxooxml.pas
View File

@ -1271,6 +1271,7 @@ procedure TsSpreadOOXMLReader.ReadDimension(ANode: TDOMNode;
var var
ref: String; ref: String;
r1, c1: Cardinal; r1, c1: Cardinal;
ok: Boolean;
begin begin
Unused(AWorksheet); Unused(AWorksheet);
@ -1281,8 +1282,13 @@ begin
exit; exit;
ref := GetAttrValue(ANode, 'ref'); ref := GetAttrValue(ANode, 'ref');
if ref <> '' then if ref <> '' then begin
ParseCellRangeString(ref, r1, c1, FLastRow, FLastCol); // Normally the range of worksheets is specified as, e.g., 'A1:K5'
ok := ParseCellRangeString(ref, r1, c1, FLastRow, FLastCol);
// But for empty worksheets it is specified as only 'A1'
if not ok then
ParseCellString(ref, FLastRow, FLastCol);
end;
end; end;
procedure TsSpreadOOXMLReader.ReadFileVersion(ANode: TDOMNode); procedure TsSpreadOOXMLReader.ReadFileVersion(ANode: TDOMNode);