diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-18 08:47:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-18 08:49:02 +0200 |
commit | 6fdfa13a096c55f5038c4a850cfb108d30143d4b (patch) | |
tree | 0c895f66159d0d7828a72e4d0a5f988205a8160e /svx | |
parent | 55b74b454f4fceccfc05406b44919a5276e0b3ae (diff) |
convert SdrCaptionEscDir to scoped enum
Change-Id: Iec6dfbdc65efde86ff24ddc51c48eb697bf4ead1
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdocapt.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 4ab3e82cc38f..4bcb20d23692 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -84,7 +84,7 @@ public: bFixedAngle=false; nAngle =4500; nGap =0; - eEscDir =SDRCAPT_ESCHORIZONTAL; + eEscDir =SdrCaptionEscDir::Horizontal; bEscRel =true; nEscRel =5000; nEscAbs =0; @@ -111,20 +111,20 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi nY+=rRect.Top(); Point aBestPt; EscDir eBestDir=LKS; - bool bTryH=eEscDir==SDRCAPT_ESCBESTFIT; + bool bTryH=eEscDir==SdrCaptionEscDir::BestFit; if (!bTryH) { if (eType!=SdrCaptionType::Type1) { - bTryH=eEscDir==SDRCAPT_ESCHORIZONTAL; + bTryH=eEscDir==SdrCaptionEscDir::Horizontal; } else { - bTryH=eEscDir==SDRCAPT_ESCVERTICAL; + bTryH=eEscDir==SdrCaptionEscDir::Vertical; } } - bool bTryV=eEscDir==SDRCAPT_ESCBESTFIT; + bool bTryV=eEscDir==SdrCaptionEscDir::BestFit; if (!bTryV) { if (eType!=SdrCaptionType::Type1) { - bTryV=eEscDir==SDRCAPT_ESCVERTICAL; + bTryV=eEscDir==SdrCaptionEscDir::Vertical; } else { - bTryV=eEscDir==SDRCAPT_ESCHORIZONTAL; + bTryV=eEscDir==SdrCaptionEscDir::Horizontal; } } @@ -153,7 +153,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi eBest2=UNT; aBest2=aBtm; } - bool bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT; + bool bTakeIt=eEscDir!=SdrCaptionEscDir::BestFit; if (!bTakeIt) { BigInt aHorX(aBestPt.X()-aTl.X()); aHorX*=aHorX; BigInt aHorY(aBestPt.Y()-aTl.Y()); aHorY*=aHorY; |