mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#84435: Mod operator does not deal with decimals as described in help

Browse Source 
Change-Id: I8dbfdf4bb2eceac0b5afbddd3f35e1dcde2db68b
Reviewed-on: https://gerrit.libreoffice.org/14611
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Julien Nabet
2015-02-24 23:02:24 +01:00
committed by Eike Rathke
parent 3d69f625fc
commit 0f79a5ff07
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
basic/source/comp/exprnode.cxx
View File

@@ -320,9 +320,9 @@ void SbiExprNode::FoldConstants()
else if( nl < SbxMINLNG ) err = true, nl = SbxMINLNG; else if( nl < SbxMINLNG ) err = true, nl = SbxMINLNG;
if( nr > SbxMAXLNG ) err = true, nr = SbxMAXLNG; if( nr > SbxMAXLNG ) err = true, nr = SbxMAXLNG;
else if( nr < SbxMINLNG ) err = true, nr = SbxMINLNG; else if( nr < SbxMINLNG ) err = true, nr = SbxMINLNG;
ll = (long) nl; lr = (long) nr; ll = static_cast<long>(nl); lr = static_cast<long>(nr);
llMod = (long) (nl < 0 ? nl - 0.5 : nl + 0.5); llMod = static_cast<long>(nl);
lrMod = (long) (nr < 0 ? nr - 0.5 : nr + 0.5); lrMod = static_cast<long>(nr);
if( err ) if( err )
{ {
pGen->GetParser()->Error( SbERR_MATH_OVERFLOW ); pGen->GetParser()->Error( SbERR_MATH_OVERFLOW );
@@ -387,7 +387,7 @@ void SbiExprNode::FoldConstants()
{ {
pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL; pGen->GetParser()->Error( SbERR_ZERODIV ); nVal = HUGE_VAL;
bError = true; bError = true;
} else nVal = llMod % lrMod; } else nVal = llMod - lrMod * (llMod/lrMod);
eType = SbxLONG; break; eType = SbxLONG; break;
case AND: case AND:
nVal = (double) ( ll & lr ); eType = SbxLONG; break; nVal = (double) ( ll & lr ); eType = SbxLONG; break;