From 74f5bf26f5ef6c5e3604ba4a1cce45f3b77baa25 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Tue, 5 Aug 2014 21:49:23 +0000 Subject: [PATCH] fpspreadsheet: Activate virtual reading mode for OOXML reader / fpsspeedtest git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3432 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/examples/fpsspeedtest/mainform.pas | 6 ------ components/fpspreadsheet/xlsxooxml.pas | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas b/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas index 895e753f3..8c1409cf6 100644 --- a/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas +++ b/components/fpspreadsheet/examples/fpsspeedtest/mainform.pas @@ -153,12 +153,6 @@ begin if not CgFormats.Checked[i] then continue; - // Currently no reader support for xlsx, skip test to avoid the exception. - if SPREAD_FORMAT[i] = sfOOXML then begin - Log := Log + ' n/a '; - continue; - end; - FCurFormat := SPREAD_FORMAT[i]; StatusMsg('Reading ' + GetFileFormatName(FCurFormat)); diff --git a/components/fpspreadsheet/xlsxooxml.pas b/components/fpspreadsheet/xlsxooxml.pas index bc64d680c..9dbe66616 100755 --- a/components/fpspreadsheet/xlsxooxml.pas +++ b/components/fpspreadsheet/xlsxooxml.pas @@ -611,6 +611,9 @@ begin raise Exception.Create('unknown error type'); end else raise Exception.Create('Unknown data type'); + + if FIsVirtualMode then + Workbook.OnReadCellData(Workbook, rowIndex, colIndex, cell); end; procedure TsSpreadOOXMLReader.ReadCellXfs(ANode: TDOMNode);