From 565e08cdca16e9e166da85e3c4b9c9a375a186bc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 18 Aug 2016 09:00:02 +0200 Subject: convert SdrEventKind to scoped enum Change-Id: I96c298089d9ca75909380843c7dbc255c4953b88 --- sc/source/ui/drawfunc/fuconpol.cxx | 6 +++--- sc/source/ui/drawfunc/fudraw.cxx | 2 +- sc/source/ui/drawfunc/fusel.cxx | 2 +- sc/source/ui/view/gridwin5.cxx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sc') diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index a3b3686d73a0..06f16eb2840f 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -64,10 +64,10 @@ bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt) SdrViewEvent aVEvt; (void)pView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); - if (aVEvt.eEvent == SDREVENT_BEGTEXTEDIT) + if (aVEvt.eEvent == SdrEventKind::BeginTextEdit) { // Texteingabe hier nicht zulassen - aVEvt.eEvent = SDREVENT_BEGDRAGOBJ; + aVEvt.eEvent = SdrEventKind::BeginDragObj; pView->EnableExtendedMouseEventDispatcher(false); } else @@ -112,7 +112,7 @@ bool FuConstPolygon::MouseButtonUp(const MouseEvent& rMEvt) pView->MouseButtonUp(rMEvt, pWindow); - if (aVEvt.eEvent == SDREVENT_ENDCREATE) + if (aVEvt.eEvent == SdrEventKind::EndCreate) { bReturn = true; bSimple = true; // Doppelklick nicht weiterreichen diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index c6367848a9cb..862f480e6b37 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -682,7 +682,7 @@ static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWi aVEvt.pObj, pWindow->PixelToLogic(rPosPixel), *pWindow ) ) return true; - if ( aVEvt.eEvent == SDREVENT_EXECUTEURL ) + if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl ) return true; } diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 2ac0f5b0a131..8141c0ed71a9 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -238,7 +238,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) sTarget = pIMapObj->GetTarget(); } } - if ( aVEvt.eEvent == SDREVENT_EXECUTEURL && aVEvt.pURLField ) // URL + if ( aVEvt.eEvent == SdrEventKind::ExecuteUrl && aVEvt.pURLField ) // URL { sURL = aVEvt.pURLField->GetURL(); sTarget = aVEvt.pURLField->GetTargetFrame(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 2d853957135f..19ef33895296 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -333,7 +333,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) // URL in shape text or at shape itself (URL in text overrides object URL) if ( aHelpText.isEmpty() ) { - if( aVEvt.eEvent == SDREVENT_EXECUTEURL ) + if( aVEvt.eEvent == SdrEventKind::ExecuteUrl ) { aHelpText = aVEvt.pURLField->GetURL(); aPixRect = LogicToPixel(aVEvt.pObj->GetLogicRect()); -- cgit