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 /svx/source/svdraw/svdxcgv.cxx | |
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 'svx/source/svdraw/svdxcgv.cxx')
-rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 1b070a17f1f2..fc4e732e4851 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -160,7 +160,7 @@ bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pObj->FitFrameToTextSize(); Size aSiz(pObj->GetLogicRect().GetSize()); MapUnit eMap=pMod->GetScaleUnit(); - boost::rational<long> aMap=pMod->GetScaleFraction(); + Fraction aMap=pMod->GetScaleFraction(); ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions); return true; } @@ -197,7 +197,7 @@ bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt pObj->FitFrameToTextSize(); Size aSiz(pObj->GetLogicRect().GetSize()); MapUnit eMap=pMod->GetScaleUnit(); - boost::rational<long> aMap=pMod->GetScaleFraction(); + Fraction aMap=pMod->GetScaleFraction(); ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions); // b4967543 @@ -267,7 +267,7 @@ bool SdrExchangeView::Paste( MapUnit eSrcUnit=pSrcMod->GetScaleUnit(); MapUnit eDstUnit=pMod->GetScaleUnit(); bool bResize=eSrcUnit!=eDstUnit; - boost::rational<long> xResize,yResize; + Fraction xResize,yResize; Point aPt0; if (bResize) { @@ -403,19 +403,19 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po MapUnit eSrcMU=rMap.GetMapUnit(); MapUnit eDstMU=pMod->GetScaleUnit(); FrPair aMapFact(GetMapFactor(eSrcMU,eDstMU)); - boost::rational<long> aDstFr(pMod->GetScaleFraction()); - nSizX*=aMapFact.X().numerator(); - nSizX*=rMap.GetScaleX().numerator(); - nSizX*=aDstFr.denominator(); - nSizX/=aMapFact.X().denominator(); - nSizX/=rMap.GetScaleX().denominator(); - nSizX/=aDstFr.numerator(); - nSizY*=aMapFact.Y().numerator(); - nSizY*=rMap.GetScaleY().numerator(); - nSizX*=aDstFr.denominator(); - nSizY/=aMapFact.Y().denominator(); - nSizY/=rMap.GetScaleY().denominator(); - nSizY/=aDstFr.numerator(); + Fraction aDstFr(pMod->GetScaleFraction()); + nSizX*=aMapFact.X().GetNumerator(); + nSizX*=rMap.GetScaleX().GetNumerator(); + nSizX*=aDstFr.GetDenominator(); + nSizX/=aMapFact.X().GetDenominator(); + nSizX/=rMap.GetScaleX().GetDenominator(); + nSizX/=aDstFr.GetNumerator(); + nSizY*=aMapFact.Y().GetNumerator(); + nSizY*=rMap.GetScaleY().GetNumerator(); + nSizX*=aDstFr.GetDenominator(); + nSizY/=aMapFact.Y().GetDenominator(); + nSizY/=rMap.GetScaleY().GetDenominator(); + nSizY/=aDstFr.GetNumerator(); long xs=nSizX; long ys=nSizY; Point aPos(rCenter.X()-xs/2,rCenter.Y()-ys/2); |