diff options
| author | David Tardon <dtardon@redhat.com> | 2014-10-16 15:30:32 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-10-16 17:44:44 +0200 |
| commit | 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e (patch) | |
| tree | 80c42b34da7e7ee05843b572f7311b3c230de9dd /include/sfx2 | |
| parent | ada4862afc3227b04c12960ded761db24f61257e (diff) | |
fdo#84854 it seems long is not enough on 32 bit
Fraction used BigInt internally for computations, rational does nothing
like that.
Change-Id: I3e9b25074f979bc291208f7c6362c3c40eb77ff5
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/ipclient.hxx | 8 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 4 | ||||
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 573d899b3b39..a4d440f94d38 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -73,10 +73,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 boost::rational<sal_Int64> & rScaleWidth, const boost::rational<sal_Int64> & rScaleHeight ); + bool SetObjAreaAndScale( const Rectangle&, const boost::rational<sal_Int64>&, const boost::rational<sal_Int64>& ); + const boost::rational<sal_Int64>& GetScaleWidth() const; + const boost::rational<sal_Int64>& 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..df0a32a3d821 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 boost::rational<sal_Int64>& rScaleX, + const boost::rational<sal_Int64>& rScaleY, const JobSetup & rSetup, sal_uInt16 nAspect ); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 426a9fd9a9df..fdfde8eec1b0 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -119,7 +119,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 boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY ); SfxProgress* GetProgress() const; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 39e5f2c2dee3..d47ea27732e3 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -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 boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY ); virtual void Move(); |