diff options
Diffstat (limited to 'svx/source/svdraw/svdogrp.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/svdraw/svdogrp.cxx | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index ede6b35178f9..7c49d50784e9 100644..100755 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -177,13 +178,13 @@ sal_uInt16 SdrObjGroup::GetObjIdentifier() const SdrLayerID SdrObjGroup::GetLayer() const { - FASTBOOL b1st=sal_True; + bool b1st = true; SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer()); SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrLayerID nLay1=pOL->GetObj(i)->GetLayer(); - if (b1st) { nLay=nLay1; b1st=sal_False; } + if (b1st) { nLay=nLay1; b1st = false; } else if (nLay1!=nLay) return 0; } return nLay; @@ -245,7 +246,7 @@ void SdrObjGroup::SetModel(SdrModel* pNewModel) } -FASTBOOL SdrObjGroup::HasRefPoint() const +bool SdrObjGroup::HasRefPoint() const { return bRefPoint; } @@ -271,22 +272,19 @@ SdrObjList* SdrObjGroup::GetSubList() const const Rectangle& SdrObjGroup::GetCurrentBoundRect() const { - // --> OD 2007-02-01 #144962# - // <aOutRect> has to contain the bounding rectangle + // <aOutRect> has to contain the bounding rectangle (#144962#) if ( pSub->GetObjCount()!=0 ) { const_cast<SdrObjGroup*>(this)->aOutRect = pSub->GetAllObjBoundRect(); } return aOutRect; - // <-- } const Rectangle& SdrObjGroup::GetSnapRect() const { - // --> OD 2007-02-01 #144962# - // <aOutRect> has to contain the bounding rectangle + // <aOutRect> has to contain the bounding rectangle (#144962#) if ( pSub->GetObjCount()!=0 ) { return pSub->GetAllObjSnapRect(); @@ -295,7 +293,6 @@ const Rectangle& SdrObjGroup::GetSnapRect() const { return aOutRect; } - // <-- } void SdrObjGroup::operator=(const SdrObject& rObj) @@ -385,7 +382,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const } -FASTBOOL SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) +bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -397,7 +394,7 @@ long SdrObjGroup::GetRotateAngle() const } -long SdrObjGroup::GetShearAngle(FASTBOOL /*bVertical*/) const +long SdrObjGroup::GetShearAngle(bool /*bVertical*/) const { return nShearWink; } @@ -448,8 +445,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz) void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -509,7 +506,7 @@ void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2) } -void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { SetGlueReallyAbsolute(sal_True); nShearWink+=nWink; @@ -604,8 +601,8 @@ void SdrObjGroup::Move(const Size& rSiz) void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) { - FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -700,7 +697,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) } -void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if (nWink!=0) { SetGlueReallyAbsolute(sal_True); @@ -731,7 +728,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShe void SdrObjGroup::SetAnchorPos(const Point& rPnt) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - FASTBOOL bChg=aAnchor!=rPnt; + bool bChg=aAnchor!=rPnt; aAnchor=rPnt; Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y()); MovePoint(aRefPoint,aSiz); @@ -799,3 +796,5 @@ SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const } // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |