summaryrefslogtreecommitdiff
path: root/sd/source/ui/func/fusel.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/func/fusel.cxx')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/func/fusel.cxx214
1 files changed, 111 insertions, 103 deletions
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index a2836ae0661a..48d81f5388fa 100644..100755
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -104,12 +104,12 @@ FuSelection::FuSelection (
SdDrawDocument* pDoc,
SfxRequest& rReq)
: FuDraw(pViewSh, pWin, pView, pDoc, rReq),
- bTempRotation(FALSE),
- bSelectionChanged(FALSE),
- bHideAndAnimate(FALSE),
+ bTempRotation(sal_False),
+ bSelectionChanged(sal_False),
+ bHideAndAnimate(sal_False),
pHdl(NULL),
- bSuppressChangesOfSelection(FALSE),
- bMirrorSide0(FALSE),
+ bSuppressChangesOfSelection(sal_False),
+ bMirrorSide0(sal_False),
nEditMode(SID_BEZIER_MOVE),
pWaterCanCandidate(NULL)
{
@@ -153,38 +153,38 @@ FuSelection::~FuSelection()
|*
\************************************************************************/
-BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
// Hack fuer #?????#
- bHideAndAnimate = FALSE;
+ bHideAndAnimate = sal_False;
pHdl = NULL;
- BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
- BOOL bWaterCan = SD_MOD()->GetWaterCan();
+ sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
+ sal_Bool bWaterCan = SD_MOD()->GetWaterCan();
const bool bReadOnly = mpDocSh->IsReadOnly();
// When the right mouse button is pressed then only select objects
// (and deselect others) as a preparation for showing the context
// menu.
const bool bSelectionOnly = rMEvt.IsRight();
- bMBDown = TRUE;
- bSelectionChanged = FALSE;
+ bMBDown = sal_True;
+ bSelectionChanged = sal_False;
if ( mpView->IsAction() )
{
if ( rMEvt.IsRight() )
mpView->BckAction();
- return TRUE;
+ return sal_True;
}
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
// The following code is executed for right clicks as well as for left
// clicks in order to modify the selection for the right button as a
// preparation for the context menu. The functions BegMarkObject() and
// BegDragObject(), however, are not called for right clicks because a)
- // it makes no sense and b) to have IsAction() return FALSE when called
+ // it makes no sense and b) to have IsAction() return sal_False when called
// from Command() which is a prerequisite for the context menu.
if ((rMEvt.IsLeft() || rMEvt.IsRight())
&& !mpView->IsAction()
@@ -201,7 +201,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
long nAngle0 = GetAngle(aMDPos - mpView->GetRef1());
nAngle0 -= 27000;
nAngle0 = NormAngle360(nAngle0);
- bMirrorSide0 = BOOL (nAngle0 < 18000L);
+ bMirrorSide0 = sal_Bool (nAngle0 < 18000L);
if (!pHdl && mpView->Is3DRotationCreationActive())
{
@@ -209,23 +209,23 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
* Wenn 3D-Rotationskoerper erstellt werden sollen, jetzt
* die Erstellung beenden
******************************************************************/
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
if(mpWindow)
mpWindow->EnterWait();
mpView->End3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
mpView->ResetCreationActive();
if(mpWindow)
mpWindow->LeaveWait();
}
- BOOL bTextEdit = FALSE;
+ sal_Bool bTextEdit = sal_False;
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) )
{
- bTextEdit = TRUE;
+ bTextEdit = sal_True;
}
if(!bTextEdit
@@ -248,24 +248,24 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
else
{
// Handle oder markiertes Objekt getroffen
- bFirstMouseMove = TRUE;
+ bFirstMouseMove = sal_True;
aDragTimer.Start();
}
if ( ! rMEvt.IsRight())
mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog);
- bReturn = TRUE;
+ bReturn = sal_True;
}
else
{
if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO))
{
mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow);
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if ( bTextEdit )
{
- UINT16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
+ sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
if (aVEvt.pObj->GetObjInventor() == SdrInventor &&
(nSdrObjKind == OBJ_TEXT ||
@@ -290,7 +290,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpWindow->ReleaseMouse();
SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL());
SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
mpWindow->ReleaseMouse();
@@ -308,7 +308,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
&aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
}
- bReturn = TRUE;
+ bReturn = sal_True;
}
else if(!rMEvt.IsMod2()
&& mpViewShell->ISA(DrawViewShell)
@@ -348,7 +348,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
// New: double click on empty space/on obj on MasterPage, leave group
mpView->LeaveOneGroup();
- bReturn = TRUE;
+ bReturn = sal_True;
}
}
}
@@ -367,8 +367,8 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- bReturn = TRUE;
- BOOL bDeactivateOLE = FALSE;
+ bReturn = sal_True;
+ sal_Bool bDeactivateOLE = sal_False;
if ( !rMEvt.IsShift() && !rMEvt.IsMod2() )
{
@@ -379,13 +379,13 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if (pIPClient && pIPClient->IsObjectInPlaceActive())
{
// OLE-Objekt wird im nachfolgenden UnmarkAll() deaktiviert
- bDeactivateOLE = TRUE;
+ bDeactivateOLE = sal_True;
}
mpView->UnmarkAll();
}
- BOOL bMarked = FALSE;
+ sal_Bool bMarked = sal_False;
if ( !rMEvt.IsMod1() && !bDeactivateOLE)
{
@@ -395,15 +395,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- BOOL bToggle = FALSE;
+ sal_Bool bToggle = sal_False;
if (rMEvt.IsShift() && mpView->GetMarkedObjectList().GetMarkCount() > 1)
{
// Bei Einfachselektion kein Toggle
- bToggle = TRUE;
+ bToggle = sal_True;
}
- bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, FALSE);
+ bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, sal_False);
}
}
@@ -431,6 +431,12 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpView->BegMarkObj(aMDPos);
}
}
+
+ if( bMarked && bTempRotation && (nSlotId == SID_OBJECT_ROTATE) && !rMEvt.IsShift() && (rMEvt.GetClicks() != 2) )
+ {
+ nSlotId = SID_OBJECT_SELECT;
+ Activate();
+ }
}
}
}
@@ -532,7 +538,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
mpView->UnmarkAllObj();
}
- BOOL bMarked = FALSE;
+ sal_Bool bMarked = sal_False;
if (!rMEvt.IsMod1())
{
@@ -542,7 +548,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), FALSE);
+ bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_False);
}
}
@@ -591,15 +597,15 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuSelection::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt)
{
- BOOL bReturn = FuDraw::MouseMove(rMEvt);
+ sal_Bool bReturn = FuDraw::MouseMove(rMEvt);
if (aDragTimer.IsActive())
{
if(bFirstMouseMove)
{
- bFirstMouseMove = FALSE;
+ bFirstMouseMove = sal_False;
}
else
{
@@ -635,9 +641,9 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
// When the right mouse button is pressed then only select objects
// (and deselect others) as a preparation for showing the context
// menu.
@@ -646,24 +652,24 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (bHideAndAnimate)
{
// Animation laeuft noch -> sofort returnieren
- bHideAndAnimate = FALSE;
+ bHideAndAnimate = sal_False;
pHdl = NULL;
mpWindow->ReleaseMouse();
- return(TRUE);
+ return(sal_True);
}
if (aDragTimer.IsActive() )
{
aDragTimer.Stop();
- bIsInDragMode = FALSE;
+ bIsInDragMode = sal_False;
}
if( !mpView )
- return (FALSE);
+ return (sal_False);
Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
- USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
if (mpView->IsFrameDragSingles() || !mpView->HasMarkablePoints())
{
@@ -676,11 +682,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* Objekt wurde verschoben
******************************************************************/
FrameView* pFrameView = mpViewShell->GetFrameView();
- BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
+ sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE);
+ bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -697,7 +703,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* Toggle zw. Selektion und Rotation
**************************************************************/
SdrObject* pSingleObj = NULL;
- ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
if (nMarkCount==1)
{
@@ -706,13 +712,15 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (nSlotId == SID_OBJECT_SELECT
&& mpView->IsRotateAllowed()
+
+ && (rMEvt.GetClicks() != 2)
&& (mpViewShell->GetFrameView()->IsClickChangeRotation()
|| (pSingleObj
&& pSingleObj->GetObjInventor()==E3dInventor))
&& ! bSelectionOnly)
{
- bTempRotation = TRUE;
+ bTempRotation = sal_True;
nSlotId = SID_OBJECT_ROTATE;
Activate();
}
@@ -726,9 +734,9 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
if (!pHdl)
{
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
mpView->Start3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
}
else if (pHdl->GetKind() != HDL_MIRX &&
pHdl->GetKind() != HDL_REF1 &&
@@ -741,15 +749,15 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
long nAngle1 = GetAngle(aPnt - mpView->GetRef1());
nAngle1 -= 27000;
nAngle1 = NormAngle360(nAngle1);
- BOOL bMirrorSide1 = BOOL (nAngle1 < 18000L);
+ sal_Bool bMirrorSide1 = sal_Bool (nAngle1 < 18000L);
if (bMirrorSide0 != bMirrorSide1)
{
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
if(mpWindow)
mpWindow->EnterWait();
mpView->End3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
nSlotId = SID_OBJECT_SELECT;
if(mpWindow)
mpWindow->LeaveWait();
@@ -799,7 +807,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
mpView->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoGeoObject(*pWaterCanCandidate));
mpView->AddUndo(pUndoAttr);
- pWaterCanCandidate->SetStyleSheet (pStyleSheet, FALSE);
+ pWaterCanCandidate->SetStyleSheet (pStyleSheet, sal_False);
mpView->EndUndo();
}
@@ -811,7 +819,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
// one now.
}
- USHORT nClicks = rMEvt.GetClicks();
+ sal_uInt16 nClicks = rMEvt.GetClicks();
if (nClicks == 2 && rMEvt.IsLeft() && bMBDown &&
!rMEvt.IsMod1() && !rMEvt.IsShift() )
@@ -819,13 +827,13 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
DoubleClick(rMEvt);
}
- bMBDown = FALSE;
+ bMBDown = sal_False;
ForcePointer(&rMEvt);
pHdl = NULL;
mpWindow->ReleaseMouse();
SdrObject* pSingleObj = NULL;
- ULONG nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
+ sal_uLong nMarkCount = mpView->GetMarkedObjectList().GetMarkCount();
if (nMarkCount==1)
{
@@ -841,7 +849,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
(pSingleObj->GetObjInventor() != SdrInventor ||
pSingleObj->GetObjIdentifier() == OBJ_MEASURE) ) )
{
- bReturn = TRUE;
+ bReturn = sal_True;
ForcePointer(&rMEvt);
pHdl = NULL;
mpWindow->ReleaseMouse();
@@ -866,11 +874,11 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
else if ( mpView->IsDragObj() )
{
FrameView* pFrameView = mpViewShell->GetFrameView();
- BOOL bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
+ sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(FALSE, TRUE);
+ bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -880,7 +888,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
mpView->EndAction();
- USHORT nDrgLog2 = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+ sal_uInt16 nDrgLog2 = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
if (Abs(aMDPos.X() - aPos.X()) < nDrgLog2 &&
@@ -903,7 +911,7 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
Abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
{
// Gruppe betreten
- mpView->MarkObj(aPnt, nHitLog, FALSE, rMEvt.IsMod1());
+ mpView->MarkObj(aPnt, nHitLog, sal_False, rMEvt.IsMod1());
}
@@ -921,14 +929,14 @@ BOOL FuSelection::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 FuSelection::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt)
{
- BOOL bReturn = FALSE;
+ sal_Bool bReturn = sal_False;
switch (rKEvt.GetKeyCode().GetCode())
{
@@ -975,7 +983,7 @@ void FuSelection::Activate()
// (gemapter) Slot wird explizit auf Rotate gesetzt
if( mpViewShell->ISA(DrawViewShell) )
{
- USHORT* pSlotArray =
+ sal_uInt16* pSlotArray =
static_cast<DrawViewShell*>(mpViewShell)->GetSlotArray();
pSlotArray[ 1 ] = SID_OBJECT_ROTATE;
}
@@ -1071,7 +1079,7 @@ void FuSelection::Activate()
case SID_CONVERT_TO_3D_LATHE:
{
eMode = SDRDRAG_MIRROR;
- bSuppressChangesOfSelection = TRUE;
+ bSuppressChangesOfSelection = sal_True;
if ( mpView->GetDragMode() != eMode )
mpView->SetDragMode(eMode);
@@ -1079,7 +1087,7 @@ void FuSelection::Activate()
if (!mpView->Is3DRotationCreationActive())
mpView->Start3DCreation();
- bSuppressChangesOfSelection = FALSE;
+ bSuppressChangesOfSelection = sal_False;
}
break;
@@ -1095,7 +1103,7 @@ void FuSelection::Activate()
if (nSlotId != SID_OBJECT_ROTATE)
{
- bTempRotation = FALSE;
+ bTempRotation = sal_False;
}
FuDraw::Activate();
@@ -1123,7 +1131,7 @@ void FuSelection::Deactivate()
void FuSelection::SelectionHasChanged()
{
- bSelectionChanged = TRUE;
+ bSelectionChanged = sal_True;
FuDraw::SelectionHasChanged();
@@ -1146,17 +1154,17 @@ void FuSelection::SelectionHasChanged()
|*
\************************************************************************/
-void FuSelection::SetEditMode(USHORT nMode)
+void FuSelection::SetEditMode(sal_uInt16 nMode)
{
nEditMode = nMode;
if (nEditMode == SID_BEZIER_INSERT)
{
- mpView->SetInsObjPointMode(TRUE);
+ mpView->SetInsObjPointMode(sal_True);
}
else
{
- mpView->SetInsObjPointMode(FALSE);
+ mpView->SetInsObjPointMode(sal_False);
}
ForcePointer();
@@ -1172,11 +1180,11 @@ void FuSelection::SetEditMode(USHORT nMode)
|*
\************************************************************************/
-BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
+sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
- BOOL bAnimated = FALSE;
- BOOL bClosed = pObj->IsClosedObj();
- BOOL bFilled = FALSE;
+ sal_Bool bAnimated = sal_False;
+ sal_Bool bClosed = pObj->IsClosedObj();
+ sal_Bool bFilled = sal_False;
if (bClosed)
{
@@ -1189,7 +1197,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
}
const SetOfByte* pVisiLayer = &mpView->GetSdrPageView()->GetVisibleLayers();
- USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+ sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
const long n2HitLog = nHitLog * 2;
Point aHitPosR(rPos);
Point aHitPosL(rPos);
@@ -1220,13 +1228,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
mpWindow->ReleaseMouse();
pFrame->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
&aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
}
else if (!mpDocSh->ISA(GraphicDocShell) &&
@@ -1248,7 +1256,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark());
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1262,13 +1270,13 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
SfxStringItem aStrItem(SID_FILE_NAME, sBookmark);
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame);
- SfxBoolItem aBrowseItem( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowseItem( SID_BROWSE, sal_True );
pFrame->GetDispatcher()->
Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
&aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L);
}
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1279,7 +1287,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1290,7 +1298,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1301,7 +1309,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1312,7 +1320,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
mpViewShell->GetViewFrame()->GetDispatcher()->
Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
&aItem, 0L);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1327,7 +1335,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
(void)e;
}
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1335,9 +1343,9 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
// Verb zuweisen
mpView->UnmarkAll();
- mpView->MarkObj(pObj, mpView->GetSdrPageView(), FALSE, FALSE);
+ mpView->MarkObj(pObj, mpView->GetSdrPageView(), sal_False, sal_False);
pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb);
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1351,7 +1359,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
if( INET_PROT_FILE == aURL.GetProtocol() )
{
SfxStringItem aUrl( SID_FILE_NAME, aURL.GetMainURL( INetURLObject::NO_DECODE ) );
- SfxBoolItem aBrowsing( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowsing( SID_BROWSE, sal_True );
SfxViewFrame* pViewFrm = SfxViewFrame::Current();
if (pViewFrm)
@@ -1362,7 +1370,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
0L );
}
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
break;
@@ -1383,17 +1391,17 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
*pInArgs, aRet, aOutArgsIndex, aOutArgs);
// Check the return value from the script
- BOOL bTmp = sal_False;
+ sal_Bool bTmp = sal_False;
if ( eErr == ERRCODE_NONE &&
aRet.getValueType() == getCppuBooleanType() &&
sal_True == ( aRet >>= bTmp ) &&
- bTmp == TRUE )
+ bTmp == sal_True )
{
- bAnimated = TRUE;
+ bAnimated = sal_True;
}
else
{
- bAnimated = FALSE;
+ bAnimated = sal_False;
}
}
else
@@ -1422,7 +1430,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
default:
{
- bAnimated = FALSE;
+ bAnimated = sal_False;
}
break;
}
@@ -1446,7 +1454,7 @@ BOOL FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
break;
default:
- bAnimated = FALSE;
+ bAnimated = sal_False;
break;
}
}
@@ -1484,7 +1492,7 @@ SdrObject* FuSelection::pickObject (const Point& rTestPoint)
{
SdrObject* pObject = NULL;
SdrPageView* pPageView;
- USHORT nHitLog = USHORT (mpWindow->PixelToLogic(Size(HITPIX,0)).Width());
+ sal_uInt16 nHitLog = sal_uInt16 (mpWindow->PixelToLogic(Size(HITPIX,0)).Width());
mpView->PickObj (rTestPoint, nHitLog, pObject, pPageView, SDRSEARCH_PICKMARKABLE);
return pObject;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-14 11:35:07 +0000