diff options
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 26 | ||||
-rw-r--r-- | svx/source/svdraw/svdedtv1.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdocirc.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdoedge.cxx | 48 | ||||
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 24 | ||||
-rw-r--r-- | svx/source/svdraw/svdorect.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdotxdr.cxx | 8 | ||||
-rw-r--r-- | svx/source/svdraw/svdotxtr.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdsnpv.cxx | 38 | ||||
-rw-r--r-- | svx/source/svdraw/svdtrans.cxx | 14 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 2 |
16 files changed, 93 insertions, 93 deletions
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 8fdc6b8581e3..d79d5f2add25 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1550,7 +1550,7 @@ void SdrDragMove::ImpCheckSnap(const Point& rPt) { if (bXSnapped) { - if (Abs(aPt.X())<Abs(nBestXSnap)) + if (std::abs(aPt.X())<std::abs(nBestXSnap)) { nBestXSnap=aPt.X(); } @@ -1566,7 +1566,7 @@ void SdrDragMove::ImpCheckSnap(const Point& rPt) { if (bYSnapped) { - if (Abs(aPt.Y())<Abs(nBestYSnap)) + if (std::abs(aPt.Y())<std::abs(nBestYSnap)) { nBestYSnap=aPt.Y(); } @@ -1780,8 +1780,8 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const if(!nYDiv) nYDiv = 1; - bool bX(aXFact != aFact1 && Abs(nXDiv) > 1); - bool bY(aYFact != aFact1 && Abs(nYDiv) > 1); + bool bX(aXFact != aFact1 && std::abs(nXDiv) > 1); + bool bY(aYFact != aFact1 && std::abs(nYDiv) > 1); if(bX || bY) { @@ -1961,7 +1961,7 @@ void SdrDragResize::MoveSdrDrag(const Point& rNoSnapPnt) if (!DragStat().IsHorFixed() && !DragStat().IsVerFixed()) { - if (Abs(nXDiv)<=1 || Abs(nYDiv)<=1) + if (std::abs(nXDiv)<=1 || std::abs(nYDiv)<=1) bOrtho=false; if (bOrtho) @@ -2545,7 +2545,7 @@ void SdrDragMirror::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethMirrorHori,rStr); else if (aDif.Y()==0) ImpTakeDescriptionStr(STR_DragMethMirrorVert,rStr); - else if (Abs(aDif.X())==Abs(aDif.Y())) + else if (std::abs(aDif.X()) == std::abs(aDif.Y())) ImpTakeDescriptionStr(STR_DragMethMirrorDiag,rStr); else ImpTakeDescriptionStr(STR_DragMethMirrorFree,rStr); @@ -2567,7 +2567,7 @@ bool SdrDragMirror::BeginSdrDrag() Ref2()=pH2->GetPos(); aDif=pH2->GetPos()-pH1->GetPos(); bool b90=(aDif.X()==0) || aDif.Y()==0; - bool b45=b90 || (Abs(aDif.X())==Abs(aDif.Y())); + bool b45=b90 || (std::abs(aDif.X()) == std::abs(aDif.Y())); nWink=NormAngle360(GetAngle(aDif)); if (!getSdrDragView().IsMirrorAllowed(false,false) && !b45) @@ -2842,7 +2842,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const if(bAtCenter) nVal *= 2; - nVal = Abs(nVal); + nVal = std::abs(nVal); OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr); rStr.Append(aStr); @@ -3185,9 +3185,9 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt) if (bValid) { if (bVertical) - bValid=Abs(dx1)*100>Abs(dy1); + bValid = std::abs(dx1)*100>std::abs(dy1); else - bValid=Abs(dy1)*100>Abs(dx1); + bValid = std::abs(dy1)*100>std::abs(dx1); } long nNeuRad=0; @@ -3235,10 +3235,10 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt) if (nNeuRad<0) nPntWink+=18000; if (bVertical) nPntWink=18000-nPntWink; nPntWink=NormAngle180(nPntWink); - nPntWink=Abs(nPntWink); + nPntWink = std::abs(nPntWink); } - double nUmfang=2*Abs(nNeuRad)*nPi; + double nUmfang = 2 * std::abs(nNeuRad)*nPi; if (bResize) { @@ -3311,7 +3311,7 @@ void SdrDragCrook::MoveSdrDrag(const Point& rPnt) if (bAtCenter) { nMul*=2; - nMul=Abs(nMul); + nMul = std::abs(nMul); } aNeuFact=Fraction(nMul,nDiv); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 9a0528cf9318..fcf7dd7ea49d 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -316,7 +316,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b Point aDif(rRef2-rRef1); if (aDif.X()==0) ImpTakeDescriptionStr(STR_EditMirrorHori,aStr); else if (aDif.Y()==0) ImpTakeDescriptionStr(STR_EditMirrorVert,aStr); - else if (Abs(aDif.X())==Abs(aDif.Y())) ImpTakeDescriptionStr(STR_EditMirrorDiag,aStr); + else if (std::abs(aDif.X()) == std::abs(aDif.Y())) ImpTakeDescriptionStr(STR_EditMirrorDiag,aStr); else ImpTakeDescriptionStr(STR_EditMirrorFree,aStr); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); BegUndo(aStr); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 67e5914d4829..75a3c79e38a7 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -248,7 +248,7 @@ void _SdrItemBrowserControl::ImpCtor() InsertDataColumn( ITEMBROWSER_STATECOL_ID, String("State", aTextEncoding), - Max(GetTextWidth(String(" State ", aTextEncoding)) + 2 , + std::max(GetTextWidth(String(" State ", aTextEncoding)) + 2 , GetTextWidth(String("DontCare", aTextEncoding)) + 2)); InsertDataColumn( ITEMBROWSER_TYPECOL_ID , diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index ab050d847b41..312c9c605fe7 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1738,7 +1738,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, // get the drawing pages if (bInsPages) { sal_uInt16 nSourcePos=nFirstPageNum; - sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1); + sal_uInt16 nMergeCount=sal_uInt16(std::abs((long)((long)nFirstPageNum-nLastPageNum))+1); if (nDestPos>GetPageCount()) nDestPos=GetPageCount(); while (nMergeCount>0) { SdrPage* pPg=NULL; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 5a5f53669f4a..8385b07bb70a 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1288,10 +1288,10 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const long nYDiv=nHgt0; bool bXNeg=(nXMul<0)!=(nXDiv<0); bool bYNeg=(nYMul<0)!=(nYDiv<0); - nXMul=Abs(nXMul); - nYMul=Abs(nYMul); - nXDiv=Abs(nXDiv); - nYDiv=Abs(nYDiv); + nXMul=std::abs(nXMul); + nYMul=std::abs(nYMul); + nXDiv=std::abs(nXDiv); + nYDiv=std::abs(nYDiv); Fraction aXFact(nXMul,nXDiv); // fractions for canceling Fraction aYFact(nYMul,nYDiv); // and for comparing nXMul=aXFact.GetNumerator(); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index fec1d31f55ff..9390388327b8 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -64,7 +64,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink) if (nWdt>nHgt) { if (nWdt!=0) { // stop possible overruns for very large objects - if (Abs(nHgt)>32767 || Abs(aRetval.Y())>32767) { + if (std::abs(nHgt)>32767 || std::abs(aRetval.Y())>32767) { aRetval.Y()=BigMulDiv(aRetval.Y(),nHgt,nWdt); } else { aRetval.Y()=aRetval.Y()*nHgt/nWdt; @@ -73,7 +73,7 @@ Point GetWinkPnt(const Rectangle& rR, long nWink) } else { if (nHgt!=0) { // stop possible overruns for very large objects - if (Abs(nWdt)>32767 || Abs(aRetval.X())>32767) { + if (std::abs(nWdt)>32767 || std::abs(aRetval.X())>32767) { aRetval.X()=BigMulDiv(aRetval.X(),nWdt,nHgt); } else { aRetval.X()=aRetval.X()*nWdt/nHgt; diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 617ea4361088..c4a176314367 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -589,11 +589,11 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const long dyo=rPt.Y()-aR.Top(); long dxr=aR.Right()-rPt.X(); long dyu=aR.Bottom()-rPt.Y(); - bool bxMitt=Abs(dxl-dxr)<2; - bool byMitt=Abs(dyo-dyu)<2; - long dx=Min(dxl,dxr); - long dy=Min(dyo,dyu); - bool bDiag=Abs(dx-dy)<2; + bool bxMitt=std::abs(dxl-dxr)<2; + bool byMitt=std::abs(dyo-dyu)<2; + long dx=std::min(dxl,dxr); + long dy=std::min(dyo,dyu); + bool bDiag=std::abs(dx-dy)<2; if (bxMitt && byMitt) return SDRESC_ALL; // in the center if (bDiag) { // diagonally sal_uInt16 nRet=0; @@ -844,7 +844,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aXP[0]=rPt1; aXP[1]=rPt2; if (pnQuality!=NULL) { - *pnQuality=Abs(rPt1.X()-rPt2.X())+Abs(rPt1.Y()-rPt2.Y()); + *pnQuality=std::abs(rPt1.X()-rPt2.X())+std::abs(rPt1.Y()-rPt2.Y()); } return aXP; } else if (eKind==SDREDGE_THREELINES) { @@ -862,9 +862,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (bLks2) aXP[2].X()=aBewareRect2.Left(); //-=500; if (bUnt2) aXP[2].Y()=aBewareRect2.Bottom(); //+=500; if (pnQuality!=NULL) { - long nQ=Abs(aXP[1].X()-aXP[0].X())+Abs(aXP[1].Y()-aXP[0].Y()); - nQ+=Abs(aXP[2].X()-aXP[1].X())+Abs(aXP[2].Y()-aXP[1].Y()); - nQ+=Abs(aXP[3].X()-aXP[2].X())+Abs(aXP[3].Y()-aXP[2].Y()); + long nQ=std::abs(aXP[1].X()-aXP[0].X())+std::abs(aXP[1].Y()-aXP[0].Y()); + nQ+=std::abs(aXP[2].X()-aXP[1].X())+std::abs(aXP[2].Y()-aXP[1].Y()); + nQ+=std::abs(aXP[3].X()-aXP[2].X())+std::abs(aXP[3].Y()-aXP[2].Y()); *pnQuality=nQ; } if (bInfo) { @@ -889,8 +889,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec Point aC2(aBewareRect2.Center()); if (aBewareRect1.Left()<=aBewareRect2.Right() && aBewareRect1.Right()>=aBewareRect2.Left()) { // overlapping on the x axis - long n1=Max(aBewareRect1.Left(),aBewareRect2.Left()); - long n2=Min(aBewareRect1.Right(),aBewareRect2.Right()); + long n1=std::max(aBewareRect1.Left(),aBewareRect2.Left()); + long n2=std::min(aBewareRect1.Right(),aBewareRect2.Right()); aMeeting.X()=(n1+n2+1)/2; } else { // otherwise the center point of the empty space @@ -902,8 +902,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (aBewareRect1.Top()<=aBewareRect2.Bottom() && aBewareRect1.Bottom()>=aBewareRect2.Top()) { // overlapping on the x axis - long n1=Max(aBewareRect1.Top(),aBewareRect2.Top()); - long n2=Min(aBewareRect1.Bottom(),aBewareRect2.Bottom()); + long n1=std::max(aBewareRect1.Top(),aBewareRect2.Top()); + long n2=std::min(aBewareRect1.Bottom(),aBewareRect2.Bottom()); aMeeting.Y()=(n1+n2+1)/2; } else { // otherwise the center point of the empty space @@ -917,10 +917,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // 1. both go into the same direction // 2. both go into opposite directions // 3. one is vertical, the other is horizontal - long nXMin=Min(aBewareRect1.Left(),aBewareRect2.Left()); - long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right()); - long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top()); - long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); + long nXMin=std::min(aBewareRect1.Left(),aBewareRect2.Left()); + long nXMax=std::max(aBewareRect1.Right(),aBewareRect2.Right()); + long nYMin=std::min(aBewareRect1.Top(),aBewareRect2.Top()); + long nYMax=std::max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() && aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom(); unsigned nMainCase=3; @@ -1016,7 +1016,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (!bCase29Direct) { - bool bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y()); + bool bObenLang=std::abs(nYMin-aMeeting.Y())<=std::abs(nYMax-aMeeting.Y()); if (bObenLang) { aMeeting.Y()=nYMin; } else { @@ -1077,7 +1077,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (!bCase29Direct) { - bool bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X()); + bool bLinksLang=std::abs(nXMin-aMeeting.X())<=std::abs(nXMax-aMeeting.X()); if (bLinksLang) { aMeeting.X()=nXMin; } else { @@ -1299,7 +1299,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec Point aPt0(aXP1[0]); for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) { Point aPt1b(aXP1[nPntNum]); - nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y()); + nQual+=std::abs(aPt1b.X()-aPt0.X())+std::abs(aPt1b.Y()-aPt0.Y()); if (nQual<nQual0) bOverflow = true; nQual0=nQual; aPt0=aPt1b; @@ -1308,9 +1308,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec sal_uInt16 nTmp=nPntAnz; if (cForm=='Z') { nTmp=2; // Z shape with good quality (nTmp=2 instead of 4) - sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y()); - sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y()); - sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y()); + sal_uIntPtr n1=std::abs(aXP1[1].X()-aXP1[0].X())+std::abs(aXP1[1].Y()-aXP1[0].Y()); + sal_uIntPtr n2=std::abs(aXP1[2].X()-aXP1[1].X())+std::abs(aXP1[2].Y()-aXP1[1].Y()); + sal_uIntPtr n3=std::abs(aXP1[3].X()-aXP1[2].X())+std::abs(aXP1[3].Y()-aXP1[2].Y()); // try to make lines lengths similar sal_uIntPtr nBesser=0; n1+=n3; @@ -2163,7 +2163,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO if (bOk && aMouseRect.IsInside(aConPos)) { if (bUser) bUserFnd = true; bFnd = true; - sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y()); + sal_uIntPtr nDist=(sal_uIntPtr)std::abs(aConPos.X()-rPt.X())+(sal_uIntPtr)std::abs(aConPos.Y()-rPt.Y()); if (nDist<nBestDist) { nBestDist=nDist; aTestCon.pObj=pObj; diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index a0041ee8de1a..46b88dae7de3 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1220,7 +1220,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() ); aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() ); aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 ); - aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 ) * 2.55 ) ); + aGrafInfo.SetTransparency( (sal_uInt8) FRound( std::min( nTrans, (sal_uInt16) 100 ) * 2.55 ) ); aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() ); aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() ); aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() ); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 3f3288de38fa..f416ceae9311 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -308,7 +308,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi if (bRet) { double cs=cos(nTmpAngle*nPi180); double nR=(double)GetLen(Point(dx,dy))/cs/2; - nRad=Abs(Round(nR)); + nRad=std::abs(Round(nR)); } if (dAngle<18000) { nCircStWink=NormAngle360(nTangAngle-9000); @@ -335,7 +335,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi } } nCircRadius=nRad; - if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False; + if (nRad==0 || std::abs(nCircRelWink)<5) bRet=sal_False; bCircle=bRet; return bRet; } @@ -376,8 +376,8 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr else { x1=BigMulDiv(y,nDirX,nDirY); y2=BigMulDiv(x,nDirY,nDirX); - long l1=Abs(x1)+Abs(y1); - long l2=Abs(x2)+Abs(y2); + long l1=std::abs(x1)+std::abs(y1); + long l2=std::abs(x2)+std::abs(y2); if ((l1<=l2) != (pView!=NULL && pView->IsBigOrtho())) { x=x1; y=y1; } else { @@ -396,8 +396,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); - Point aP1(CalcLine(aTmpPt, nDirX, nDirY,pView)); aP1-=aTmpPt; long nQ1=Abs(aP1.X())+Abs(aP1.Y()); - Point aP2(CalcLine(aTmpPt, nDirY,-nDirX,pView)); aP2-=aTmpPt; long nQ2=Abs(aP2.X())+Abs(aP2.Y()); + Point aP1(CalcLine(aTmpPt, nDirX, nDirY,pView)); aP1-=aTmpPt; long nQ1=std::abs(aP1.X())+std::abs(aP1.Y()); + Point aP2(CalcLine(aTmpPt, nDirY,-nDirX,pView)); aP2-=aTmpPt; long nQ2=std::abs(aP2.X())+std::abs(aP2.Y()); if (pView!=NULL && pView->IsOrtho()) nQ1=0; // Ortho turns off at right angle bLine90=nQ1>2*nQ2; if (!bLine90) { // smooth transition @@ -447,10 +447,10 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point aRectP2.X()+=x; aRectP2.Y()+=y; if (pView!=NULL && pView->IsOrtho()) { - long dx1=aRectP2.X()-aRectP1.X(); long dx1a=Abs(dx1); - long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=Abs(dy1); - long dx2=aRectP3.X()-aRectP2.X(); long dx2a=Abs(dx2); - long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=Abs(dy2); + long dx1=aRectP2.X()-aRectP1.X(); long dx1a=std::abs(dx1); + long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=std::abs(dy1); + long dx2=aRectP3.X()-aRectP2.X(); long dx2a=std::abs(dx2); + long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=std::abs(dy2); bool b1MoreThan2=dx1a+dy1a>dx2a+dy2a; if (b1MoreThan2 != pView->IsBigOrtho()) { long xtemp=dy2a-dx1a; if (dx1<0) xtemp=-xtemp; @@ -741,7 +741,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const aPt-=mpSdrPathDragData->aXP[nPrevPnt]; long nWink2=GetAngle(aPt); long nDiff=nWink1-nWink2; - nDiff=Abs(nDiff); + nDiff=std::abs(nDiff); mpSdrPathDragData->bEliminate=nDiff<=rDrag.GetView()->GetEliminatePolyPointLimitAngle(); if (mpSdrPathDragData->bEliminate) { // adapt position, Smooth is true for the ends aPt=mpSdrPathDragData->aXP[nNextPnt]; @@ -938,7 +938,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(pU->bCircle) { - mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr); + mrSdrPathObject.GetModel()->TakeWinkStr(std::abs(pU->nCircRelWink), aMetr); aStr.Append(aMetr); aStr.AppendAscii(" r="); mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True); diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 3e2e1d094ecf..da2d9fe77021 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -326,7 +326,7 @@ SdrHdl* SdrRectObj::GetHdl(sal_uInt32 nHdlNum) const case 1: { long a = GetEckenradius(); - long b = Max(aRect.GetWidth(),aRect.GetHeight())/2; // rounded up, because GetWidth() adds 1 + long b = std::max(aRect.GetWidth(),aRect.GetHeight())/2; // rounded up, because GetWidth() adds 1 if (a>b) a=b; if (a<0) a=0; aPnt=aRect.TopLeft(); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 1863dd8e8a2e..20551221b7d1 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -945,7 +945,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS // correct stretching factors long nMul=nWantWdt; long nDiv=aSiz.Width(); - if (Abs(nXDiff)<=2*nXKorr) { + if (std::abs(nXDiff)<=2*nXKorr) { if (nMul>nDiv) nDiv+=(nMul-nDiv)/2; // but only add half of what we calculated, else nMul+=(nDiv-nMul)/2; // because the EditEngine calculates wrongly later on } diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 1402a426879b..27d033d34750 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -100,10 +100,10 @@ Rectangle SdrTextObj::ImpDragCalcRect(const SdrDragStat& rDrag) const long nYDiv=nHgt0; bool bXNeg=(nXMul<0)!=(nXDiv<0); bool bYNeg=(nYMul<0)!=(nYDiv<0); - nXMul=Abs(nXMul); - nYMul=Abs(nYMul); - nXDiv=Abs(nXDiv); - nYDiv=Abs(nYDiv); + nXMul=std::abs(nXMul); + nYMul=std::abs(nYMul); + nXDiv=std::abs(nXDiv); + nYDiv=std::abs(nYDiv); Fraction aXFact(nXMul,nXDiv); // fractions for canceling Fraction aYFact(nYMul,nYDiv); // and for comparing nXMul=aXFact.GetNumerator(); diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 60706a297ec4..b19615434714 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -249,7 +249,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) bool bRota90Merk = false; if (bNoShearMerk && (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() || - Abs(rRef1.X()-rRef2.X())==Abs(rRef1.Y()-rRef2.Y()))) { + std::abs(rRef1.X()-rRef2.X())==std::abs(rRef1.Y()-rRef2.Y()))) { bRota90Merk=aGeo.nDrehWink % 9000 ==0; } Polygon aPol(Rect2Poly(aRect,aGeo)); diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 63120c7dc4db..65337d25a116 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -308,18 +308,18 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const switch (rHL.GetKind()) { case SDRHELPLINE_VERTICAL: { long a=x-rPos.X(); - if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } + if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } } break; case SDRHELPLINE_HORIZONTAL: { long b=y-rPos.Y(); - if (Abs(b)<=my) { dy1=-b; if (Abs(dy1)<Abs(dy)) dy=dy1; } + if (std::abs(b)<=my) { dy1=-b; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } } break; case SDRHELPLINE_POINT: { long a=x-rPos.X(); long b=y-rPos.Y(); - if (Abs(a)<=mx && Abs(b)<=my) { + if (std::abs(a)<=mx && std::abs(b)<=my) { dx1=-a; dy1=-b; - if (Abs(dx1)<Abs(dx) && Abs(dy1)<Abs(dy)) { dx=dx1; dy=dy1; } + if (std::abs(dx1)<std::abs(dx) && std::abs(dy1)<std::abs(dy)) { dx=dx1; dy=dy1; } } } break; } // switch @@ -334,14 +334,14 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const long upp=pPage->GetUppBorder(); long lwr=pPage->GetLwrBorder(); long a; - a=x- lft ; if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // left margin - a=x-(xs-rgt); if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // right margin - a=x ; if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // left edge of paper - a=x- xs ; if (Abs(a)<=mx) { dx1=-a; if (Abs(dx1)<Abs(dx)) dx=dx1; } // right edge of paper - a=y- upp ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // left margin - a=y-(ys-lwr); if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // right margin - a=y ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // left edge of paper - a=y- ys ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // right edge of paper + a=x- lft ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // left margin + a=x-(xs-rgt); if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // right margin + a=x ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // left edge of paper + a=x- xs ; if (std::abs(a)<=mx) { dx1=-a; if (std::abs(dx1)<std::abs(dx)) dx=dx1; } // right edge of paper + a=y- upp ; if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // left margin + a=y-(ys-lwr); if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // right margin + a=y ; if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // left edge of paper + a=y- ys ; if (std::abs(a)<=my) { dy1=-a; if (std::abs(dy1)<std::abs(dy)) dy=dy1; } // right edge of paper } if (bOFrmSnap || bOPntSnap) { sal_uIntPtr nMaxPointSnapCount=200; @@ -366,7 +366,7 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const Point aP(pO->GetSnapPoint(i)); dx1=x-aP.X(); dy1=y-aP.Y(); - if (Abs(dx1)<=mx && Abs(dy1)<=my && Abs(dx1)<Abs(dx) && Abs(dy1)<Abs(dy)) { + if (std::abs(dx1)<=mx && std::abs(dy1)<=my && std::abs(dx1)<std::abs(dx) && std::abs(dy1)<std::abs(dy)) { dx=-dx1; dy=-dy1; } @@ -381,10 +381,10 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const aR1.Top ()-=my; aR1.Bottom()+=my; if (aR1.IsInside(rPnt)) { - if (Abs(x-aLog.Left ())<=mx) { dx1=-(x-aLog.Left ()); if (Abs(dx1)<Abs(dx)) dx=dx1; } - if (Abs(x-aLog.Right ())<=mx) { dx1=-(x-aLog.Right ()); if (Abs(dx1)<Abs(dx)) dx=dx1; } - if (Abs(y-aLog.Top ())<=my) { dy1=-(y-aLog.Top ()); if (Abs(dy1)<Abs(dy)) dy=dy1; } - if (Abs(y-aLog.Bottom())<=my) { dy1=-(y-aLog.Bottom()); if (Abs(dy1)<Abs(dy)) dy=dy1; } + if (std::abs(x-aLog.Left ())<=mx) { dx1=-(x-aLog.Left ()); if (std::abs(dx1)<std::abs(dx)) dx=dx1; } + if (std::abs(x-aLog.Right ())<=mx) { dx1=-(x-aLog.Right ()); if (std::abs(dx1)<std::abs(dx)) dx=dx1; } + if (std::abs(y-aLog.Top ())<=my) { dy1=-(y-aLog.Top ()); if (std::abs(dy1)<std::abs(dy)) dy=dy1; } + if (std::abs(y-aLog.Bottom())<=my) { dy1=-(y-aLog.Bottom()); if (std::abs(dy1)<std::abs(dy)) dy=dy1; } } nMaxFrameSnapCount--; } @@ -439,7 +439,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes aPt-=rPt; if ((nRet & SDRSNAP_XSNAPPED) !=0) { if (bXSnapped) { - if (Abs(aPt.X())<Abs(nBestXSnap)) { + if (std::abs(aPt.X())<std::abs(nBestXSnap)) { nBestXSnap=aPt.X(); } } else { @@ -449,7 +449,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } if ((nRet & SDRSNAP_YSNAPPED) !=0) { if (bYSnapped) { - if (Abs(aPt.Y())<Abs(nBestYSnap)) { + if (std::abs(aPt.Y())<std::abs(nBestYSnap)) { nBestYSnap=aPt.Y(); } } else { diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index eadaa82d9b6d..91e3f77a2f18 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -443,8 +443,8 @@ sal_uInt16 GetAngleSector(long nWink) long GetLen(const Point& rPnt) { - long x=Abs(rPnt.X()); - long y=Abs(rPnt.Y()); + long x=std::abs(rPnt.X()); + long y=std::abs(rPnt.Y()); if (x+y<0x8000) { // because 7FFF * 7FFF * 2 = 7FFE0002 x*=x; y*=y; @@ -552,8 +552,8 @@ void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); long dy=rPt.Y()-rPt0.Y(); - long dxa=Abs(dx); - long dya=Abs(dy); + long dxa=std::abs(dx); + long dya=std::abs(dy); if (dx==0 || dy==0 || dxa==dya) return; if (dxa>=dya*2) { rPt.Y()=rPt0.Y(); return; } if (dya>=dxa*2) { rPt.X()=rPt0.X(); return; } @@ -568,8 +568,8 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho) { long dx=rPt.X()-rPt0.X(); long dy=rPt.Y()-rPt0.Y(); - long dxa=Abs(dx); - long dya=Abs(dy); + long dxa=std::abs(dx); + long dya=std::abs(dy); if ((dxa<dya) != bBigOrtho) { rPt.Y()=rPt0.Y()+(dxa* (dy>=0 ? 1 : -1) ); } else { @@ -617,7 +617,7 @@ void Kuerzen(Fraction& rF, unsigned nDigits) // count how many decimal places can be removed int nMulWeg=nMulDigits-nDigits; if (nMulWeg<0) nMulWeg=0; int nDivWeg=nDivDigits-nDigits; if (nDivWeg<0) nDivWeg=0; - int nWeg=Min(nMulWeg,nDivWeg); + int nWeg=std::min(nMulWeg,nDivWeg); nMul>>=nWeg; nDiv>>=nWeg; if (nMul==0 || nDiv==0) { diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c8e7d176fc68..65616bd8d0c0 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1099,7 +1099,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* if (pH1!=NULL && pH2!=NULL) { aDif=pH2->GetPos()-pH1->GetPos(); b90=(aDif.X()==0) || aDif.Y()==0; - b45=b90 || (Abs(aDif.X())==Abs(aDif.Y())); + b45=b90 || (std::abs(aDif.X())==std::abs(aDif.Y())); } bool bNo=false; if (!IsMirrorAllowed(sal_True,sal_True)) bNo=true; // any mirroring is forbidden |