5 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 86aba605789b..b398105e02e4 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -343,7 +343,7 @@ void SwAddressControl_Impl::Command( const CommandEvent& rCEvt )
 
 bool SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt )
 {
-    if(rNEvt.GetType() == EVENT_COMMAND)
+    if(rNEvt.GetType() == MouseNotifyEvent::COMMAND)
     {
         const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
         const sal_uInt16 nCmd = pCEvt->GetCommand();
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index f96c004c1b7f..675b1e8c7b32 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -999,7 +999,7 @@ void SwAssignFieldsControl::Command( const CommandEvent& rCEvt )
 
 bool SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt )
 {
-    if(rNEvt.GetType() == EVENT_COMMAND)
+    if(rNEvt.GetType() == MouseNotifyEvent::COMMAND)
     {
         const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
         const sal_uInt16 nCmd = pCEvt->GetCommand();
@@ -1286,12 +1286,12 @@ void AddressMultiLineEdit::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 bool AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
 {
     bool nHandled = false;
-    if( EVENT_KEYINPUT == rNEvt.GetType()  &&
+    if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType()  &&
         rNEvt.GetKeyEvent()->GetCharCode())
     {
         nHandled = true;
     }
-    else if(EVENT_MOUSEBUTTONDOWN == rNEvt.GetType()) {
+    else if(MouseNotifyEvent::MOUSEBUTTONDOWN == rNEvt.GetType()) {
         const MouseEvent *pMEvt = rNEvt.GetMouseEvent();
         if(pMEvt->GetClicks() >= 2)
             nHandled = true;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 7df0addd74f5..79d845a7d767 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1264,7 +1264,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSelectionListBox(vcl::
 bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
 {
     bool nHandled = ListBox::PreNotify( rNEvt );
-    if ( rNEvt.GetType() == EVENT_KEYUP )
+    if ( rNEvt.GetType() == MouseNotifyEvent::KEYUP )
     {
         const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
         const vcl::KeyCode aKeyCode = pKEvt->GetKeyCode();
@@ -1272,7 +1272,7 @@ bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
         if( aKeyCode.GetCode() == KEY_SPACE && !nModifier)
             bCallAddSelection = true;
     }
-    if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
+    if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
     {
         const MouseEvent* pMEvt = rNEvt.GetMouseEvent();
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 70b06ab6cc20..868a9dc4577e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2142,7 +2142,7 @@ void SwTOXEntryTabPage::SetFocus2theAllBtn()
 
 bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt )
 {
-    if ( rNEvt.GetType() == EVENT_KEYINPUT )
+    if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
         const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
         vcl::KeyCode aCode = rKEvt.GetKeyCode();
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 3fff8c96cb9f..24877e0ccaca 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -217,7 +217,7 @@ sal_Int32 BookmarkCombo::GetSelectEntryPos( sal_Int32 nSelIndex ) const
 bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
 {
     bool nHandled = false;
-    if( EVENT_KEYINPUT == rNEvt.GetType() &&
+    if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType() &&
          rNEvt.GetKeyEvent()->GetCharCode() )
     {
         OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );