diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-18 09:00:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-19 08:18:37 +0200 |
| commit | 565e08cdca16e9e166da85e3c4b9c9a375a186bc (patch) | |
| tree | 9a577c6a05b8c0c3932a5e55bfc75a002572efa6 /sd | |
| parent | a6a2b2826dbf248821147212a2ee9ecdcadd301f (diff) | |
convert SdrEventKind to scoped enum
Change-Id: I96c298089d9ca75909380843c7dbc255c4953b88
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuconbez.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/func/fusel.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index bc69485e26d4..229274792f2f 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -86,10 +86,10 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) mpView->SetEditMode(SDREDITMODE_CREATE); } - if (aVEvt.eEvent == SDREVENT_BEGTEXTEDIT) + if (aVEvt.eEvent == SdrEventKind::BeginTextEdit) { // here, we do not allow text input - aVEvt.eEvent = SDREVENT_BEGDRAGOBJ; + aVEvt.eEvent = SdrEventKind::BeginDragObj; mpView->EnableExtendedMouseEventDispatcher(false); } else @@ -138,7 +138,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) mpView->MouseButtonUp(rMEvt, mpWindow); } - if (aVEvt.eEvent == SDREVENT_ENDCREATE) + if (aVEvt.eEvent == SdrEventKind::EndCreate) { bReturn = true; diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index f8d20b8b9a37..4c81c81006de 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -262,7 +262,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } } else if ( !rMEvt.IsMod2() && rMEvt.GetClicks() == 1 && - aVEvt.eEvent == SDREVENT_EXECUTEURL ) + aVEvt.eEvent == SdrEventKind::ExecuteUrl ) { mpWindow->ReleaseMouse(); SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL()); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index a27c0c49a7e9..fdd492c31d6d 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -308,7 +308,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } } - if ( aVEvt.eEvent == SDREVENT_EXECUTEURL || + if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl || eHit == SDRHIT_HANDLE || eHit == SDRHIT_MARKEDOBJECT || eHit == SDRHIT_TEXTEDITOBJ || @@ -329,7 +329,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) SetInEditMode(rMEvt, true); } - else if (aVEvt.eEvent == SDREVENT_EXECUTEURL && !rMEvt.IsMod2()) + else if (aVEvt.eEvent == SdrEventKind::ExecuteUrl && !rMEvt.IsMod2()) { // execute URL mpWindow->ReleaseMouse(); |