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/editutil.hxx | |
parent | e92c0d6f9b7a6251e00dc55219a203a7e53c96e2 (diff) |
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/editutil.hxx')
-rw-r--r-- | sc/inc/editutil.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index d3f7b3be986d..142650fa9fa1 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -27,7 +27,7 @@ #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/gen.hxx> -#include <tools/rational.hxx> +#include <tools/fract.hxx> class OutputDevice; class ScDocument; @@ -44,8 +44,8 @@ class ScEditUtil OutputDevice* pDev; // MapMode has to be set double nPPTX; double nPPTY; - boost::rational<long> aZoomX; - boost::rational<long> aZoomY; + Fraction aZoomX; + Fraction aZoomY; static const char pCalcDelimiters[]; @@ -82,7 +82,7 @@ public: ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ, const Point& rScrPosPixel, OutputDevice* pDevice, double nScaleX, double nScaleY, - const boost::rational<long>& rX, const boost::rational<long>& rY ) : + const Fraction& rX, const Fraction& rY ) : pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ), aScrPos(rScrPosPixel),pDev(pDevice), nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {} |