summaryrefslogtreecommitdiff
path: root/svx/source/dialog/connctrl.cxx
diff options
context:
space:
mode:
authorJuan Picca <jumapico@gmail.com>2014-09-19 14:19:30 -0300
committerDavid Tardon <dtardon@redhat.com>2014-10-09 11:33:33 +0000
commit47a2d7642d249d70b5da0c330a73f3a0032e4bba (patch)
tree202b04810382ea87cf8015a7b4de29e931408948 /svx/source/dialog/connctrl.cxx
parentae77dc81c33ab0817264bcf5fc8bb71a55b78a73 (diff)
fdo#81356: convert Fraction to boost::rational<long> - wip
* Added rational util functions used by Fraction class not available in the boost::rational class. * Replaced usage of Fraction by boost::rational<long> * Removed code that relies on: 1. fraction.IsValid() -- rational only allow valid values, ie denominator() != 0 2. rational.denominator() == 0 -- always false 3. rational.denominator() < 0 -- always false but implementation detail: http://www.boost.org/doc/libs/release/libs/rational/rational.html#Internal%20representation * Simplified code that relies on: 1. rational.denominator() != 0 -- always true * BUGS EXIST because Fraction allows the creation of invalid values but boost::rational throws the exception boost::bad_rational Change-Id: I84970a4956afb3f91ac0c8f726547466319420f9 Reviewed-on: https://gerrit.libreoffice.org/11551 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'svx/source/dialog/connctrl.cxx')
-rw-r--r--svx/source/dialog/connctrl.cxx28
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index a2c56212eec2..97454dc46219 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 );
}
- Fraction aFrac1( aWinSize.Width(), aRect.GetWidth() );
- Fraction aFrac2( aWinSize.Height(), aRect.GetHeight() );
- Fraction 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,29 +261,29 @@ void SvxXConnectionPreview::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 );
@@ -292,8 +292,8 @@ void SvxXConnectionPreview::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;