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/sfx2 | |
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/sfx2')
-rw-r--r-- | include/sfx2/ipclient.hxx | 10 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/viewfrm.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 350c7ac14944..10ab174bbdbd 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -34,7 +34,7 @@ class SfxInPlaceClient_Impl; class SfxViewShell; class SfxObjectShell; namespace vcl { class Window; } -namespace boost { template<typename T> class rational; } +class Fraction; @@ -74,10 +74,10 @@ public: bool SetObjArea( const Rectangle & ); Rectangle GetObjArea() const; Rectangle GetScaledObjArea() const; - void SetSizeScale( const boost::rational<long> & rScaleWidth, const boost::rational<long> & rScaleHeight ); - bool SetObjAreaAndScale( const Rectangle&, const boost::rational<long>&, const boost::rational<long>& ); - const boost::rational<long>& GetScaleWidth() const; - const boost::rational<long>& GetScaleHeight() const; + void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); + bool SetObjAreaAndScale( const Rectangle&, const Fraction&, const Fraction& ); + const Fraction& GetScaleWidth() const; + const Fraction& GetScaleHeight() const; void Invalidate(); static SfxInPlaceClient* GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject ); sal_Int64 GetAspect() const; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 42487bcc8333..d9d4e956e5cd 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -638,8 +638,8 @@ public: SAL_DLLPRIVATE void DoDraw_Impl( OutputDevice* pDev, const Point & rViewPos, - const boost::rational<long>& rScaleX, - const boost::rational<long>& rScaleY, + const Fraction & rScaleX, + const Fraction & rScaleY, const JobSetup & rSetup, sal_uInt16 nAspect ); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 9acc0e23fd85..1d043fcd2ded 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -43,7 +43,7 @@ class SfxProgress; class SvData; class SfxViewShell; class SystemWindow; -namespace boost { template<typename T> class rational; } +class Fraction; class Point; class Size; class SfxChildWindow; @@ -118,7 +118,7 @@ public: SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } vcl::Window& GetWindow() const; - virtual void SetZoomFactor( const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY ); + virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 827bdfd8a615..20114cfac991 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -39,7 +39,7 @@ class SfxBaseController; class Size; -namespace boost { template<typename T> class rational; } +class Fraction; namespace vcl { class Window; } class KeyEvent; class WorkWindow; @@ -146,7 +146,7 @@ protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual void SetZoomFactor( const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY ); + virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); virtual void Move(); |