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

fpspreadsheet: Fix formula parser error in binary math operations of cell references (incorrect usage of integer instead of floating point values).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4110 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-05-03 20:07:35 +00:00
parent dfa4df2c1e
commit f2f610ffbd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/fpspreadsheet/fpsexprparser.pas
View File

@ -3325,8 +3325,8 @@ begin
exit;
end;
if (Result.ResultType in [rtInteger, rtCell, rtEmpty]) and
(RRes.ResultType in [rtInteger, rtCell, rtEmpty])
if (Result.ResultType in [rtInteger, {rtCell, }rtEmpty]) and
(RRes.ResultType in [rtInteger, {rtCell, }rtEmpty])
then
Result := IntegerResult(ArgToInt(Result) + ArgToInt(RRes))
else
@ -3368,8 +3368,8 @@ begin
exit;
end;
if (Result.ResultType in [rtInteger, rtCell, rtEmpty]) and
(RRes.ResultType in [rtInteger, rtCell, rtEmpty])
if (Result.ResultType in [rtInteger, {rtCell, }rtEmpty]) and
(RRes.ResultType in [rtInteger, {rtCell, }rtEmpty])
then
Result := IntegerResult(ArgToInt(Result) - ArgToInt(RRes))
else
@ -3411,8 +3411,8 @@ begin
exit;
end;
if (Result.ResultType in [rtInteger, rtCell, rtEmpty]) and
(RRes.ResultType in [rtInteger, rtCell, rtEmpty])
if (Result.ResultType in [rtInteger, {rtCell, }rtEmpty]) and
(RRes.ResultType in [rtInteger, {rtCell, }rtEmpty])
then
Result := IntegerResult(ArgToInt(Result) * ArgToInt(RRes))
else