diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-19 14:31:46 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-08-22 08:24:48 +0200 |
commit | 2309217a55c8d5e6bdde2a6d4775f10415505fcd (patch) | |
tree | 3d6be2306ba94eca297007152c4f53775929a358 /sd/source/ui | |
parent | e382aa144561dab9295b17c4d5b29d4bd33ad687 (diff) |
convert SdrViewEditMode to scoped enum
Change-Id: I1f58efceaee7346187f92c7ebaf901abc305ac33
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/func/fuconbez.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuconstr.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fudraw.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/futext.cxx | 18 |
5 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 58432e878b94..a3e09bd49036 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -79,11 +79,11 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) if (eHit == SdrHitKind::Handle || rMEvt.IsMod1()) { - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); } else { - mpView->SetEditMode(SDREDITMODE_CREATE); + mpView->SetEditMode(SdrViewEditMode::Create); } if (aVEvt.eEvent == SdrEventKind::BeginTextEdit) diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index de0972eb192d..7b48cef8c76c 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -228,14 +228,14 @@ bool FuConstruct::KeyInput(const KeyEvent& rKEvt) void FuConstruct::Activate() { - mpView->SetEditMode(SDREDITMODE_CREATE); + mpView->SetEditMode(SdrViewEditMode::Create); FuDraw::Activate(); } void FuConstruct::Deactivate() { FuDraw::Deactivate(); - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); } /** diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index d5f309d0f714..f161acc49293 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -205,7 +205,7 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) if ( bHelpLine && !mpView->IsCreateObj() - && ((mpView->GetEditMode() == SDREDITMODE_EDIT && !bHitHdl) || (rMEvt.IsShift() && bSnapModPressed)) ) + && ((mpView->GetEditMode() == SdrViewEditMode::Edit && !bHitHdl) || (rMEvt.IsShift() && bSnapModPressed)) ) { mpWindow->CaptureMouse(); mpView->BegDragHelpLine(nHelpLine, pPV); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 9e62290c83f1..d5d61ee9e764 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1013,7 +1013,7 @@ void FuSelection::Activate() { SdrDragMode eMode; mpView->ResetCreationActive(); - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); switch( nSlotId ) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 0bd82738094a..e86d391214a3 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -187,7 +187,7 @@ void FuText::DoExecute( SfxRequest& ) RID_DRAW_TEXT_TOOLBOX); mpView->SetCurrentObj(OBJ_TEXT); - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); MouseEvent aMEvt(mpWindow->GetPointerPosPixel()); @@ -284,7 +284,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } mpView->SetCurrentObj(OBJ_TEXT); - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); } if (rMEvt.IsLeft() || rMEvt.IsRight()) @@ -416,7 +416,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { // create object mpView->SetCurrentObj(OBJ_TEXT); - mpView->SetEditMode(SDREDITMODE_CREATE); + mpView->SetEditMode(SdrViewEditMode::Create); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, nullptr, nDrgLog); } @@ -761,7 +761,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { // text body (left-justified AutoGrow) mpView->SetCurrentObj(OBJ_TEXT); - mpView->SetEditMode(SDREDITMODE_CREATE); + mpView->SetEditMode(SdrViewEditMode::Create); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, nullptr, nDrgLog); @@ -957,7 +957,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) if( bPermanent ) { mpView->SetCurrentObj(OBJ_TEXT); - mpView->SetEditMode(SDREDITMODE_CREATE); + mpView->SetEditMode(SdrViewEditMode::Create); } if (!bReturn) @@ -984,7 +984,7 @@ void FuText::Activate() FuConstruct::Activate(); if( pOLV ) - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); } void FuText::Deactivate() @@ -1010,9 +1010,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) mpView->SetCurrentObj(OBJ_TEXT); if( bPermanent ) - mpView->SetEditMode(SDREDITMODE_CREATE); + mpView->SetEditMode(SdrViewEditMode::Create); else - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); bool bEmptyOutliner = false; @@ -1334,7 +1334,7 @@ bool FuText::cancel() mxTextObj.reset(nullptr); mpView->SetCurrentObj(OBJ_TEXT); - mpView->SetEditMode(SDREDITMODE_EDIT); + mpView->SetEditMode(SdrViewEditMode::Edit); return true; } else |