diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:41:47 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:39 +0200 |
| commit | 31af61ea091cc895b893c849f2130aa35792b7db (patch) | |
| tree | 6c7b63c5b538034bd5d356c5a8667b7e95d59b9c /sc/inc/document.hxx | |
| parent | Fraction: Revert "-Werror,-Wliteral-conversion (implicit conversion from doub... (diff) | |
| download | core-31af61ea091cc895b893c849f2130aa35792b7db.tar.gz core-31af61ea091cc895b893c849f2130aa35792b7db.zip | |
Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"
This reverts commit 47a2d7642d249d70b5da0c330a73f3a0032e4bba.
Conflicts:
cui/source/tabpages/transfrm.cxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
tools/source/generic/rational.cxx
Change-Id: I4849916f5f277a4afef0e279b0135c76b36b9d15
Diffstat (limited to 'sc/inc/document.hxx')
| -rw-r--r-- | sc/inc/document.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index b81a3b61b886..cfc9c410ef0f 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -37,7 +37,7 @@ #include "compressedarray.hxx" #include "calcmacros.hxx" #include "calcconfig.hxx" -#include <tools/rational.hxx> +#include <tools/fract.hxx> #include <tools/gen.hxx> #include <svl/zforlist.hxx> @@ -1451,7 +1451,7 @@ public: void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, - const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY ); + const Fraction& rZoomX, const Fraction& 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<long>& rZoomX, const boost::rational<long>& rZoomY, + const Fraction& rZoomX, const Fraction& 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<long>& rZoomX, const boost::rational<long>& rZoomY, + const Fraction& rZoomX, const Fraction& rZoomY, bool bWidth, bool bTotalSize = false ); SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, bool bShow); |