diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:22:06 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:34 +0200 |
| commit | 858c2a2977d5e4671959724ecd2a453837dadddf (patch) | |
| tree | a61e303e6e27cef015c50b38b23fc574ce64fcef /include/vcl | |
| parent | ff502f409fd73249a6a94c579d19905144aa5ba8 (diff) | |
Fraction: Revert "fdo#84854 it seems long is not enough on 32 bit"
This reverts commit 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e.
Conflicts:
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
Change-Id: I80abc7abdeddc267eaabc9f8ab49611bb3f8ae83
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/gdimtf.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/mapmod.hxx | 14 | ||||
| -rw-r--r-- | include/vcl/virdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 4db341fe7997..128895fc0675 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -136,7 +136,7 @@ public: // additional Move method getting specifics how to handle MapMode( MAP_PIXEL ) void Move( long nX, long nY, long nDPIX, long nDPIY ); void Scale( double fScaleX, double fScaleY ); - void Scale( const boost::rational<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& rScaleY ); + void Scale( const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY ); void Rotate( long nAngle10 ); void Clip( const Rectangle& ); /* get the bound rect of the contained actions diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index e86c96f23573..211727f39660 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -44,8 +44,8 @@ private: sal_uLong mnRefCount; MapUnit meUnit; Point maOrigin; - boost::rational<sal_Int64> maScaleX; - boost::rational<sal_Int64> maScaleY; + boost::rational<long> maScaleX; + boost::rational<long> 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<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& rScaleY ); + const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY ); ~MapMode(); void SetMapUnit( MapUnit eUnit ); @@ -86,11 +86,11 @@ public: const Point& GetOrigin() const { return mpImplMapMode->maOrigin; } - void SetScaleX( const boost::rational<sal_Int64>& rScaleX ); - const boost::rational<sal_Int64>& GetScaleX() const + void SetScaleX( const boost::rational<long>& rScaleX ); + const boost::rational<long>& GetScaleX() const { return mpImplMapMode->maScaleX; } - void SetScaleY( const boost::rational<sal_Int64>& rScaleY ); - const boost::rational<sal_Int64>& GetScaleY() const + void SetScaleY( const boost::rational<long>& rScaleY ); + const boost::rational<long>& GetScaleY() const { return mpImplMapMode->maScaleY; } MapMode& operator=( const MapMode& rMapMode ); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index c7d1365ffced..4886410bd2aa 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -124,7 +124,7 @@ public: bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, - const boost::rational<sal_Int64>& rScale, + const boost::rational<long>& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer, const bool bTopDown = false ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index da012ca13673..af8d587a1750 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1011,8 +1011,8 @@ public: void SetCursor( vcl::Cursor* pCursor ); vcl::Cursor* GetCursor() const; - void SetZoom( const boost::rational<sal_Int64>& rZoom ); - const boost::rational<sal_Int64>& GetZoom() const; + void SetZoom( const boost::rational<long>& rZoom ); + const boost::rational<long>& GetZoom() const; bool IsZoom() const; long CalcZoom( long n ) const; |