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/document.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sc/inc/document.hxx') diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 8064e2c9ffb0..b81a3b61b886 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1451,7 +1451,7 @@ public: void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational& rZoomX, const boost::rational& rZoomY ); + const boost::rational& rZoomX, const boost::rational& rZoomY ); bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const; @@ -1519,7 +1519,7 @@ public: sal_uInt16 GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational& rZoomX, const boost::rational& rZoomY, + const boost::rational& rZoomX, const boost::rational& rZoomY, bool bFormula, const ScMarkData* pMarkData = NULL, const ScColWidthParam* pParam = NULL ); @@ -1532,7 +1532,7 @@ public: long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational& rZoomX, const boost::rational& rZoomY, + const boost::rational& rZoomX, const boost::rational& rZoomY, bool bWidth, bool bTotalSize = false ); SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, bool bShow); -- cgit