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

7 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index da0749cab2c0..8ffedbdf7569 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -408,7 +408,7 @@ protected:
     virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE;
     virtual void    UpdateHRuler() SAL_OVERRIDE;
     virtual void    UpdateVRuler() SAL_OVERRIDE;
-    virtual void    SetZoomFactor(const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY) SAL_OVERRIDE;
+    virtual void    SetZoomFactor(const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY) SAL_OVERRIDE;
 
     void            SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower,
                                bool bSize, bool bMargin, bool bScaleAll );
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 34f988d2328e..b5935aa6d169 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -536,8 +536,8 @@ protected:
     virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE;
     virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE;
 
-    virtual void SetZoomFactor( const boost::rational<sal_Int64>& rZoomX,
-                                const boost::rational<sal_Int64>& rZoomY );
+    virtual void SetZoomFactor( const boost::rational<long>& rZoomX,
+                                const boost::rational<long>& rZoomY );
 
     /**
         This must be called after the ctor, but before anything else.
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 3a49fa8338f5..c744a3d3a085 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -161,8 +161,8 @@ public:
     virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE;
     virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE;
     virtual void SetZoomFactor (
-        const boost::rational<sal_Int64>& rZoomX,
-        const boost::rational<sal_Int64>& rZoomY) SAL_OVERRIDE;
+        const boost::rational<long>& rZoomX,
+        const boost::rational<long>& rZoomY) SAL_OVERRIDE;
     virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE;
     virtual void WriteUserData (OUString&, bool bBrowse = false) SAL_OVERRIDE;
     virtual void ReadUserData (const OUString&, bool bBrowse = false) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index ca27764c1638..2178f829108c 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -61,7 +61,7 @@ class SdDisplay : public Control
 {
 private:
     BitmapEx    aBitmapEx;
-    boost::rational<sal_Int64>    aScale;
+    boost::rational<long>    aScale;
 
 public:
     SdDisplay( vcl::Window* pWin, SdResId Id );
@@ -70,7 +70,7 @@ public:
     virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 
     void    SetBitmapEx( BitmapEx* pBmpEx );
-    void    SetScale( const boost::rational<sal_Int64>& rFrac );
+    void    SetScale( const boost::rational<long>& rFrac );
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 };
@@ -155,7 +155,7 @@ private:
     void            ResetAttrs();
     void            WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime,
                                         SfxProgress* pStbMgr ) const;
-    boost::rational<sal_Int64>        GetScale();
+    boost::rational<long>        GetScale();
 };
 
 /**
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index fba9779cf8ed..f62bf44f3b39 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -64,7 +64,7 @@ private:
 
     const SfxItemSet&   mrOutAttrs;
     XColorListRef       mpColorList;
-    boost::rational<sal_Int64>            maUIScale;
+    boost::rational<long>            maUIScale;
     ::sd::View*         mpView;
 
     DECL_LINK( SelectColorHdl, void * );
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index 1042144b1651..befaa538ceba 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -53,7 +53,7 @@ private:
     long                nXValue;
     long                nYValue;
     FieldUnit           eUIUnit;
-    boost::rational<sal_Int64>            aUIScale;
+    boost::rational<long>            aUIScale;
 
     DECL_LINK( ClickHdl, Button * );
 
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index dee673bc13bb..6107c7ed99a1 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -67,7 +67,7 @@ class SdVectorizeDlg : public ModalDialog
     void                UpdatePreviewMtf();
 
     Rectangle           GetRect( const Size& rDispSize, const Size& rBmpSize ) const;
-    Bitmap              GetPreparedBitmap( Bitmap& rBmp, boost::rational<sal_Int64>& rScale );
+    Bitmap              GetPreparedBitmap( Bitmap& rBmp, boost::rational<long>& rScale );
     void                Calculate( Bitmap& rBmp, GDIMetaFile& rMtf );
     void                AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
                                  long nPosX, long nPosY, long nWidth, long nHeight );