summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdocapt.cxx
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-05 07:57:54 -0500
committerMichael Meeks <michael.meeks@novell.com>2010-10-08 14:28:47 +0100
commitc7545a363b7b61647060ae5c359f4aa9e1c36745 (patch)
treebb584990a9feda3910a9576b93a80b7d9def3d2f /svx/source/svdraw/svdocapt.cxx
parent6af890e2af327ff31db15a780223b8bfeadadae6 (diff)
FASTBOOL to bool conversion
Diffstat (limited to 'svx/source/svdraw/svdocapt.cxx')
-rw-r--r--svx/source/svdraw/svdocapt.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index b92157823081..c86431f65eb5 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -77,9 +77,9 @@ public:
long nEscAbs;
long nLineLen;
SdrCaptionEscDir eEscDir;
- FASTBOOL bFitLineLen;
- FASTBOOL bEscRel;
- FASTBOOL bFixedAngle;
+ bool bFitLineLen;
+ bool bEscRel;
+ bool bFixedAngle;
public:
ImpCaptParams()
@@ -115,7 +115,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
nY+=rRect.Top();
Point aBestPt;
EscDir eBestDir=LKS;
- FASTBOOL bTryH=eEscDir==SDRCAPT_ESCBESTFIT;
+ bool bTryH=eEscDir==SDRCAPT_ESCBESTFIT;
if (!bTryH) {
if (eType!=SDRCAPT_TYPE1) {
bTryH=eEscDir==SDRCAPT_ESCHORIZONTAL;
@@ -123,7 +123,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
bTryH=eEscDir==SDRCAPT_ESCVERTICAL;
}
}
- FASTBOOL bTryV=eEscDir==SDRCAPT_ESCBESTFIT;
+ bool bTryV=eEscDir==SDRCAPT_ESCBESTFIT;
if (!bTryV) {
if (eType!=SDRCAPT_TYPE1) {
bTryV=eEscDir==SDRCAPT_ESCVERTICAL;
@@ -135,7 +135,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
if (bTryH) {
Point aLft(rRect.Left()-nGap,nY);
Point aRgt(rRect.Right()+nGap,nY);
- FASTBOOL bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
+ bool bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
if (bLft) {
eBestDir=LKS;
aBestPt=aLft;
@@ -147,7 +147,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
if (bTryV) {
Point aTop(nX,rRect.Top()-nGap);
Point aBtm(nX,rRect.Bottom()+nGap);
- FASTBOOL bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
+ bool bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
Point aBest2;
EscDir eBest2;
if (bTop) {
@@ -157,7 +157,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
eBest2=UNT;
aBest2=aBtm;
}
- FASTBOOL bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
+ bool bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
if (!bTakeIt) {
BigInt aHorX(aBestPt.X()-aTl.X()); aHorX*=aHorX;
BigInt aHorY(aBestPt.Y()-aTl.Y()); aHorY*=aHorY;
@@ -557,7 +557,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect
}
}
-FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
+bool SdrCaptionObj::BegCreate(SdrDragStat& rStat)
{
if (aRect.IsEmpty()) return FALSE; // Create z.Zt. nur mit vorgegebenen Rect
@@ -570,7 +570,7 @@ FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
return TRUE;
}
-FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
+bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
{
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
@@ -582,7 +582,7 @@ FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
return TRUE;
}
-FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
@@ -592,7 +592,7 @@ FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2);
}
-FASTBOOL SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
+bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
{
return FALSE;
}
@@ -761,12 +761,12 @@ SdrObject* SdrCaptionObj::DoConvertToPolyObj(BOOL bBezier) const
SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
if (pTail!=NULL && pRect!=NULL) {
- FASTBOOL bInsRect=TRUE;
- FASTBOOL bInsTail=TRUE;
+ bool bInsRect = true;
+ bool bInsTail = true;
SdrObjList* pOL=pTail->GetSubList();
- if (pOL!=NULL) { pRet=pRect; bInsTail=FALSE; }
+ if (pOL!=NULL) { pRet=pRect; bInsTail = false; }
if (pOL==NULL) pOL=pRect->GetSubList();
- if (pOL!=NULL) { pRet=pRect; bInsRect=FALSE; }
+ if (pOL!=NULL) { pRet=pRect; bInsRect = false; }
if (pOL==NULL) {
SdrObjGroup* pGrp=new SdrObjGroup;
pOL=pGrp->GetSubList();