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>

4 files changed, 20 insertions, 20 deletions

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 220e30d2ffc9..93ed6210fcb4 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -134,8 +134,8 @@ public:
                   SmFace & GetFont()       { return aFace; };
 
             void SetFont(const SmFace &rFace);
-            void SetFontSize(const Fraction &rRelSize, sal_uInt16 nType);
-            void SetSize(const Fraction &rScale);
+            void SetFontSize(const boost::rational<long> &rRelSize, sal_uInt16 nType);
+            void SetSize(const boost::rational<long> &rScale);
 
     virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
     virtual void PrepareAttributes();
@@ -1240,18 +1240,18 @@ public:
 class SmFontNode : public SmStructureNode
 {
     sal_uInt16      nSizeType;
-    Fraction    aFontSize;
+    boost::rational<long>    aFontSize;
 
 public:
     SmFontNode(const SmToken &rNodeToken)
     :   SmStructureNode(NFONT, rNodeToken)
     {
         nSizeType = FNTSIZ_MULTIPLY;
-        aFontSize = Fraction(1L);
+        aFontSize = boost::rational<long>(1L);
     }
 
-    void SetSizeParameter(const Fraction &rValue, sal_uInt16 nType);
-    const Fraction & GetSizeParameter() const {return aFontSize;}
+    void SetSizeParameter(const boost::rational<long> &rValue, sal_uInt16 nType);
+    const boost::rational<long> & GetSizeParameter() const {return aFontSize;}
     const sal_uInt16& GetSizeType() const {return nSizeType;}
 
     virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell) SAL_OVERRIDE;
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index 0f75800fa407..db4b7509f2f4 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -162,7 +162,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/color.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/fract.hxx>
+#include <tools/rational.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
 #include <tools/mapunit.hxx>
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);
 
 
 
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 6b7939e99076..215ac5479025 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -272,7 +272,7 @@ protected:
     virtual void InnerResizePixel(const Point &rOfs, const Size  &rSize) SAL_OVERRIDE;
     virtual void OuterResizePixel(const Point &rOfs, const Size  &rSize) SAL_OVERRIDE;
     virtual void QueryObjAreaPixel( Rectangle& rRect ) const SAL_OVERRIDE;
-    virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ) SAL_OVERRIDE;
+    virtual void SetZoomFactor( const boost::rational<long> &rX, const boost::rational<long> &rY ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();