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 /dbaccess/source | |
parent | 96ec51292301a105effacfcceec44f696ee6e0f0 (diff) |
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 'dbaccess/source')
19 files changed, 31 insertions, 31 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 184fb484161f..559f9be2753f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -142,7 +142,7 @@ namespace bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt ) { bool nRet = Window::Notify( rNEvt ); - if ( rNEvt.GetType() == EVENT_INPUTENABLE && IsInputEnabled() ) + if ( rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE && IsInputEnabled() ) PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput) ); return nRet; } diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 3cc43f889c21..57371222b376 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -260,7 +260,7 @@ bool OApplicationView::PreNotify( NotifyEvent& rNEvt ) { switch(rNEvt.GetType()) { - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: if( m_pWin && getPanel() && getPanel()->HasChildPathFocus() ) m_eChildFocus = PANELSWAP; else if ( m_pWin && getDetailView() && getDetailView()->HasChildPathFocus() ) @@ -268,7 +268,7 @@ bool OApplicationView::PreNotify( NotifyEvent& rNEvt ) else m_eChildFocus = NONE; break; - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); // give the pane the chance to intercept mnemonic accelerators diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 9292887c63e3..f41289e3a797 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -305,7 +305,7 @@ void UnoDataBrowserView::_disposing( const ::com::sun::star::lang::EventObject& bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt ) { bool nDone = false; - if(rNEvt.GetType() == EVENT_KEYINPUT) + if(rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) { bool bGrabAllowed = isGrabVclControlFocusAllowed(this); if ( bGrabAllowed ) diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index b8509063ed43..46e87e735dfd 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -122,7 +122,7 @@ namespace dbaui bool bHandled = false; switch ( _rNEvt.GetType() ) { - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: { const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); const vcl::KeyCode& aKeyCode = pKeyEvent->GetKeyCode(); @@ -131,9 +131,9 @@ namespace dbaui return true; } // NO break - case EVENT_KEYUP: - case EVENT_MOUSEBUTTONDOWN: - case EVENT_MOUSEBUTTONUP: + case MouseNotifyEvent::KEYUP: + case MouseNotifyEvent::MOUSEBUTTONDOWN: + case MouseNotifyEvent::MOUSEBUTTONUP: bHandled = m_rController.interceptUserInput( _rNEvt ); break; } diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 6fd60f549241..9c4393e63d82 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -197,9 +197,9 @@ namespace dbaui bool ORelationControl::PreNotify(NotifyEvent& rNEvt) { - if (rNEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) + if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate)); - else if (rNEvt.GetType() == EVENT_GETFOCUS) + else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) PostUserEvent(LINK(this, ORelationControl, AsynchActivate)); return EditBrowseBox::PreNotify(rNEvt); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index ced37d667a8c..2fab5c9627c8 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -145,14 +145,14 @@ void OTableGrantControl::Resize() bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) { - if (rNEvt.GetType() == EVENT_LOSEFOCUS) + if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) if (!HasChildPathFocus()) { if (m_nDeactivateEvent) Application::RemoveUserEvent(m_nDeactivateEvent); m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchDeactivate)); } - if (rNEvt.GetType() == EVENT_GETFOCUS) + if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) { if (m_nDeactivateEvent) Application::RemoveUserEvent(m_nDeactivateEvent); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 0c404dc12b0e..4e61980ff574 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -560,14 +560,14 @@ namespace dbaui { switch (_rNEvt.GetType()) { - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: if (m_pConnectionURL->IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) { // a descendant of the URL edit field got the focus m_pConnectionURL->SaveValueNoPrefix(); } break; - case EVENT_LOSEFOCUS: + case MouseNotifyEvent::LOSEFOCUS: if (m_pConnectionURL->IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) { // a descendant of the URL edit field lost the focus if (!commitURL()) diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 72e97daf5449..1adeadf5db6d 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -383,14 +383,14 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) bool nDone = false; switch( rEvt.GetType() ) { - case EVENT_MOUSEBUTTONDOWN: + case MouseNotifyEvent::MOUSEBUTTONDOWN: { const MouseEvent* pMEvt = rEvt.GetMouseEvent(); if(pMEvt->IsRight() && !pMEvt->GetModifier()) nDone = true; } break; - case EVENT_COMMAND: + case MouseNotifyEvent::COMMAND: { if(!IsPrimaryKeyAllowed()) break; diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 2944efcb97a5..c2dd15dee41a 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1236,7 +1236,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) bool bHandled = false; switch (rNEvt.GetType()) { - case EVENT_COMMAND: + case MouseNotifyEvent::COMMAND: { const CommandEvent* pCommand = rNEvt.GetCommandEvent(); if (pCommand->GetCommand() == COMMAND_WHEEL) @@ -1253,7 +1253,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) } } break; - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: { if (m_aTableMap.empty()) // no tab wins -> no conns -> no traveling @@ -1386,7 +1386,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) } } break; - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: { if (m_aTableMap.empty()) // no tab wins -> no conns -> no focus change diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index e21cfe7135ce..946f03cbe320 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2772,7 +2772,7 @@ bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt) { switch (rNEvt.GetType()) { - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: #if OSL_DEBUG_LEVEL > 0 { vcl::Window* pFocus = Application::GetFocusWindow(); diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 418d0d145f74..08155e90708c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -614,7 +614,7 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt) bool bHandled = false; switch (rNEvt.GetType()) { - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: { if ( getDesignView()->getController().isReadOnly() ) break; @@ -724,7 +724,7 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt) } } break; - case EVENT_KEYUP: + case MouseNotifyEvent::KEYUP: { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode(); diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 636dc9a26d7e..35eac4cbace4 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -132,7 +132,7 @@ bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) bool bHandled = false; switch (rNEvt.GetType()) { - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode(); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index dd3e1315b107..5b767649471c 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -57,7 +57,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) bool nHandled = false; switch ( rNEvt.GetType() ) { - case EVENT_LOSEFOCUS: + case MouseNotifyEvent::LOSEFOCUS: { nHandled = LimitBox::Notify( rNEvt ); uno::Sequence< beans::PropertyValue > aArgs( 1 ); @@ -66,7 +66,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) m_pControl->dispatchCommand( aArgs ); break; } - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: { const sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); switch ( nCode ) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 5465148be499..7afd1c9ec663 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -160,7 +160,7 @@ namespace dbaui bool bHandled = false; switch (rNEvt.GetType()) { - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: if ( m_pViewSwitch ) { OJoinController& rController = m_pViewSwitch->getDesignView()->getController(); diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 0305b4603736..a27f4a5b2eb6 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -71,7 +71,7 @@ void ORelationDesignView::initialize() bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) { bool nDone = false; - if(rNEvt.GetType() == EVENT_GETFOCUS) + if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) { if(!m_pTableView->HasChildPathFocus()) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 2b66dc046472..a9af7d9d0e6d 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1684,7 +1684,7 @@ void OTableEditorCtrl::DeactivateCell(bool bUpdate) bool OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt ) { - if (rNEvt.GetType() == EVENT_GETFOCUS) + if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) { if( pHelpTextCell && pHelpTextCell->HasChildPathFocus() ) m_eChildFocus = HELPTEXT; diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 5a69fc0b7ead..a5f2010fb15d 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -64,7 +64,7 @@ void OTableDesignHelpBar::Resize() bool OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt ) { - if (rNEvt.GetType() == EVENT_LOSEFOCUS) + if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) SetHelpText(OUString()); return TabPage::PreNotify(rNEvt); } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index b1743c5d35cd..16bc2dfc9cce 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -224,7 +224,7 @@ bool OTableDesignView::PreNotify( NotifyEvent& rNEvt ) bool bHandled = false; switch(rNEvt.GetType()) { - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: if( GetDescWin() && GetDescWin()->HasChildPathFocus() ) m_eChildFocus = DESCRIPTION; else if ( GetEditorCtrl() && GetEditorCtrl()->HasChildPathFocus() ) diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index eef570c905d2..fecf0f348b22 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -269,7 +269,7 @@ bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) bool bHandled = false; switch(rNEvt.GetType()) { - case EVENT_GETFOCUS: + case MouseNotifyEvent::GETFOCUS: if( getGenPage() && getGenPage()->HasChildPathFocus() ) m_eChildFocus = DESCRIPTION; else |