summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svddrgv.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svddrgv.cxx')
-rw-r--r--svx/source/svdraw/svddrgv.cxx210
1 files changed, 105 insertions, 105 deletions
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index f47d30fb3bdd..e976150a2b15 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -68,34 +68,34 @@ using namespace sdr;
void SdrDragView::ImpClearVars()
{
- bFramDrag=FALSE;
+ bFramDrag=sal_False;
eDragMode=SDRDRAG_MOVE;
- bDragLimit=FALSE;
- bMarkedHitMovesAlways=FALSE;
+ bDragLimit=sal_False;
+ bMarkedHitMovesAlways=sal_False;
eDragHdl=HDL_MOVE;
pDragHdl=NULL;
- bDragHdl=FALSE;
- bDragSpecial=FALSE;
+ bDragHdl=sal_False;
+ bDragSpecial=sal_False;
mpCurrentSdrDragMethod=NULL;
- bDragStripes=FALSE;
- bMirrRefDragObj=TRUE;
- bDragWithCopy=FALSE;
+ bDragStripes=sal_False;
+ bMirrRefDragObj=sal_True;
+ bDragWithCopy=sal_False;
pInsPointUndo=NULL;
- bInsGluePoint=FALSE;
- bInsObjPointMode=FALSE;
- bInsGluePointMode=FALSE;
+ bInsGluePoint=sal_False;
+ bInsObjPointMode=sal_False;
+ bInsGluePointMode=sal_False;
nDragXorPolyLimit=100;
nDragXorPointLimit=500;
- bNoDragXorPolys=FALSE;
- bAutoVertexCon=TRUE;
- bAutoCornerCon=FALSE;
- bRubberEdgeDragging=TRUE;
+ bNoDragXorPolys=sal_False;
+ bAutoVertexCon=sal_True;
+ bAutoCornerCon=sal_False;
+ bRubberEdgeDragging=sal_True;
nRubberEdgeDraggingLimit=100;
- bDetailedEdgeDragging=TRUE;
+ bDetailedEdgeDragging=sal_True;
nDetailedEdgeDraggingLimit=10;
- bResizeAtCenter=FALSE;
- bCrookAtCenter=FALSE;
- bMouseHideWhileDraggingPoints=FALSE;
+ bResizeAtCenter=sal_False;
+ bCrookAtCenter=sal_False;
+ bMouseHideWhileDraggingPoints=sal_False;
// init using default
mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate();
@@ -122,7 +122,7 @@ void SdrDragView::ImpDelDragAttr()
{
}
-BOOL SdrDragView::IsAction() const
+sal_Bool SdrDragView::IsAction() const
{
return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction());
}
@@ -140,7 +140,7 @@ void SdrDragView::EndAction()
{
if (mpCurrentSdrDragMethod)
{
- EndDragObj(FALSE);
+ EndDragObj(sal_False);
}
SdrExchangeView::EndAction();
}
@@ -186,7 +186,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
}
}
-BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
+sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
{
Rectangle aR;
TakeActionRect(aR);
@@ -199,8 +199,8 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
if (pObj->ISA(SdrCaptionObj))
{
Point aPt(((SdrCaptionObj*)pObj)->GetTailPos());
- BOOL bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
- BOOL bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
+ sal_Bool bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
+ sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
if (!bTail)
{ // bei bTail liefert TakeActionRect schon das richtige
if (bOwn)
@@ -216,30 +216,30 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
}
}
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
+sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
{
- return FALSE;
+ return sal_False;
}
-BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
+sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
{
BrkAction();
bool bRet=false;
{
- SetDragWithCopy(FALSE);
+ SetDragWithCopy(sal_False);
//ForceEdgesOfMarkedNodes();
//TODO: aAni.Reset();
mpCurrentSdrDragMethod=NULL;
- bDragSpecial=FALSE;
- bDragLimit=FALSE;
+ bDragSpecial=sal_False;
+ bDragLimit=sal_False;
SdrDragMode eTmpMode=eDragMode;
if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
eTmpMode=SDRDRAG_RESIZE;
@@ -249,7 +249,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if (!bFramDrag &&
(pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) &&
(pHdl==NULL || pHdl->GetObj()==NULL)) {
- bFramDrag=TRUE;
+ bFramDrag=sal_True;
}
Point aPnt(rPnt);
@@ -277,7 +277,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX;
// #103894# Expand test for HDL_ANCHOR_TR
- BOOL bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
+ sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth )
{
@@ -299,18 +299,18 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
case HDL_UPPER: case HDL_LOWER:
{
// Sind 3D-Objekte selektiert?
- BOOL b3DObjSelected = FALSE;
- for(UINT32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
+ sal_Bool b3DObjSelected = sal_False;
+ for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
{
SdrObject* pObj = GetMarkedObjectByIndex(a);
if(pObj && pObj->ISA(E3dObject))
- b3DObjSelected = TRUE;
+ b3DObjSelected = sal_True;
}
// Falls ja, Shear auch bei !IsShearAllowed zulassen,
// da es sich bei 3D-Objekten um eingeschraenkte
// Rotationen handelt
if (!b3DObjSelected && !IsShearAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE);
} break;
case HDL_UPLFT: case HDL_UPRGT:
@@ -318,12 +318,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT)
{
- if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return FALSE;
+ if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragDistort(*this);
}
else
{
- if (!IsRotateAllowed(TRUE)) return FALSE;
+ if (!IsRotateAllowed(sal_True)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragRotate(*this);
}
} break;
@@ -331,12 +331,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE)
{ // HDL_MOVE ist auch wenn Obj direkt getroffen
- if (!IsMoveAllowed()) return FALSE;
+ if (!IsMoveAllowed()) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsRotateAllowed(TRUE)) return FALSE;
+ if (!IsRotateAllowed(sal_True)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragRotate(*this);
}
}
@@ -346,12 +346,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
- if (!IsMoveAllowed()) return FALSE;
+ if (!IsMoveAllowed()) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsMirrorAllowed(TRUE,TRUE)) return FALSE;
+ if (!IsMirrorAllowed(sal_True,TRUE)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMirror(*this);
}
} break;
@@ -361,13 +361,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
if (!IsMoveAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE))
- return FALSE;
+ if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False))
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragCrop(*this);
}
}
@@ -378,15 +378,15 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
{
if(!IsMoveAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
if(!IsTransparenceAllowed())
- return FALSE;
+ return sal_False;
- mpCurrentSdrDragMethod = new SdrDragGradient(*this, FALSE);
+ mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False);
}
break;
}
@@ -395,13 +395,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
{
if(!IsMoveAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
if(!IsGradientAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragGradient(*this);
}
@@ -412,12 +412,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
- if (!IsMoveAllowed()) return FALSE;
+ if (!IsMoveAllowed()) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return FALSE;
+ if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragCrook(*this);
}
} break;
@@ -427,7 +427,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
// SDRDRAG_MOVE
if((eDragHdl == HDL_MOVE) && !IsMoveAllowed())
{
- return FALSE;
+ return sal_False;
}
else if(eDragHdl == HDL_GLUE)
{
@@ -443,9 +443,9 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
}
else
{
- if(!IsResizeAllowed(TRUE))
+ if(!IsResizeAllowed(sal_True))
{
- return FALSE;
+ return sal_False;
}
sal_Bool bSingleTextObjMark = sal_False; // SJ: #i100490#
@@ -488,14 +488,14 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
// #i77187#
// do not allow move of polygon points if object is move or size protected
- return FALSE;
+ return sal_False;
}
}
if(!mpCurrentSdrDragMethod)
{
// fallback to DragSpecial if no interaction defined
- bDragSpecial = TRUE;
+ bDragSpecial = sal_True;
mpCurrentSdrDragMethod = new SdrDragObjOwn(*this);
}
}
@@ -519,12 +519,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
// Aha, Obj kann nicht Move SpecialDrag, also MoveFrameDrag versuchen
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = 0;
- bDragSpecial=FALSE;
+ bDragSpecial=sal_False;
if (!IsMoveAllowed())
- return FALSE;
+ return sal_False;
- bFramDrag=TRUE;
+ bFramDrag=sal_True;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
@@ -552,14 +552,14 @@ void SdrDragView::MovDragObj(const Point& rPnt)
}
}
-BOOL SdrDragView::EndDragObj(BOOL bCopy)
+sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
{
bool bRet(false);
// #i73341# If insert GluePoint, do not insist on last points being different
if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev()))
{
- ULONG nHdlAnzMerk=0;
+ sal_uIntPtr nHdlAnzMerk=0;
if (bEliminatePolyPoints)
{ // IBM Special
@@ -592,7 +592,7 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
if (bInsPolyPoint)
{
SetMarkHandles();
- bInsPolyPoint=FALSE;
+ bInsPolyPoint=sal_False;
if( bUndo )
{
BegUndo(aInsPointUndoStr);
@@ -618,8 +618,8 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
BrkDragObj();
}
- bInsPolyPoint=FALSE;
- SetInsertGluePoint(FALSE);
+ bInsPolyPoint=sal_False;
+ SetInsertGluePoint(sal_False);
return bRet;
}
@@ -639,7 +639,7 @@ void SdrDragView::BrkDragObj()
delete pInsPointUndo;
pInsPointUndo=NULL;
SetMarkHandles();
- bInsPolyPoint=FALSE;
+ bInsPolyPoint=sal_False;
}
if (IsInsertGluePoint())
@@ -647,7 +647,7 @@ void SdrDragView::BrkDragObj()
pInsPointUndo->Undo(); // Den eingefuegten Klebepunkt wieder raus
delete pInsPointUndo;
pInsPointUndo=NULL;
- SetInsertGluePoint(FALSE);
+ SetInsertGluePoint(sal_False);
}
eDragHdl=HDL_MOVE;
@@ -655,7 +655,7 @@ void SdrDragView::BrkDragObj()
}
}
-BOOL SdrDragView::IsInsObjPointPossible() const
+sal_Bool SdrDragView::IsInsObjPointPossible() const
{
return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
}
@@ -731,51 +731,51 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
return bRet;
}
-BOOL SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
+sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
{
if(IsInsObjPoint())
{
sal_uInt32 nNextPnt(mnInsPointNum);
Point aPnt(aDragStat.GetNow());
- BOOL bOk=EndDragObj(FALSE);
- if (bOk==TRUE && eCmd!=SDRCREATE_FORCEEND)
+ sal_Bool bOk=EndDragObj(sal_False);
+ if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND)
{
// Ret=True bedeutet: Action ist vorbei.
bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
}
return bOk;
- } else return FALSE;
+ } else return sal_False;
}
-BOOL SdrDragView::IsInsGluePointPossible() const
+sal_Bool SdrDragView::IsInsGluePointPossible() const
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
if (IsInsGluePointMode() && AreObjectsMarked())
{
if (GetMarkedObjectCount()==1)
{
- // FALSE liefern, wenn 1 Objekt und dieses ein Verbinder ist.
+ // sal_False liefern, wenn 1 Objekt und dieses ein Verbinder ist.
const SdrObject* pObj=GetMarkedObjectByIndex(0);
if (!HAS_BASE(SdrEdgeObj,pObj))
{
- bRet=TRUE;
+ bRet=sal_True;
}
}
else
{
- bRet=TRUE;
+ bRet=sal_True;
}
}
return bRet;
}
-BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
+sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
SdrObject* pObj;
SdrPageView* pPV;
- ULONG nMarkNum;
+ sal_uIntPtr nMarkNum;
if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND))
{
BrkAction();
@@ -791,9 +791,9 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
SdrGluePointList* pGPL=pObj->ForceGluePointList();
if (pGPL!=NULL)
{
- USHORT nGlueIdx=pGPL->Insert(SdrGluePoint());
+ sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint());
SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
- USHORT nGlueId=rGP.GetId();
+ sal_uInt16 nGlueId=rGP.GetId();
rGP.SetAbsolutePos(rPnt,*pObj);
SdrHdl* pHdl=NULL;
@@ -803,7 +803,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
}
if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId)
{
- SetInsertGluePoint(TRUE);
+ SetInsertGluePoint(sal_True);
bRet=BegDragObj(rPnt,NULL,pHdl,0);
if (bRet)
{
@@ -812,7 +812,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
}
else
{
- SetInsertGluePoint(FALSE);
+ SetInsertGluePoint(sal_False);
delete pInsPointUndo;
pInsPointUndo=NULL;
}
@@ -825,7 +825,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
else
{
// Keine Klebepunkte moeglich bei diesem Objekt (z.B. Edge)
- SetInsertGluePoint(FALSE);
+ SetInsertGluePoint(sal_False);
delete pInsPointUndo;
pInsPointUndo=NULL;
}
@@ -852,7 +852,7 @@ void SdrDragView::ShowDragObj()
}
}
- aDragStat.SetShown(TRUE);
+ aDragStat.SetShown(sal_True);
}
}
@@ -861,13 +861,13 @@ void SdrDragView::HideDragObj()
if(mpCurrentSdrDragMethod && aDragStat.IsShown())
{
mpCurrentSdrDragMethod->destroyOverlayGeometry();
- aDragStat.SetShown(FALSE);
+ aDragStat.SetShown(sal_False);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrDragView::SetNoDragXorPolys(BOOL bOn)
+void SdrDragView::SetNoDragXorPolys(sal_Bool bOn)
{
if (IsNoDragXorPolys()!=bOn)
{
@@ -894,7 +894,7 @@ void SdrDragView::SetNoDragXorPolys(BOOL bOn)
}
}
-void SdrDragView::SetDragStripes(BOOL bOn)
+void SdrDragView::SetDragStripes(sal_Bool bOn)
{
if (mpCurrentSdrDragMethod && aDragStat.IsShown())
{
@@ -908,24 +908,24 @@ void SdrDragView::SetDragStripes(BOOL bOn)
}
}
-BOOL SdrDragView::IsOrthoDesired() const
+sal_Bool SdrDragView::IsOrthoDesired() const
{
if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod)))
{
return bOrthoDesiredOnMarked;
}
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
+void SdrDragView::SetRubberEdgeDragging(sal_Bool bOn)
{
if (bOn!=IsRubberEdgeDragging())
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
(nRubberEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
@@ -935,12 +935,12 @@ void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
}
}
-void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
{
if (nEdgeObjAnz!=nRubberEdgeDraggingLimit)
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
(nEdgeObjAnz>=nAnz)!=(nRubberEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
@@ -950,12 +950,12 @@ void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
}
}
-void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
+void SdrDragView::SetDetailedEdgeDragging(sal_Bool bOn)
{
if (bOn!=IsDetailedEdgeDragging())
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
(nDetailedEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
@@ -965,12 +965,12 @@ void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
}
}
-void SdrDragView::SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
{
if (nEdgeObjAnz!=nDetailedEdgeDraggingLimit)
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
(nEdgeObjAnz>=nAnz)!=(nDetailedEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
generated by cgit (git 2.34.1) at 2024-07-13 05:45:08 +0000