diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:22:06 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:34 +0200 |
commit | 858c2a2977d5e4671959724ecd2a453837dadddf (patch) | |
tree | a61e303e6e27cef015c50b38b23fc574ce64fcef /vcl/source/gdi/mapmod.cxx | |
parent | ff502f409fd73249a6a94c579d19905144aa5ba8 (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 'vcl/source/gdi/mapmod.cxx')
-rw-r--r-- | vcl/source/gdi/mapmod.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index e284a8b3c027..2ac95ed54b11 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -80,7 +80,7 @@ ImplMapMode* ImplMapMode::ImplGetStaticMapMode( MapUnit eUnit ) ImplMapMode* pImplMapMode = ((ImplMapMode*)aStaticImplMapModeAry)+eUnit; if ( !pImplMapMode->mbSimple ) { - boost::rational<sal_Int64> aDefFraction( 1, 1 ); + boost::rational<long> aDefFraction( 1, 1 ); pImplMapMode->maScaleX = aDefFraction; pImplMapMode->maScaleY = aDefFraction; pImplMapMode->meUnit = eUnit; @@ -125,7 +125,7 @@ MapMode::MapMode( MapUnit eUnit ) } MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg, - const boost::rational<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& rScaleY ) + const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY ) { mpImplMapMode = new ImplMapMode; @@ -163,14 +163,14 @@ void MapMode::SetOrigin( const Point& rLogicOrg ) mpImplMapMode->maOrigin = rLogicOrg; } -void MapMode::SetScaleX( const boost::rational<sal_Int64>& rScaleX ) +void MapMode::SetScaleX( const boost::rational<long>& rScaleX ) { ImplMakeUnique(); mpImplMapMode->maScaleX = rScaleX; } -void MapMode::SetScaleY( const boost::rational<sal_Int64>& rScaleY ) +void MapMode::SetScaleY( const boost::rational<long>& rScaleY ) { ImplMakeUnique(); |