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

4 files changed, 9 insertions, 9 deletions

diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 5dfd09bc10bb..e1a216d7ae3f 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -140,7 +140,7 @@ public:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> GetDocumentPreview(
                             const std::vector<PreviewPage*>& _rPreviewPages,
-                            const boost::rational<sal_Int64>&  _rScale,
+                            const boost::rational<long>&  _rScale,
                             const SwPageFrm* _pSelectedPageFrm,
                             const Size&      _rPreviewWinSize );
 
@@ -249,7 +249,7 @@ public:
 
     // update preview data (and fire events if necessary)
     void UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages,
-                        const boost::rational<sal_Int64>&  _rScale,
+                        const boost::rational<long>&  _rScale,
                         const SwPageFrm* _pSelectedPageFrm,
                         const Size&      _rPreviewWinSize );
 
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 54783784534e..270f95ab18c2 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -279,12 +279,12 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE;
         virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const;
         virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
-        virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
+        virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
         virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
         virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
         virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
         virtual void Move(const Size& rSiz) SAL_OVERRIDE;
-        virtual void Resize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
+        virtual void Resize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
         virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
         virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
         virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 29c6df60bda5..a9a4fc79c6f3 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwPageFtnInfo
     sal_uLong   nLineWidth;              ///< width of separator line
     editeng::SvxBorderStyle eLineStyle;  ///< Style of the separator line
     Color       aLineColor;              ///< color of the separator line
-    boost::rational<sal_Int64>    aWidth;     ///< percentage width of the separator line.
+    boost::rational<long>    aWidth;     ///< percentage width of the separator line.
     SwFtnAdj    eAdj;                    ///< line adjustment.
     SwTwips     nTopDist;                ///< distance between body and separator.
     SwTwips     nBottomDist;             ///< distance between separator and first footnote
@@ -56,7 +56,7 @@ public:
     sal_uLong           GetLineWidth() const { return nLineWidth; }
     const Color&    GetLineColor() const { return aLineColor;}
     editeng::SvxBorderStyle  GetLineStyle() const { return eLineStyle; }
-    const boost::rational<sal_Int64>& GetWidth() const    { return aWidth; }
+    const boost::rational<long>& GetWidth() const    { return aWidth; }
     SwFtnAdj    GetAdj()    const       { return eAdj; }
     SwTwips     GetTopDist()const       { return nTopDist; }
     SwTwips     GetBottomDist() const   { return nBottomDist; }
@@ -65,7 +65,7 @@ public:
     void SetLineWidth(sal_uLong nSet  )     { nLineWidth = nSet; }
     void SetLineStyle( editeng::SvxBorderStyle eSet )   { eLineStyle = eSet; }
     void SetLineColor(const Color& rCol )  { aLineColor = rCol;}
-    void SetWidth( const boost::rational<sal_Int64> &rNew){ aWidth = rNew; }
+    void SetWidth( const boost::rational<long> &rNew){ aWidth = rNew; }
     void SetAdj   ( SwFtnAdj eNew )     { eAdj = eNew; }
     void SetTopDist   ( SwTwips nNew )  { nTopDist = nNew; }
     void SetBottomDist( SwTwips nNew )  { nBottomDist = nNew; }
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index a3a3b3db0a85..60a55430de1d 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -396,8 +396,8 @@ public:
 
         @return Point, start position for new scale
     */
-    Point GetPreviewStartPosForNewScale( const boost::rational<sal_Int64>& _aNewScale,
-                                         const boost::rational<sal_Int64>& _aOldScale,
+    Point GetPreviewStartPosForNewScale( const boost::rational<long>& _aNewScale,
+                                         const boost::rational<long>& _aOldScale,
                                          const Size&     _aNewWinSize ) const;
 
     /** determines, if page with given page number is visible in preview