From 858c2a2977d5e4671959724ecd2a453837dadddf Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 23 Oct 2014 17:22:06 +0200 Subject: 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 --- sc/inc/column.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sc/inc/column.hxx') 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& rZoomX, const boost::rational& rZoomY, + const boost::rational& rZoomX, const boost::rational& rZoomY, bool bWidth, const ScNeededSizeOptions& rOptions, const ScPatternAttr** pPatternChange ) const; sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational& rZoomX, const boost::rational& rZoomY, + const boost::rational& rZoomX, const boost::rational& rZoomY, bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam) const; void GetOptimalHeight( -- cgit