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 /sc/inc/rowheightcontext.hxx | |
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 'sc/inc/rowheightcontext.hxx')
-rw-r--r-- | sc/inc/rowheightcontext.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx index a33455444438..0db012c4a263 100644 --- a/sc/inc/rowheightcontext.hxx +++ b/sc/inc/rowheightcontext.hxx @@ -12,7 +12,7 @@ #include "scdllapi.h" -#include <tools/fract.hxx> +#include <tools/rational.hxx> class OutputDevice; @@ -22,8 +22,8 @@ class SC_DLLPUBLIC RowHeightContext { double mfPPTX; double mfPPTY; - Fraction maZoomX; - Fraction maZoomY; + boost::rational<long> maZoomX; + boost::rational<long> maZoomY; OutputDevice* mpOutDev; sal_uInt16 mnExtraHeight; @@ -31,15 +31,15 @@ class SC_DLLPUBLIC RowHeightContext public: RowHeightContext( - double fPPTX, double fPPTY, const Fraction& rZoomX, const Fraction& rZoomY, + double fPPTX, double fPPTY, const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, OutputDevice* pOutDev ); ~RowHeightContext(); double getPPTX() const { return mfPPTX;} double getPPTY() const { return mfPPTY;} - const Fraction& getZoomX() const { return maZoomX;} - const Fraction& getZoomY() const { return maZoomY;} + const boost::rational<long>& getZoomX() const { return maZoomX;} + const boost::rational<long>& getZoomY() const { return maZoomY;} OutputDevice* getOutputDevice() { return mpOutDev;} |