diff options
Diffstat (limited to 'sd/source/ui/func/fuconarc.cxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fuconarc.cxx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 7a7ab2b9dc2e..3cb1a8c4ee0b 100644..100755 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -95,12 +95,12 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) if (pArgs) { - SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE); - SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE); - SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, FALSE); - SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, FALSE); - SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, FALSE); - SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, FALSE); + SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False); + SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False); + SFX_REQUEST_ARG (rReq, pAxisX, SfxUInt32Item, ID_VAL_AXIS_X, sal_False); + SFX_REQUEST_ARG (rReq, pAxisY, SfxUInt32Item, ID_VAL_AXIS_Y, sal_False); + SFX_REQUEST_ARG (rReq, pPhiStart, SfxUInt32Item, ID_VAL_ANGLESTART, sal_False); + SFX_REQUEST_ARG (rReq, pPhiEnd, SfxUInt32Item, ID_VAL_ANGLEEND, sal_False); Rectangle aNewRectangle (pCenterX->GetValue () - pAxisX->GetValue () / 2, pCenterY->GetValue () - pAxisY->GetValue () / 2, @@ -125,15 +125,15 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) |* \************************************************************************/ -BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bReturn = FuConstruct::MouseButtonDown( rMEvt ); + sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); mpWindow->CaptureMouse(); - USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); + sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); SdrObject* pObj = mpView->GetCreateObj(); @@ -143,11 +143,11 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet(aAttr, pObj); -//-/ pObj->NbcSetAttributes(aAttr, FALSE); +//-/ pObj->NbcSetAttributes(aAttr, sal_False); pObj->SetMergedItemSet(aAttr); } - bReturn = TRUE; + bReturn = sal_True; } return bReturn; } @@ -158,7 +158,7 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) { return FuConstruct::MouseMove(rMEvt); } @@ -169,26 +169,26 @@ BOOL FuConstructArc::MouseMove( const MouseEvent& rMEvt ) |* \************************************************************************/ -BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) +sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { - BOOL bReturn = FALSE; - BOOL bCreated = FALSE; + sal_Bool bReturn = sal_False; + sal_Bool bCreated = sal_False; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); - ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); + sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); if (mpView->EndCreateObj(SDRCREATE_NEXTPOINT) ) { if (nCount != mpView->GetSdrPageView()->GetObjList()->GetObjCount()) { - bCreated = TRUE; + bCreated = sal_True; } } - bReturn = TRUE; + bReturn = sal_True; } bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; @@ -203,14 +203,14 @@ BOOL FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) |* |* Tastaturereignisse bearbeiten |* -|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls -|* FALSE. +|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls +|* sal_False. |* \************************************************************************/ -BOOL FuConstructArc::KeyInput(const KeyEvent& rKEvt) +sal_Bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) { - BOOL bReturn = FuConstruct::KeyInput(rKEvt); + sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); return(bReturn); } @@ -258,7 +258,7 @@ void FuConstructArc::Activate() break; } - mpView->SetCurrentObj((UINT16)aObjKind); + mpView->SetCurrentObj((sal_uInt16)aObjKind); FuConstruct::Activate(); // FuDraw::Activate(); |