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

2 files changed, 7 insertions, 7 deletions

diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index a724ca43d082..0c7e7bcb7763 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -812,8 +812,8 @@ void SvxCropExample::SetFrameSize( const Size& rSz )
     if(!aFrameSize.Height())
         aFrameSize.Height() = 1;
     Size aWinSize( GetOutputSizePixel() );
-    boost::rational<sal_Int64> aXScale( aWinSize.Width() * 4, aFrameSize.Width() * 5 );
-    boost::rational<sal_Int64> aYScale( aWinSize.Height() * 4, aFrameSize.Height() * 5 );
+    boost::rational<long> aXScale( aWinSize.Width() * 4, aFrameSize.Width() * 5 );
+    boost::rational<long> aYScale( aWinSize.Height() * 4, aFrameSize.Height() * 5 );
 
     if( aYScale < aXScale )
         aXScale = aYScale;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 84789033ea19..5afb6c185e28 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -90,7 +90,7 @@ static void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits,
     rRange = basegfx::B2DRange(aTopLeft, aBottomRight);
 }
 
-static void lcl_ScaleRect(basegfx::B2DRange& rRange, const boost::rational<sal_Int64> aUIScale)
+static void lcl_ScaleRect(basegfx::B2DRange& rRange, const boost::rational<long> aUIScale)
 {
     const double fFactor(1.0 / boost::rational_cast<double>(aUIScale));
     rRange = basegfx::B2DRange(rRange.getMinimum() * fFactor, rRange.getMaximum() * fFactor);
@@ -254,7 +254,7 @@ void SvxAngleTabPage::Construct()
     }
 
     // take scale into account
-    const boost::rational<sal_Int64> aUIScale = pView->GetModel()->GetUIScale();
+    const boost::rational<long> aUIScale = pView->GetModel()->GetUIScale();
     lcl_ScaleRect(maRange, aUIScale);
 
     // take UI units into account
@@ -475,7 +475,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
 
     if( m_pMtrRadius->IsValueChangedFromSaved() )
     {
-        boost::rational<sal_Int64> aUIScale = pView->GetModel()->GetUIScale();
+        boost::rational<long> aUIScale = pView->GetModel()->GetUIScale();
         long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit );
         nTmp = boost::rational_cast<long>(nTmp * aUIScale);
 
@@ -758,7 +758,7 @@ void SvxPositionSizeTabPage::Construct()
     }
 
     // take scale into account
-    const boost::rational<sal_Int64> aUIScale = mpView->GetModel()->GetUIScale();
+    const boost::rational<long> aUIScale = mpView->GetModel()->GetUIScale();
     lcl_ScaleRect( maWorkRange, aUIScale );
     lcl_ScaleRect( maRange, aUIScale );
 
@@ -828,7 +828,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs )
 
     if ( m_pMtrWidth->IsValueModified() || m_pMtrHeight->IsValueModified() )
     {
-        boost::rational<sal_Int64> aUIScale = mpView->GetModel()->GetUIScale();
+        boost::rational<long> aUIScale = mpView->GetModel()->GetUIScale();
 
         // get Width
         double nWidth = static_cast<double>(m_pMtrWidth->GetValue( meDlgUnit ));