diff options
| author | Juan Picca <jumapico@gmail.com> | 2014-09-19 14:19:30 -0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-10-09 11:33:33 +0000 |
| commit | 47a2d7642d249d70b5da0c330a73f3a0032e4bba (patch) | |
| tree | 202b04810382ea87cf8015a7b4de29e931408948 /svx/source/svdraw/svdoashp.cxx | |
| parent | ae77dc81c33ab0817264bcf5fc8bb71a55b78a73 (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/svdraw/svdoashp.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 687ed35740e4..858772c5ec14 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1564,15 +1564,15 @@ void SdrObjCustomShape::NbcMove( const Size& rSiz ) mpLastShadowGeometry->NbcMove( rSiz ); } } -void SdrObjCustomShape::Resize( const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative ) +void SdrObjCustomShape::Resize( const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bUnsetRelative ) { SdrTextObj::Resize( rRef, xFact, yFact, bUnsetRelative ); } -void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, const Fraction& ryFact ) +void SdrObjCustomShape::NbcResize( const Point& rRef, const boost::rational<long>& rxFact, const boost::rational<long>& ryFact ) { - Fraction xFact( rxFact ); - Fraction yFact( ryFact ); + boost::rational<long> xFact( rxFact ); + boost::rational<long> yFact( ryFact ); // taking care of handles that should not been changed Rectangle aOld( aRect ); @@ -1580,16 +1580,16 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co SdrTextObj::NbcResize( rRef, xFact, yFact ); - if ( ( xFact.GetNumerator() != xFact.GetDenominator() ) - || ( yFact.GetNumerator()!= yFact.GetDenominator() ) ) + if ( ( xFact.numerator() != xFact.denominator() ) + || ( yFact.numerator()!= yFact.denominator() ) ) { - if ( ( ( xFact.GetNumerator() < 0 ) && ( xFact.GetDenominator() > 0 ) ) || - ( ( xFact.GetNumerator() > 0 ) && ( xFact.GetDenominator() < 0 ) ) ) + if ( ( ( xFact.numerator() < 0 ) && ( xFact.denominator() > 0 ) ) || + ( ( xFact.numerator() > 0 ) && ( xFact.denominator() < 0 ) ) ) { SetMirroredX( IsMirroredX() == false ); } - if ( ( ( yFact.GetNumerator() < 0 ) && ( yFact.GetDenominator() > 0 ) ) || - ( ( yFact.GetNumerator() > 0 ) && ( yFact.GetDenominator() < 0 ) ) ) + if ( ( ( yFact.numerator() < 0 ) && ( yFact.denominator() > 0 ) ) || + ( ( yFact.numerator() > 0 ) && ( yFact.denominator() < 0 ) ) ) { SetMirroredY( IsMirroredY() == false ); } |