[prev in list] [next in list] [prev in thread] [next in thread] 

List:       koffice
Subject:    Re: ROUNDUP in kspread
From:       Hasso Tepper <hasso () estpak ! ee>
Date:       2001-07-31 19:42:35
[Download RAW message or body]

Hasso Tepper wrote:
Sry, patch wasn't correct. It fixed roundup(7)=8 but didn't fix 
roundup(7,2;1)=7,3.

This one should be better.

regards,

-- 
Hasso Tepper
KDE Estonian Team
["roundup.patch" (text/x-diff)]

Index: kspread_interpreter.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_interpreter.cc,v
retrieving revision 1.95
diff -u -3 -p -r1.95 kspread_interpreter.cc
--- kspread_interpreter.cc	2001/07/02 19:08:19	1.95
+++ kspread_interpreter.cc	2001/07/31 19:40:33
@@ -2537,9 +2537,13 @@ static bool kspreadfunc_roundup( KSConte
                 return false;
         digits=args[1]->intValue();
         }
-
-  result=floor(args[0]->doubleValue()*pow(10,digits)+1)/pow(10,digits);
-  context.setValue( new KSValue( result) );
+	
+	if (floor(args[0]->doubleValue()*10*digits) == args[0]->doubleValue()*10*digits) 
+		result = args[0]->doubleValue();
+	else 
+		result=floor(args[0]->doubleValue()*pow(10,digits)+1)/pow(10,digits);
+  
+	context.setValue( new KSValue( result) );
 
   return true;
 }


[prev in list] [next in list] [prev in thread] [next in thread]