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 /sc/source/ui/view/drawutil.cxx | |
| parent | Fraction: Revert "coverity#1247617 there is nothing to do if width is 0" (diff) | |
| download | core-858c2a2977d5e4671959724ecd2a453837dadddf.tar.gz core-858c2a2977d5e4671959724ecd2a453837dadddf.zip | |
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 'sc/source/ui/view/drawutil.cxx')
| -rw-r--r-- | sc/source/ui/view/drawutil.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index ff6bacbb85f8..21840f50ffaf 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -27,9 +27,9 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, OutputDevice* pDev, - const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY, + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, double nPPTX, double nPPTY, - boost::rational<sal_Int64>& rScaleX, boost::rational<sal_Int64>& rScaleY ) + boost::rational<long>& rScaleX, boost::rational<long>& rScaleY ) { long nPixelX = 0; long nTwipsX = 0; @@ -69,7 +69,7 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, ((double)HMM_PER_TWIPS) / ((double)rZoomX.denominator()) ); else - rScaleX = boost::rational<sal_Int64>( 1, 1 ); + rScaleX = boost::rational<long>( 1, 1 ); if ( aPixelLog.Y() && nTwipsY ) rScaleY = rational_FromDouble( ((double)aPixelLog.Y()) * @@ -78,7 +78,7 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, ((double)HMM_PER_TWIPS) / ((double)rZoomY.denominator()) ); else - rScaleY = boost::rational<sal_Int64>( 1, 1 ); + rScaleY = boost::rational<long>( 1, 1 ); // 25 bits of accuracy are needed to always hit the right part of // cells in the last rows (was 17 before 1M rows). |