From 97ca03b9ac61c5babb72cb91f362e9641394f677 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 6 Aug 2020 17:17:08 +0100 Subject: HandleKeyInput is only called for KEY_MOD2 case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- dbaccess/source/ui/app/AppDetailView.cxx | 10 ---------- dbaccess/source/ui/app/AppDetailView.hxx | 13 ------------- dbaccess/source/ui/app/AppView.cxx | 4 ---- 3 files changed, 27 deletions(-) (limited to 'dbaccess/source') 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 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: -- cgit v1.2.3