diff options
Diffstat (limited to 'scaddins')
| -rw-r--r-- | scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl | 2 | ||||
| -rw-r--r-- | scaddins/source/analysis/analysis.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl index e349284e97a2..4622f2acefb6 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl @@ -109,6 +109,8 @@ module addin raises( com::sun::star::lang::IllegalArgumentException ); // randbetween. + // Min is the smallest value randbetween will return + // Max is the largest value randbetween will return double getRandbetween( [in] double Min, [in] double Max ) raises( com::sun::star::lang::IllegalArgumentException ); diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 6349b7b27247..d1751f4fac40 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -22,6 +22,7 @@ #include "bessel.hxx" #include <cppuhelper/factory.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/random.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> @@ -30,6 +31,7 @@ #include <string.h> #include <tools/resmgr.hxx> #include <tools/rcid.h> +#include <boost/math/special_functions/next.hpp> #define ADDIN_SERVICE "com.sun.star.sheet.AddIn" #define MY_SERVICE "com.sun.star.sheet.addin.Analysis" @@ -700,12 +702,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw( if( fMin > fMax ) throw lang::IllegalArgumentException(); - // fMax -> range - double fRet = fMax - fMin + 1.0; - fRet *= rand(); - fRet /= (RAND_MAX + 1.0); - fRet += fMin; - fRet = floor( fRet ); // simple floor is sufficient here + double fRet = comphelper::rng::uniform_real_distribution(fMin, boost::math::nextafter(fMax, DBL_MAX)); RETURN_FINITE( fRet ); } |