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

fpspreadsheet: Fix formula ROUND() if second argument is a cell reference.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6533 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-06-26 14:21:45 +00:00
parent c721b9d5a4
commit d6b6154fff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/fpspreadsheet/source/common/fpsfunc.pas
View File

@@ -309,13 +309,13 @@ end;
procedure fpsROUND(var Result: TsExpressionResult; const Args: TsExprParameterArray); procedure fpsROUND(var Result: TsExpressionResult; const Args: TsExprParameterArray);
var var
x: Double;
n: Integer; n: Integer;
begin begin
if Args[1].ResultType = rtInteger then x := ArgToFloat(Args[0]);
n := Args[1].ResInteger n := Round(ArgToFloat(Args[1]));
else Result := FloatResult(RoundTo(x, -n));
n := round(Args[1].ResFloat); // -n because fpc and Excel have different conventions regarding the sign
Result := FloatResult(RoundTo(ArgToFloat(Args[0]), -n));
end; end;
procedure fpsSIGN(var Result: TsExpressionResult; const Args: TsExprParameterArray); procedure fpsSIGN(var Result: TsExpressionResult; const Args: TsExprParameterArray);