summaryrefslogtreecommitdiff
path: root/starmath/inc/utility.hxx
diff options
context:
space:
mode:
authorJuan Picca <jumapico@gmail.com>2014-09-19 14:19:30 -0300
committerDavid Tardon <dtardon@redhat.com>2014-10-09 11:33:33 +0000
commit47a2d7642d249d70b5da0c330a73f3a0032e4bba (patch)
tree202b04810382ea87cf8015a7b4de29e931408948 /starmath/inc/utility.hxx
parentae77dc81c33ab0817264bcf5fc8bb71a55b78a73 (diff)
fdo#81356: convert Fraction to boost::rational<long> - wip
* Added rational util functions used by Fraction class not available in the boost::rational class. * Replaced usage of Fraction by boost::rational<long> * Removed code that relies on: 1. fraction.IsValid() -- rational only allow valid values, ie denominator() != 0 2. rational.denominator() == 0 -- always false 3. rational.denominator() < 0 -- always false but implementation detail: http://www.boost.org/doc/libs/release/libs/rational/rational.html#Internal%20representation * Simplified code that relies on: 1. rational.denominator() != 0 -- always true * BUGS EXIST because Fraction allows the creation of invalid values but boost::rational throws the exception boost::bad_rational Change-Id: I84970a4956afb3f91ac0c8f726547466319420f9 Reviewed-on: https://gerrit.libreoffice.org/11551 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'starmath/inc/utility.hxx')
-rw-r--r--starmath/inc/utility.hxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 304c10c7e841..8cb9254004f8 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -23,7 +23,7 @@
#include <vcl/fixed.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
-#include <tools/fract.hxx>
+#include <tools/rational.hxx>
#include <deque>
@@ -41,28 +41,28 @@ inline long SmPtsTo100th_mm(long nNumPts)
}
-inline long SmPtsTo100th_mm(const Fraction &rNumPts)
- // as above but with argument 'rNumPts' as 'Fraction'
+inline long SmPtsTo100th_mm(const boost::rational<long> &rNumPts)
+ // as above but with argument 'rNumPts' as 'boost::rational<long>'
{
- Fraction aTmp (254000L, 7227L);
- return aTmp *= rNumPts;
+ boost::rational<long> aTmp (254000L, 7227L);
+ return boost::rational_cast<long>(aTmp * rNumPts);
}
-inline Fraction Sm100th_mmToPts(long nNum100th_mm)
+inline boost::rational<long> 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..." );
- Fraction aTmp (7227L, 254000L);
- return aTmp *= Fraction(nNum100th_mm);
+ boost::rational<long> aTmp (7227L, 254000L);
+ return aTmp *= boost::rational<long>(nNum100th_mm);
}
-inline long SmRoundFraction(const Fraction &rFrac)
+inline long SmRoundFraction(const boost::rational<long> &rFrac)
{
- SAL_WARN_IF( rFrac <= Fraction(), "starmath", "Ooops..." );
- return (rFrac.GetNumerator() + rFrac.GetDenominator() / 2) / rFrac.GetDenominator();
+ SAL_WARN_IF( rFrac <= boost::rational<long>(), "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 Fraction &rFrac);
+SmFace & operator *= (SmFace &rFace, const boost::rational<long> &rFrac);