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/svtools | |
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/svtools')
-rw-r--r-- | include/svtools/imap.hxx | 4 | ||||
-rw-r--r-- | include/svtools/imapcirc.hxx | 4 | ||||
-rw-r--r-- | include/svtools/imappoly.hxx | 4 | ||||
-rw-r--r-- | include/svtools/imaprect.hxx | 4 | ||||
-rw-r--r-- | include/svtools/ruler.hxx | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index 37a513352778..951251d11bf0 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -27,7 +27,7 @@ class Point; class Rectangle; class Size; -namespace boost { template<typename T> class rational; } +class Fraction; class IMapObject; typedef ::std::vector< IMapObject* > IMapObjectList_impl; @@ -117,7 +117,7 @@ public: void SetName( const OUString& rName ) { aName = rName; } // skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor - void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY ); + void Scale( const Fraction& rFractX, const Fraction& rFracY ); // Im-/Export void Write ( SvStream& rOStm, const OUString& rBaseURL ) const; diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx index fd6c164c439a..2ce4127b1bc7 100644 --- a/include/svtools/imapcirc.hxx +++ b/include/svtools/imapcirc.hxx @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include <svtools/imapobj.hxx> -namespace boost { template<typename T> class rational; } +class Fraction; class SVT_DLLPUBLIC IMapCircleObject : public IMapObject { @@ -60,7 +60,7 @@ public: // liefert das BoundRect des Kreis-Objektes in 1/100mm virtual Rectangle GetBoundRect() const SAL_OVERRIDE; - void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY ); + void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; bool IsEqual( const IMapCircleObject& rEqObj ); diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx index e01b3114205b..79ca52a0a1c7 100644 --- a/include/svtools/imappoly.hxx +++ b/include/svtools/imappoly.hxx @@ -24,7 +24,7 @@ #include <svtools/imapobj.hxx> #include <tools/poly.hxx> -namespace boost { template<typename T> class rational; } +class Fraction; class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject { @@ -66,7 +66,7 @@ public: const Rectangle& GetExtraEllipse() const { return aEllipse; } void SetExtraEllipse( const Rectangle& rEllipse ); - void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY ); + void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; bool IsEqual( const IMapPolygonObject& rEqObj ); diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx index 6855fb36926c..17c96841a5d1 100644 --- a/include/svtools/imaprect.hxx +++ b/include/svtools/imaprect.hxx @@ -23,7 +23,7 @@ #include <svtools/imapobj.hxx> #include <tools/gen.hxx> -namespace boost { template<typename T> class rational; } +class Fraction; class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject { @@ -58,7 +58,7 @@ public: // liefert das BoundRect des Rechteck-Objektes in 1/100mm virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aRect; } - void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY ); + void Scale( const Fraction& rFractX, const Fraction& rFracY ); using IMapObject::IsEqual; bool IsEqual( const IMapRectangleObject& rEqObj ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index a27a92175a5f..49d4e424da4b 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -644,7 +644,7 @@ private: RulerType meDragType; MapUnit meSourceUnit; FieldUnit meUnit; - boost::rational<long> maZoom; + Fraction maZoom; bool mbCalc; bool mbFormat; bool mbDrag; @@ -745,8 +745,8 @@ public: void SetUnit( FieldUnit eNewUnit ); FieldUnit GetUnit() const { return meUnit; } - void SetZoom( const boost::rational<long>& rNewZoom ); - boost::rational<long> GetZoom() const { return maZoom; } + void SetZoom( const Fraction& rNewZoom ); + Fraction GetZoom() const { return maZoom; } void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } MapUnit GetSourceUnit() const { return meSourceUnit; } |