summaryrefslogtreecommitdiff
path: root/svx/source/dialog/connctrl.cxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-10-23 17:22:06 +0200
committerJan Holesovsky <kendy@collabora.com>2014-10-23 18:34:34 +0200
commit858c2a2977d5e4671959724ecd2a453837dadddf (patch)
treea61e303e6e27cef015c50b38b23fc574ce64fcef /svx/source/dialog/connctrl.cxx
parentff502f409fd73249a6a94c579d19905144aa5ba8 (diff)
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
Diffstat (limited to 'svx/source/dialog/connctrl.cxx')
-rw-r--r--svx/source/dialog/connctrl.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index f96c076028a5..7075c0249cec 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -113,9 +113,9 @@ void SvxXConnectionPreview::AdaptSize()
aNewSize.Height()= (long) ( (double) nWidth / fRectWH );
}
- boost::rational<sal_Int64> aFrac1( aWinSize.Width(), aRect.GetWidth() );
- boost::rational<sal_Int64> aFrac2( aWinSize.Height(), aRect.GetHeight() );
- boost::rational<sal_Int64> aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 );
+ boost::rational<long> aFrac1( aWinSize.Width(), aRect.GetWidth() );
+ boost::rational<long> aFrac2( aWinSize.Height(), aRect.GetHeight() );
+ boost::rational<long> aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 );
// Implement MapMode
aDisplayMap.SetScaleX( aMinFrac );
@@ -261,23 +261,23 @@ void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
if( bZoomIn || bZoomOut )
{
MapMode aMapMode = GetMapMode();
- boost::rational<sal_Int64> aXFrac = aMapMode.GetScaleX();
- boost::rational<sal_Int64> aYFrac = aMapMode.GetScaleY();
- boost::scoped_ptr<boost::rational<sal_Int64>> pMultFrac;
+ boost::rational<long> aXFrac = aMapMode.GetScaleX();
+ boost::rational<long> aYFrac = aMapMode.GetScaleY();
+ boost::scoped_ptr<boost::rational<long>> pMultFrac;
if( bZoomIn )
{
if( bCtrl )
- pMultFrac.reset(new boost::rational<sal_Int64>( 3, 2 ));
+ pMultFrac.reset(new boost::rational<long>( 3, 2 ));
else
- pMultFrac.reset(new boost::rational<sal_Int64>( 11, 10 ));
+ pMultFrac.reset(new boost::rational<long>( 11, 10 ));
}
else
{
if( bCtrl )
- pMultFrac.reset(new boost::rational<sal_Int64>( 2, 3 ));
+ pMultFrac.reset(new boost::rational<long>( 2, 3 ));
else
- pMultFrac.reset(new boost::rational<sal_Int64>( 10, 11 ));
+ pMultFrac.reset(new boost::rational<long>( 10, 11 ));
}
aXFrac *= *pMultFrac;