From 0f79a5ff07e5b392044726b657998561cbe97fda Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 24 Feb 2015 23:02:24 +0100 Subject: tdf#84435: Mod operator does not deal with decimals as described in help Change-Id: I8dbfdf4bb2eceac0b5afbddd3f35e1dcde2db68b Reviewed-on: https://gerrit.libreoffice.org/14611 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- basic/source/comp/exprnode.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index d9b1ccaeed32..53235fb7b511 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -320,9 +320,9 @@ void SbiExprNode::FoldConstants() else if( nl < SbxMINLNG ) err = true, nl = SbxMINLNG; if( nr > SbxMAXLNG ) err = true, nr = SbxMAXLNG; else if( nr < SbxMINLNG ) err = true, nr = SbxMINLNG; - ll = (long) nl; lr = (long) nr; - llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5); - lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5); + ll = static_cast(nl); lr = static_cast(nr); + llMod = static_cast(nl); + lrMod = static_cast(nr); if( err ) { pGen->GetParser()->Error( SbERR_MATH_OVERFLOW ); @@ -387,7 +387,7 @@ void SbiExprNode::FoldConstants() { pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL; bError = true; - } else nVal = llMod % lrMod; + } else nVal = llMod - lrMod * (llMod/lrMod); eType = SbxLONG; break; case AND: nVal = (double) ( ll & lr ); eType = SbxLONG; break; -- cgit v1.2.3