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/inc/column.hxx | |
| 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 'sc/inc/column.hxx')
| -rw-r--r-- | sc/inc/column.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index f21ab076d515..70482322c617 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -455,12 +455,12 @@ public: long GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY, + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, bool bWidth, const ScNeededSizeOptions& rOptions, const ScPatternAttr** pPatternChange ) const; sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY, + const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY, bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam) const; void GetOptimalHeight( |