diff options
Diffstat (limited to 'svx/source/dialog/measctrl.cxx')
-rw-r--r-- | svx/source/dialog/measctrl.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 8810a874ba91..8206ea373637 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -34,8 +34,8 @@ SvxXMeasurePreview::SvxXMeasurePreview( vcl::Window* pParent, WinBits nStyle) // Scale: 1:2 MapMode aMapMode = GetMapMode(); - aMapMode.SetScaleX( Fraction( 1, 2 ) ); - aMapMode.SetScaleY( Fraction( 1, 2 ) ); + aMapMode.SetScaleX( boost::rational<long>( 1, 2 ) ); + aMapMode.SetScaleY( boost::rational<long>( 1, 2 ) ); SetMapMode( aMapMode ); Size aSize = GetOutputSize(); @@ -109,29 +109,29 @@ void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt ) if( bZoomIn || bZoomOut ) { MapMode aMapMode = GetMapMode(); - Fraction aXFrac = aMapMode.GetScaleX(); - Fraction aYFrac = aMapMode.GetScaleY(); - boost::scoped_ptr<Fraction> 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 Fraction( 3, 2 )); + pMultFrac.reset(new boost::rational<long>( 3, 2 )); else - pMultFrac.reset(new Fraction( 11, 10 )); + pMultFrac.reset(new boost::rational<long>( 11, 10 )); } else { if( bCtrl ) - pMultFrac.reset(new Fraction( 2, 3 )); + pMultFrac.reset(new boost::rational<long>( 2, 3 )); else - pMultFrac.reset(new Fraction( 10, 11 )); + pMultFrac.reset(new boost::rational<long>( 10, 11 )); } aXFrac *= *pMultFrac; aYFrac *= *pMultFrac; - if( (double)aXFrac > 0.001 && (double)aXFrac < 1000.0 && - (double)aYFrac > 0.001 && (double)aYFrac < 1000.0 ) + if( boost::rational_cast<double>(aXFrac) > 0.001 && boost::rational_cast<double>(aXFrac) < 1000.0 && + boost::rational_cast<double>(aYFrac) > 0.001 && boost::rational_cast<double>(aYFrac) < 1000.0 ) { aMapMode.SetScaleX( aXFrac ); aMapMode.SetScaleY( aYFrac ); @@ -140,8 +140,8 @@ void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt ) Size aOutSize( GetOutputSize() ); Point aPt( aMapMode.GetOrigin() ); - long nX = (long)( ( (double)aOutSize.Width() - ( (double)aOutSize.Width() * (double)*pMultFrac ) ) / 2.0 + 0.5 ); - long nY = (long)( ( (double)aOutSize.Height() - ( (double)aOutSize.Height() * (double)*pMultFrac ) ) / 2.0 + 0.5 ); + long nX = (long)( ( (double)aOutSize.Width() - ( (double)aOutSize.Width() * boost::rational_cast<double>(* pMultFrac) ) ) / 2.0 + 0.5 ); + long nY = (long)( ( (double)aOutSize.Height() - ( (double)aOutSize.Height() * boost::rational_cast<double>(* pMultFrac) ) ) / 2.0 + 0.5 ); aPt.X() += nX; aPt.Y() += nY; |