summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-18 09:00:02 +0200
committerNoel Grandin <noel@peralex.com>2016-08-19 08:18:37 +0200
commit565e08cdca16e9e166da85e3c4b9c9a375a186bc (patch)
tree9a577c6a05b8c0c3932a5e55bfc75a002572efa6 /sc
parenta6a2b2826dbf248821147212a2ee9ecdcadd301f (diff)
convert SdrEventKind to scoped enum
Change-Id: I96c298089d9ca75909380843c7dbc255c4953b88
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/drawfunc/fuconpol.cxx6
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx2
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx2
-rw-r--r--sc/source/ui/view/gridwin5.cxx2
4 files changed, 6 insertions, 6 deletions
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());