From c05c5ff9eb5902d59ff0add76dec5a6564f8482c Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 13 Jul 2019 22:13:45 +0000 Subject: [PATCH] fpspreadsheet: Add support for DefaultRowHeight and DefaultColumnWidth to Excel2003xml reader git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7030 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/source/common/xlsxml.pas | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/components/fpspreadsheet/source/common/xlsxml.pas b/components/fpspreadsheet/source/common/xlsxml.pas index 015da2d46..cd3673c57 100644 --- a/components/fpspreadsheet/source/common/xlsxml.pas +++ b/components/fpspreadsheet/source/common/xlsxml.pas @@ -291,11 +291,23 @@ var nodeName: String; s: String; r: Integer; + x: Double; begin r := 0; while ANode <> nil do begin nodeName := ANode.NodeName; if nodeName = 'Row' then begin + // Default column width + s := GetAttrValue(ANode, 'ss:DefaultColumnWidth'); + if (s <> '') and TryStrToFloat(s, x, FPointSeparatorSettings) then + TsWorksheet(AWorksheet).WriteDefaultColWidth(x, suPoints); + + // Default row height + s := GetAttrValue(ANode, 'ss:DefaultRowHeight'); + if (s <> '') and TryStrToFloat(s, x, FPointSeparatorSettings) then + TsWorksheet(AWorksheet).WriteDefaultRowHeight(x, suPoints); + + // Row s := GetAttrValue(ANode, 'ss:Index'); if s <> '' then r := StrToInt(s) - 1; ReadRow(ANode.FirstChild, AWorksheet, r);