From 84522fc8798cf0d89835f58f4b335b0045a50bfb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Jul 2020 16:01:17 +0100 Subject: merge duplicate GetFocus implementations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifc2e3fab6dacb3b0bca74c0584c16170b8b97de4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99234 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- basctl/source/basicide/IDEComboBox.cxx | 2 ++ basctl/source/inc/IDEComboBox.hxx | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx index fc135cf1a3e4..5063eb4f45a9 100644 --- a/basctl/source/basicide/IDEComboBox.cxx +++ b/basctl/source/basicide/IDEComboBox.cxx @@ -91,6 +91,8 @@ DocListenerBox::DocListenerBox(vcl::Window* pParent) , m_xWidget(m_xBuilder->weld_combo_box("combobox")) , maNotifier(*this) { + InitControlBase(m_xWidget.get()); + m_xWidget->connect_changed(LINK(this, DocListenerBox, SelectHdl)); m_xWidget->connect_key_press(LINK(this, DocListenerBox, KeyInputHdl)); } diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index ade0fd6732cc..220a6f84b1f0 100644 --- a/basctl/source/inc/IDEComboBox.hxx +++ b/basctl/source/inc/IDEComboBox.hxx @@ -96,13 +96,6 @@ protected: virtual void Select() = 0; virtual void FillBox() = 0; - virtual void GetFocus() override - { - if (m_xWidget) - m_xWidget->grab_focus(); - InterimItemWindow::GetFocus(); - } - /// key strokes the ComboBox receives virtual bool HandleKeyInput(const KeyEvent& rKEvt); -- cgit