diff options
author | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-11-26 14:53:25 +0000 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-12-01 07:43:31 +0000 |
commit | 14596452e781f6a66bcc63b0c447c852df1f2896 (patch) | |
tree | c225569f229679084b081021c8c51cfdaf12eb21 /sfx2 | |
parent | add test case for fdo#86518 (diff) | |
download | core-14596452e781f6a66bcc63b0c447c852df1f2896.tar.gz core-14596452e781f6a66bcc63b0c447c852df1f2896.zip |
fdo#84938: replace EVENT_ constants with enum
Change-Id: I8275832d8dae43b374bddd48520d11592e9a6a1f
Reviewed-on: https://gerrit.libreoffice.org/13134
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 28 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/partwnd.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/PopupContainer.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/frame2.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/view/printer.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/userinputinterception.cxx | 14 |
13 files changed, 49 insertions, 49 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index baec605a2cad..ae3a2cdccaac 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -397,7 +397,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; - if ( rNEvt.GetType() == EVENT_KEYINPUT && + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); @@ -491,7 +491,7 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; - if ( rNEvt.GetType() == EVENT_KEYINPUT && + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); @@ -850,7 +850,7 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) bool bHandled = false; if ( !IsInDropDown() && rNEvt.GetWindow() == GetSubEdit() && - rNEvt.GetType() == EVENT_KEYINPUT && + rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { aSearchLink.Call( NULL ); @@ -884,7 +884,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchResultsBox(vcl:: bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; - if ( rNEvt.GetType() == EVENT_KEYINPUT && + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); @@ -1208,8 +1208,8 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { bool nRet = false; - sal_uInt16 nType = rNEvt.GetType(); - if ( EVENT_KEYINPUT == nType ) + MouseNotifyEvent nType = rNEvt.GetType(); + if ( MouseNotifyEvent::KEYINPUT == nType ) { sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); if ( KEY_DELETE == nCode && GetEntryCount() > 0 ) @@ -1223,7 +1223,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) nRet = true; } } - else if ( EVENT_COMMAND == nType ) + else if ( MouseNotifyEvent::COMMAND == nType ) { const CommandEvent* pCEvt = rNEvt.GetCommandEvent(); if ( pCEvt->GetCommand() == COMMAND_CONTEXTMENU ) @@ -1590,8 +1590,8 @@ Size SfxHelpIndexWindow_Impl::GetOptimalSize() const bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt) { bool nDone = false; - sal_uInt16 nType = rNEvt.GetType(); - if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) + MouseNotifyEvent nType = rNEvt.GetType(); + if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() ) { const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); sal_uInt16 nCode = rKeyCode.GetCode(); @@ -1808,7 +1808,7 @@ TextWin_Impl::~TextWin_Impl() bool TextWin_Impl::Notify( NotifyEvent& rNEvt ) { - if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB ) + if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB ) return GetParent()->Notify( rNEvt ); else return DockingWindow::Notify( rNEvt ); @@ -2316,8 +2316,8 @@ void SfxHelpTextWindow_Impl::Resize() bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { bool nDone = false; - sal_uInt16 nType = rNEvt.GetType(); - if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() ) + MouseNotifyEvent nType = rNEvt.GetType(); + if ( MouseNotifyEvent::COMMAND == nType && rNEvt.GetCommandEvent() ) { const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent(); vcl::Window* pCmdWin = rNEvt.GetWindow(); @@ -2410,7 +2410,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) nDone = true; } } - else if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) + else if ( MouseNotifyEvent::KEYINPUT == nType && rNEvt.GetKeyEvent() ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const vcl::KeyCode& rKeyCode = pKEvt->GetKeyCode(); @@ -3002,7 +3002,7 @@ SfxHelpWindow_Impl::~SfxHelpWindow_Impl() bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { bool bHandled = false; - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // Backward == <ALT><LEFT> or <BACKSPACE> Forward == <ALT><RIGHT> const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index ae4fea2dba1e..040eb186cce2 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -75,7 +75,7 @@ ResizableMultiLineEdit::~ResizableMultiLineEdit () bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) { bool nDone = false; - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent& rKEvt = *rNEvt.GetKeyEvent(); vcl::KeyCode aCode = rKEvt.GetKeyCode(); @@ -92,7 +92,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) break; } } - else if ( rNEvt.GetType() == EVENT_LOSEFOCUS && !mbIsInGrabFocus ) + else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !mbIsInGrabFocus ) { mpItem->setTitle( GetText() ); mpItem->setEditTitle(false, false); diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 02bbb08586e4..95084beb5504 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -374,7 +374,7 @@ void BackingWindow::Paint( const Rectangle& ) bool BackingWindow::PreNotify( NotifyEvent& rNEvt ) { - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent* pEvt = rNEvt.GetKeyEvent(); const vcl::KeyCode& rKeyCode(pEvt->GetKeyCode()); @@ -409,7 +409,7 @@ bool BackingWindow::PreNotify( NotifyEvent& rNEvt ) bool BackingWindow::Notify( NotifyEvent& rNEvt ) { - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // try the 'normal' accelerators (so that eg. Ctrl+Q works) if( !mpAccExec ) diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 07e18cb68302..dbabdba1fa9f 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -329,17 +329,17 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) */ bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) { - if ( rEvt.GetType() == EVENT_GETFOCUS ) + if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); } - else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) + else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) { pBindings->SetActiveFrame( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > () ); pImp->pMgr->Deactivate_Impl(); } - else if( rEvt.GetType() == EVENT_KEYINPUT ) + else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // First, allow KeyInput for Dialog functions ( TAB etc. ) if ( !ModelessDialog::Notify( rEvt ) && SfxViewShell::Current() ) @@ -417,12 +417,12 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) */ { - if ( rEvt.GetType() == EVENT_GETFOCUS ) + if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); } - else if ( rEvt.GetType() == EVENT_LOSEFOCUS ) + else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) { if ( !HasChildPathFocus() ) { @@ -430,7 +430,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) pImp->pMgr->Deactivate_Impl(); } } - else if( rEvt.GetType() == EVENT_KEYINPUT ) + else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // First, allow KeyInput for Dialog functions if ( !FloatingWindow::Notify( rEvt ) && SfxViewShell::Current() ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 1f84bd2f0a7b..fa4c31cc056c 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1767,7 +1767,7 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) { - if ( rEvt.GetType() == EVENT_GETFOCUS ) + if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { if (pMgr != NULL) pBindings->SetActiveFrame( pMgr->GetFrame() ); @@ -1783,7 +1783,7 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) DockingWindow::Notify( rEvt ); return true; } - else if( rEvt.GetType() == EVENT_KEYINPUT ) + else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // First, allow KeyInput for Dialog functions if ( !DockingWindow::Notify( rEvt ) && SfxViewShell::Current() ) @@ -1791,7 +1791,7 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); return true; } - else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) + else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) { pBindings->SetActiveFrame( NULL ); if (pMgr != NULL) diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 245dd612308f..6420558452e8 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -181,7 +181,7 @@ bool SfxPartDockWnd_Impl::QueryClose() bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) { - if( rEvt.GetType() == EVENT_GETFOCUS ) + if( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { SfxChildWindow* pChild = GetChildWindow_Impl(); if( pChild ) diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 72c5a18a1c73..8b8e1bf210be 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -206,7 +206,7 @@ IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop) bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) { bool nRet = false; - if( rNEvt.GetType() == EVENT_KEYINPUT ) + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); if(!rKeyCode.GetModifier()) @@ -423,7 +423,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) // handle <RETURN> as double click bool nRet = false; - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() ) diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 6e2f3919ffc1..534bd306027d 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -190,7 +190,7 @@ void Deck::DataChanged (const DataChangedEvent& rEvent) bool Deck::Notify (NotifyEvent& rEvent) { - if (rEvent.GetType() == EVENT_COMMAND) + if (rEvent.GetType() == MouseNotifyEvent::COMMAND) { CommandEvent* pCommandEvent = reinterpret_cast<CommandEvent*>(rEvent.GetData()); if (pCommandEvent != NULL) diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 97566fba0a7a..92e5e20f37a3 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -39,7 +39,7 @@ PopupContainer::~PopupContainer (void) long PopupContainer::Notify (NotifyEvent& rEvent) { - if (rEvent.GetType() == EVENT_LOSEFOCUS) + if (rEvent.GetType() == MouseNotifyEvent::LOSEFOCUS) { if( ! HasChildPathFocus(sal_True)) EndPopupMode(); diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 0f038a13c79b..506af77bc3b2 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -120,7 +120,7 @@ void SidebarToolBox::Paint (const Rectangle& rRect) bool SidebarToolBox::Notify (NotifyEvent& rEvent) { - if (rEvent.GetType() == EVENT_KEYINPUT) + if (rEvent.GetType() == MouseNotifyEvent::KEYINPUT) { if (rEvent.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB) { diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 5b3a6ccac95a..037d7ea525ae 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -107,7 +107,7 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) if ( !pView || !pView->GetObjectShell() ) return Window::Notify( rNEvt ); - if ( rNEvt.GetType() == EVENT_GETFOCUS ) + if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() ) { @@ -120,17 +120,17 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) pView->GetBindings().Invalidate( SID_PASTE_SPECIAL ); return true; } - else if( rNEvt.GetType() == EVENT_KEYINPUT ) + else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) ) return true; } - else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ ) + else if ( rNEvt.GetType() == MouseNotifyEvent::EXECUTEDIALOG /*|| rNEvt.GetType() == MouseNotifyEvent::INPUTDISABLE*/ ) { pView->SetModalMode( true ); return true; } - else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) + else if ( rNEvt.GetType() == MouseNotifyEvent::ENDEXECUTEDIALOG /*|| rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE*/ ) { pView->SetModalMode( false ); return true; @@ -141,15 +141,15 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { - sal_uInt16 nType = rNEvt.GetType(); - if ( nType == EVENT_KEYINPUT || nType == EVENT_KEYUP ) + MouseNotifyEvent nType = rNEvt.GetType(); + if ( nType == MouseNotifyEvent::KEYINPUT || nType == MouseNotifyEvent::KEYUP ) { SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); SfxViewShell* pShell = pView ? pView->GetViewShell() : NULL; if ( pShell && pShell->HasKeyListeners_Impl() && pShell->HandleNotifyEvent_Impl( rNEvt ) ) return true; } - else if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) + else if ( nType == MouseNotifyEvent::MOUSEBUTTONUP || nType == MouseNotifyEvent::MOUSEBUTTONDOWN ) { vcl::Window* pWindow = rNEvt.GetWindow(); SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); @@ -160,7 +160,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) return true; } - if ( nType == EVENT_MOUSEBUTTONDOWN ) + if ( nType == MouseNotifyEvent::MOUSEBUTTONDOWN ) { vcl::Window* pWindow = rNEvt.GetWindow(); const MouseEvent* pMEvent = rNEvt.GetMouseEvent(); diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 7ade26dc6c68..e5de62ccd922 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -253,7 +253,7 @@ short SfxPrintOptionsDialog::Execute() bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { if ( rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_F1 && pDlgImpl->mbHelpDisabled ) return true; // help disabled -> <F1> does nothing diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index 327f40f429b2..a92b575d42d1 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -171,13 +171,13 @@ namespace sfx2 { Reference < XInterface > xHoldAlive( m_pData->m_rControllerImpl ); - sal_uInt16 nType = _rEvent.GetType(); + MouseNotifyEvent nType = _rEvent.GetType(); bool bHandled = false; switch ( nType ) { - case EVENT_KEYINPUT: - case EVENT_KEYUP: + case MouseNotifyEvent::KEYINPUT: + case MouseNotifyEvent::KEYUP: { KeyEvent aEvent; lcl_initKeyEvent( aEvent, *_rEvent.GetKeyEvent() ); @@ -193,7 +193,7 @@ namespace sfx2 try { - if ( nType == EVENT_KEYINPUT ) + if ( nType == MouseNotifyEvent::KEYINPUT ) bHandled = xHandler->keyPressed( aEvent ); else bHandled = xHandler->keyReleased( aEvent ); @@ -214,8 +214,8 @@ namespace sfx2 } break; - case EVENT_MOUSEBUTTONDOWN: - case EVENT_MOUSEBUTTONUP: + case MouseNotifyEvent::MOUSEBUTTONDOWN: + case MouseNotifyEvent::MOUSEBUTTONUP: { MouseEvent aEvent; lcl_initMouseEvent( aEvent, *_rEvent.GetMouseEvent() ); @@ -231,7 +231,7 @@ namespace sfx2 try { - if ( nType == EVENT_MOUSEBUTTONDOWN ) + if ( nType == MouseNotifyEvent::MOUSEBUTTONDOWN ) bHandled = xHandler->mousePressed( aEvent ); else bHandled = xHandler->mouseReleased( aEvent ); |