diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-08-06 17:17:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-07 10:06:49 +0200 |
commit | 97ca03b9ac61c5babb72cb91f362e9641394f677 (patch) | |
tree | 66d6e33fea72f19a93bf5bb50fd0f6e24c9607ec | |
parent | 071c044352d24bb0c8cad0d239c8b1fc644c1823 (diff) |
HandleKeyInput is only called for KEY_MOD2 case
and that's for alt+mnenonic which has been removed
which has a knock on effect of removing some methods
that just call this no-op
Change-Id: Id71a57880c6335ee5a052de0da6cc2449489849f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100265
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 10 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppDetailView.hxx | 13 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 4 |
3 files changed, 0 insertions, 27 deletions
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 59658012ca3a..7dc44ce55eb2 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -577,16 +577,6 @@ void OApplicationDetailView::setTaskExternalMnemonics( MnemonicGenerator const & m_aExternalMnemonics = _rMnemonics; } -bool OApplicationDetailView::interceptKeyInput( const KeyEvent& _rEvent ) -{ - const vcl::KeyCode& rKeyCode = _rEvent.GetKeyCode(); - if ( rKeyCode.GetModifier() == KEY_MOD2 ) - return getTasksWindow().HandleKeyInput( _rEvent ); - - // not handled - return false; -} - void OApplicationDetailView::createTablesPage(const Reference< XConnection >& _xConnection ) { impl_createPage( E_TABLE, _xConnection, nullptr ); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 942b5ad75616..fc60ff463e0e 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -129,11 +129,6 @@ namespace dbaui /// fills the Creation listbox with the necessary strings and images void fillTaskEntryList( const TaskEntryList& _rList ); - bool HandleKeyInput( const KeyEvent& _rKEvt ) - { - return m_aCreation->HandleKeyInput( _rKEvt ); - } - void Clear(); void setHelpText(const char* pId); }; @@ -175,14 +170,6 @@ namespace dbaui void setTaskExternalMnemonics( MnemonicGenerator const & _rMnemonics ); - /** called to give the window the chance to intercept key events, while it has not - the focus - - @return <TRUE/> if and only if the event has been handled, and should not - not be further processed - */ - bool interceptKeyInput( const KeyEvent& _rEvent ); - OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks->getChildWindow() ); } diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index fb61be9092d1..5ab8ba34ebf0 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -238,10 +238,6 @@ bool OApplicationView::PreNotify( NotifyEvent& rNEvt ) // #i34790# if ( getPanel() && getPanel()->interceptKeyInput( *pKeyEvent ) ) return true; - // and ditto the detail view - // #i72799# - if ( getDetailView() && getDetailView()->interceptKeyInput( *pKeyEvent ) ) - return true; } break; default: |