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 /sw/inc/pagedesc.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 'sw/inc/pagedesc.hxx')
| -rw-r--r-- | sw/inc/pagedesc.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 58ab7a802f64..a9a4fc79c6f3 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SW_INC_PAGEDESC_HXX #define INCLUDED_SW_INC_PAGEDESC_HXX -#include <tools/fract.hxx> +#include <tools/rational.hxx> #include <tools/color.hxx> #include "swdllapi.h" #include <swtypes.hxx> @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwPageFtnInfo sal_uLong nLineWidth; ///< width of separator line editeng::SvxBorderStyle eLineStyle; ///< Style of the separator line Color aLineColor; ///< color of the separator line - Fraction aWidth; ///< percentage width of the separator line. + boost::rational<long> aWidth; ///< percentage width of the separator line. SwFtnAdj eAdj; ///< line adjustment. SwTwips nTopDist; ///< distance between body and separator. SwTwips nBottomDist; ///< distance between separator and first footnote @@ -56,7 +56,7 @@ public: sal_uLong GetLineWidth() const { return nLineWidth; } const Color& GetLineColor() const { return aLineColor;} editeng::SvxBorderStyle GetLineStyle() const { return eLineStyle; } - const Fraction& GetWidth() const { return aWidth; } + const boost::rational<long>& GetWidth() const { return aWidth; } SwFtnAdj GetAdj() const { return eAdj; } SwTwips GetTopDist()const { return nTopDist; } SwTwips GetBottomDist() const { return nBottomDist; } @@ -65,7 +65,7 @@ public: void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; } void SetLineStyle( editeng::SvxBorderStyle eSet ) { eLineStyle = eSet; } void SetLineColor(const Color& rCol ) { aLineColor = rCol;} - void SetWidth( const Fraction &rNew){ aWidth = rNew; } + void SetWidth( const boost::rational<long> &rNew){ aWidth = rNew; } void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; } void SetTopDist ( SwTwips nNew ) { nTopDist = nNew; } void SetBottomDist( SwTwips nNew ) { nBottomDist = nNew; } |