diff options
author | David Tardon <dtardon@redhat.com> | 2014-10-16 15:30:32 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-10-16 17:44:44 +0200 |
commit | 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e (patch) | |
tree | 80c42b34da7e7ee05843b572f7311b3c230de9dd /starmath/inc/utility.hxx | |
parent | ada4862afc3227b04c12960ded761db24f61257e (diff) |
fdo#84854 it seems long is not enough on 32 bit
Fraction used BigInt internally for computations, rational does nothing
like that.
Change-Id: I3e9b25074f979bc291208f7c6362c3c40eb77ff5
Diffstat (limited to 'starmath/inc/utility.hxx')
-rw-r--r-- | starmath/inc/utility.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 8cb9254004f8..4ef2b9ffa610 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -41,27 +41,27 @@ inline long SmPtsTo100th_mm(long nNumPts) } -inline long SmPtsTo100th_mm(const boost::rational<long> &rNumPts) - // as above but with argument 'rNumPts' as 'boost::rational<long>' +inline long SmPtsTo100th_mm(const boost::rational<sal_Int64> &rNumPts) + // as above but with argument 'rNumPts' as 'boost::rational<sal_Int64>' { - boost::rational<long> aTmp (254000L, 7227L); + boost::rational<sal_Int64> aTmp (254000L, 7227L); return boost::rational_cast<long>(aTmp * rNumPts); } -inline boost::rational<long> Sm100th_mmToPts(long nNum100th_mm) +inline boost::rational<sal_Int64> Sm100th_mmToPts(long nNum100th_mm) // returns the length (in points) that corresponds to the length // 'nNum100th_mm' (in 100th of mm). { SAL_WARN_IF( nNum100th_mm < 0, "starmath", "Ooops..." ); - boost::rational<long> aTmp (7227L, 254000L); - return aTmp *= boost::rational<long>(nNum100th_mm); + boost::rational<sal_Int64> aTmp (7227L, 254000L); + return aTmp *= boost::rational<sal_Int64>(nNum100th_mm); } -inline long SmRoundFraction(const boost::rational<long> &rFrac) +inline long SmRoundFraction(const boost::rational<sal_Int64> &rFrac) { - SAL_WARN_IF( rFrac <= boost::rational<long>(), "starmath", "Ooops..." ); + SAL_WARN_IF( rFrac <= boost::rational<sal_Int64>(), "starmath", "Ooops..." ); return (rFrac.numerator() + rFrac.denominator() / 2) / rFrac.denominator(); } @@ -109,7 +109,7 @@ public: SmFace & operator = (const SmFace &rFace); }; -SmFace & operator *= (SmFace &rFace, const boost::rational<long> &rFrac); +SmFace & operator *= (SmFace &rFace, const boost::rational<sal_Int64> &rFrac); |