diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:41:47 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:39 +0200 |
commit | 31af61ea091cc895b893c849f2130aa35792b7db (patch) | |
tree | 6c7b63c5b538034bd5d356c5a8667b7e95d59b9c /include/vcl/mapmod.hxx | |
parent | e92c0d6f9b7a6251e00dc55219a203a7e53c96e2 (diff) |
Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"
This reverts commit 47a2d7642d249d70b5da0c330a73f3a0032e4bba.
Conflicts:
cui/source/tabpages/transfrm.cxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
tools/source/generic/rational.cxx
Change-Id: I4849916f5f277a4afef0e279b0135c76b36b9d15
Diffstat (limited to 'include/vcl/mapmod.hxx')
-rw-r--r-- | include/vcl/mapmod.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 211727f39660..10e06d2e9ca3 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_MAPMOD_HXX #include <tools/gen.hxx> -#include <tools/rational.hxx> +#include <tools/fract.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> #include <tools/resid.hxx> @@ -44,8 +44,8 @@ private: sal_uLong mnRefCount; MapUnit meUnit; Point maOrigin; - boost::rational<long> maScaleX; - boost::rational<long> maScaleY; + Fraction maScaleX; + Fraction maScaleY; bool mbSimple; friend SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rMapMode ); @@ -75,7 +75,7 @@ public: MapMode( const MapMode& rMapMode ); MapMode( MapUnit eUnit ); MapMode( MapUnit eUnit, const Point& rLogicOrg, - const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY ); + const Fraction& rScaleX, const Fraction& rScaleY ); ~MapMode(); void SetMapUnit( MapUnit eUnit ); @@ -86,11 +86,11 @@ public: const Point& GetOrigin() const { return mpImplMapMode->maOrigin; } - void SetScaleX( const boost::rational<long>& rScaleX ); - const boost::rational<long>& GetScaleX() const + void SetScaleX( const Fraction& rScaleX ); + const Fraction& GetScaleX() const { return mpImplMapMode->maScaleX; } - void SetScaleY( const boost::rational<long>& rScaleY ); - const boost::rational<long>& GetScaleY() const + void SetScaleY( const Fraction& rScaleY ); + const Fraction& GetScaleY() const { return mpImplMapMode->maScaleY; } MapMode& operator=( const MapMode& rMapMode ); |