Fraction: Revert "fdo#84854 it seems long is not enough on 32 bit"

This reverts commit 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e.

Conflicts:

svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx

Change-Id: I80abc7abdeddc267eaabc9f8ab49611bb3f8ae83

3 files changed, 16 insertions, 16 deletions

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 10bd3eb9c22a..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 boost::rational<sal_Int64> &rRelSize, sal_uInt16 nType);
-            void SetSize(const boost::rational<sal_Int64> &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;
-    boost::rational<sal_Int64>    aFontSize;
+    boost::rational<long>    aFontSize;
 
 public:
     SmFontNode(const SmToken &rNodeToken)
     :   SmStructureNode(NFONT, rNodeToken)
     {
         nSizeType = FNTSIZ_MULTIPLY;
-        aFontSize = boost::rational<sal_Int64>(1L);
+        aFontSize = boost::rational<long>(1L);
     }
 
-    void SetSizeParameter(const boost::rational<sal_Int64> &rValue, sal_uInt16 nType);
-    const boost::rational<sal_Int64> & 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/utility.hxx b/starmath/inc/utility.hxx
index 4ef2b9ffa610..8cb9254004f8 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<sal_Int64> &rNumPts)
-    // as above but with argument 'rNumPts' as 'boost::rational<sal_Int64>'
+inline long SmPtsTo100th_mm(const boost::rational<long> &rNumPts)
+    // as above but with argument 'rNumPts' as 'boost::rational<long>'
 {
-    boost::rational<sal_Int64>  aTmp (254000L, 7227L);
+    boost::rational<long>  aTmp (254000L, 7227L);
     return boost::rational_cast<long>(aTmp * rNumPts);
 }
 
 
-inline boost::rational<sal_Int64> 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..." );
-    boost::rational<sal_Int64>  aTmp (7227L, 254000L);
-    return aTmp *= boost::rational<sal_Int64>(nNum100th_mm);
+    boost::rational<long>  aTmp (7227L, 254000L);
+    return aTmp *= boost::rational<long>(nNum100th_mm);
 }
 
 
-inline long SmRoundFraction(const boost::rational<sal_Int64> &rFrac)
+inline long SmRoundFraction(const boost::rational<long> &rFrac)
 {
-    SAL_WARN_IF( rFrac <= boost::rational<sal_Int64>(), "starmath", "Ooops..." );
+    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 boost::rational<sal_Int64> &rFrac);
+SmFace & operator *= (SmFace &rFace, const boost::rational<long> &rFrac);
 
 
 
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index a9f3bb3a703b..b23572e2d1e9 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -276,7 +276,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 boost::rational<sal_Int64> &rX, const boost::rational<sal_Int64> &rY ) SAL_OVERRIDE;
+    virtual void SetZoomFactor( const boost::rational<long> &rX, const boost::rational<long> &rY ) SAL_OVERRIDE;
 
 public:
     TYPEINFO_OVERRIDE();