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

fpspreadsheet: Fix usage of empty cells as numeric value 0 in formulas (https://forum.lazarus.freepascal.org/index.php/topic,42396.msg295893.html)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6627 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-08-30 15:06:33 +00:00
parent c2213704c8
commit 02e90b8949
1 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
components/fpspreadsheet/source/common/fpsexprparser.pas
View File

@ -841,6 +841,7 @@ function EmptyResult: TsExpressionResult;
function ErrorResult(const AValue: TsErrorValue): TsExpressionResult; function ErrorResult(const AValue: TsErrorValue): TsExpressionResult;
function FloatResult(const AValue: TsExprFloat): TsExpressionResult; function FloatResult(const AValue: TsExprFloat): TsExpressionResult;
function IntegerResult(const AValue: Integer): TsExpressionResult; function IntegerResult(const AValue: Integer): TsExpressionResult;
function IsBlank(const AValue: TsExpressionResult): Boolean;
function IsInteger(const AValue: TsExpressionResult): Boolean; function IsInteger(const AValue: TsExpressionResult): Boolean;
function IsString(const AValue: TsExpressionResult): Boolean; function IsString(const AValue: TsExpressionResult): Boolean;
function StringResult(const AValue: String): TsExpressionResult; function StringResult(const AValue: String): TsExpressionResult;
@ -3238,7 +3239,11 @@ begin
if HasError(AResult) then if HasError(AResult) then
exit; exit;
if IsString(LRes) and IsString(RRes) then if IsBlank(LRes) then
AResult := BooleanResult(IsBlank(RRes))
else if IsBlank(RRes) then
AResult := BooleanResult(IsBlank(LRes))
else if IsString(LRes) and IsString(RRes) then
AResult := BooleanResult(ArgToString(LRes) = ArgToString(RRes)) AResult := BooleanResult(ArgToString(LRes) = ArgToString(RRes))
else begin else begin
fL := ArgToFloat(LRes); fL := ArgToFloat(LRes);
@ -3302,6 +3307,9 @@ begin
Left.GetNodeValue(LRes); Left.GetNodeValue(LRes);
Right.GetNodeValue(RRes); Right.GetNodeValue(RRes);
if IsBlank(LRes) or IsBlank(RRes) then
AResult := BooleanResult(false)
else
if IsString(LRes) and IsString(RRes) then if IsString(LRes) and IsString(RRes) then
AResult := BooleanResult(ArgToString(LRes) < ArgToString(RRes)) AResult := BooleanResult(ArgToString(LRes) < ArgToString(RRes))
else begin else begin
@ -3342,6 +3350,9 @@ begin
Left.GetNodeValue(LRes); Left.GetNodeValue(LRes);
Right.GetNodeValue(RRes); Right.GetNodeValue(RRes);
if IsBlank(LRes) or IsBlank(RRes) then
AResult := BooleanResult(false)
else
if IsString(LRes) and IsString(RRes) then if IsString(LRes) and IsString(RRes) then
AResult := BooleanResult(ArgToString(LRes) > ArgToString(RRes)) AResult := BooleanResult(ArgToString(LRes) > ArgToString(RRes))
else begin else begin
@ -3382,7 +3393,11 @@ begin
Left.GetNodeValue(LRes); Left.GetNodeValue(LRes);
Right.GetNodeValue(RRes); Right.GetNodeValue(RRes);
if IsString(LRes) and IsString(RRes) then if IsBlank(LRes) then
AResult := BooleanResult(IsBlank(RRes))
else if IsBlank(RRes) then
AResult := BooleanResult(IsBlank(LRes))
else if IsString(LRes) and IsString(RRes) then
AResult := BooleanResult(ArgToString(LRes) >= ArgToString(RRes)) AResult := BooleanResult(ArgToString(LRes) >= ArgToString(RRes))
else begin else begin
fL := ArgToFloat(LRes); fL := ArgToFloat(LRes);
@ -3422,7 +3437,11 @@ begin
Left.GetNodeValue(LRes); Left.GetNodeValue(LRes);
Right.GetNodeValue(RRes); Right.GetNodeValue(RRes);
if IsString(LRes) and IsString(RRes) then if IsBlank(LRes) then
AResult := BooleanResult(IsBlank(RRes))
else if IsBlank(RRes) then
AResult := BooleanResult(IsBlank(LRes))
else if IsString(LRes) and IsString(RRes) then
AResult := BooleanResult(ArgToString(LRes) <= ArgToString(RRes)) AResult := BooleanResult(ArgToString(LRes) <= ArgToString(RRes))
else begin else begin
fL := ArgToFloat(LRes); fL := ArgToFloat(LRes);
@ -4631,6 +4650,26 @@ begin
Result.ResInteger := AValue; Result.ResInteger := AValue;
end; end;
function IsBlank(const AValue: TsExpressionResult): Boolean;
var
cell: PCell;
begin
case AValue.ResultType of
rtString :
Result := (AValue.ResString = '');
rtInteger, rtFloat, rtError:
Result := false;
rtEmpty:
Result := true;
rtCell:
begin
cell := (AValue.Worksheet as TsWorksheet).FindCell(AValue.ResRow, AValue.ResCol);
Result := (cell = nil) or (cell^.ContentType = cctEmpty) or
((cell^.ContentType = cctUTF8String) and (cell^.UTF8StringValue = ''));
end;
end;
end;
function IsInteger(const AValue: TsExpressionResult): Boolean; function IsInteger(const AValue: TsExpressionResult): Boolean;
var var
i: Int64; i: Int64;