diff options
author | David Tardon <dtardon@redhat.com> | 2014-10-16 15:30:32 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-10-16 17:44:44 +0200 |
commit | 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e (patch) | |
tree | 80c42b34da7e7ee05843b572f7311b3c230de9dd /writerfilter | |
parent | ada4862afc3227b04c12960ded761db24f61257e (diff) |
fdo#84854 it seems long is not enough on 32 bit
Fraction used BigInt internally for computations, rational does nothing
like that.
Change-Id: I3e9b25074f979bc291208f7c6362c3c40eb77ff5
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/WrapPolygonHandler.cxx | 14 | ||||
-rw-r--r-- | writerfilter/source/dmapper/WrapPolygonHandler.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx index 2cc86dcce627..45c7593f7db3 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx @@ -83,7 +83,7 @@ WrapPolygon::Pointer_t WrapPolygon::move(const awt::Point & rPoint) return pResult; } -WrapPolygon::Pointer_t WrapPolygon::scale(const boost::rational<long>& rFractionX, const boost::rational<long>& rFractionY) +WrapPolygon::Pointer_t WrapPolygon::scale(const boost::rational<sal_Int64>& rFractionX, const boost::rational<sal_Int64>& rFractionY) { WrapPolygon::Pointer_t pResult(new WrapPolygon); @@ -106,17 +106,17 @@ WrapPolygon::Pointer_t WrapPolygon::correctWordWrapPolygon(const awt::Size & rSr const long nWrap100Percent = 21600; - boost::rational<long> aMove(nWrap100Percent, rSrcSize.Width); - aMove = aMove * boost::rational<long>(15, 1); + boost::rational<sal_Int64> aMove(nWrap100Percent, rSrcSize.Width); + aMove = aMove * boost::rational<sal_Int64>(15, 1); awt::Point aMovePoint(boost::rational_cast<long>(aMove), 0); pResult = move(aMovePoint); - boost::rational<long> aScaleX(nWrap100Percent, boost::rational_cast<long>(nWrap100Percent + aMove)); - boost::rational<long> aScaleY(nWrap100Percent, boost::rational_cast<long>(nWrap100Percent - aMove)); + boost::rational<sal_Int64> aScaleX(nWrap100Percent, boost::rational_cast<long>(nWrap100Percent + aMove)); + boost::rational<sal_Int64> aScaleY(nWrap100Percent, boost::rational_cast<long>(nWrap100Percent - aMove)); pResult = pResult->scale(aScaleX, aScaleY); - boost::rational<long> aScaleSrcX(rSrcSize.Width, nWrap100Percent); - boost::rational<long> aScaleSrcY(rSrcSize.Height, nWrap100Percent); + boost::rational<sal_Int64> aScaleSrcX(rSrcSize.Width, nWrap100Percent); + boost::rational<sal_Int64> aScaleSrcY(rSrcSize.Height, nWrap100Percent); pResult = pResult->scale(aScaleSrcX, aScaleSrcY); return pResult; diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx index a02e05423b78..9048d97bc7e1 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx @@ -50,7 +50,7 @@ public: Points_t::iterator end(); WrapPolygon::Pointer_t move(const css::awt::Point & rMove); - WrapPolygon::Pointer_t scale(const boost::rational<long> & rFractionX, const boost::rational<long> & rFractionY); + WrapPolygon::Pointer_t scale(const boost::rational<sal_Int64> & rFractionX, const boost::rational<sal_Int64> & rFractionY); WrapPolygon::Pointer_t correctWordWrapPolygon(const css::awt::Size & rSrcSize); css::drawing::PointSequenceSequence getPointSequenceSequence() const; }; |