From 7f09efa7de5120f429d20a1b2ec2805e229f22c3 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Fri, 10 Aug 2018 08:15:18 +0000 Subject: [PATCH] fpspreadsheet: Fix xls reader rejecting formulas with embedded line-break tokens. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6580 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/fpspreadsheet/source/common/xlscommon.pas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/fpspreadsheet/source/common/xlscommon.pas b/components/fpspreadsheet/source/common/xlscommon.pas index f3482ad31..4ee2a1dd0 100644 --- a/components/fpspreadsheet/source/common/xlscommon.pas +++ b/components/fpspreadsheet/source/common/xlscommon.pas @@ -2533,7 +2533,8 @@ begin $01: AStream.ReadWord; // tAttrVolatile token, data not used $02: AStream.ReadWord; // tAttrIf token, data not used $08: AStream.ReadWord; // tAttrSkip token, data not used - $10: AStream.ReadWord; // tAttrSum token, data not used + $40: AStream.ReadWord; // tAttrSum token, data not used + $49: AStream.ReadWord; // tAttrSpace, data not used else exit; // others not supported by fps --> Result = false end; Result := true; @@ -2945,7 +2946,7 @@ begin supported := ReadRPNAttr(AStream, b); if supported then begin case b of - $02: ; + $02: ; // IF parameter tag $10: rpnItem := RPNFunc('SUM', 1, rpnItem); // one-parameter SUM end; end;