3 files changed, 7 insertions, 7 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 5573f72f152f..b17da4f5d3d2 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -388,8 +388,8 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
 
 void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    sal_uInt16 nSwitch=rNEvt.GetType();
-    if(nSwitch==EVENT_GETFOCUS && !bIsShutDown)
+    MouseNotifyEvent nSwitch=rNEvt.GetType();
+    if(nSwitch==MouseNotifyEvent::GETFOCUS && !bIsShutDown)
     {
         vcl::Window* pWin=rNEvt.GetWindow();
         if(pWin!=NULL)
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index e99674f50623..e44455e41424 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -49,8 +49,8 @@ bool FormulaListBox::PreNotify( NotifyEvent& rNEvt )
 
     bool nResult = ListBox::PreNotify(rNEvt);
 
-    sal_uInt16 nSwitch=aNotifyEvt.GetType();
-    if(nSwitch==EVENT_KEYINPUT)
+    MouseNotifyEvent nSwitch=aNotifyEvt.GetType();
+    if(nSwitch==MouseNotifyEvent::KEYINPUT)
     {
         KeyInput(*aNotifyEvt.GetKeyEvent());
     }
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index c02ed91cc37f..65fd1f4d4e2b 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -398,8 +398,8 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
 
     if(pMEdit==NULL) return nResult;
 
-    sal_uInt16 nSwitch=rNEvt.GetType();
-    if(nSwitch==EVENT_KEYINPUT)// || nSwitch==EVENT_KEYUP)
+    MouseNotifyEvent nSwitch=rNEvt.GetType();
+    if(nSwitch==MouseNotifyEvent::KEYINPUT)// || nSwitch==MouseNotifyEvent::KEYUP)
     {
         const vcl::KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
         sal_uInt16 nKey=aKeyCode.GetCode();
@@ -418,7 +418,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
     {
         nResult=Control::PreNotify(rNEvt);
 
-        if(nSwitch==EVENT_MOUSEBUTTONDOWN || nSwitch==EVENT_MOUSEBUTTONUP)
+        if(nSwitch==MouseNotifyEvent::MOUSEBUTTONDOWN || nSwitch==MouseNotifyEvent::MOUSEBUTTONUP)
         {
             bMouseFlag=true;
             Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ) );