diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-22 16:01:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-22 20:48:24 +0200 |
| commit | 84522fc8798cf0d89835f58f4b335b0045a50bfb (patch) | |
| tree | 86ef30cc0104fc8bf6a0ff36f3c8747e4166b65b /chart2 | |
| parent | df8f780cc24410d2fec5c4d4e1ed58d492559241 (diff) | |
merge duplicate GetFocus implementations
Change-Id: Ifc2e3fab6dacb3b0bca74c0584c16170b8b97de4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99234
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ElementSelector.cxx | 9 | ||||
| -rw-r--r-- | chart2/source/controller/main/ElementSelector.hxx | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index e1ef40a660be..2fa6fa360616 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -56,6 +56,8 @@ SelectorListBox::SelectorListBox(vcl::Window* pParent) , m_xWidget(m_xBuilder->weld_combo_box("combobox")) , m_bReleaseFocus(true) { + InitControlBase(m_xWidget.get()); + m_xWidget->connect_key_press(LINK(this, SelectorListBox, KeyInputHdl)); m_xWidget->connect_changed(LINK(this, SelectorListBox, SelectHdl)); m_xWidget->connect_focus_out(LINK(this, SelectorListBox, FocusOutHdl)); @@ -72,13 +74,6 @@ void SelectorListBox::dispose() InterimItemWindow::dispose(); } -void SelectorListBox::GetFocus() -{ - if (m_xWidget) - m_xWidget->grab_focus(); - InterimItemWindow::GetFocus(); -} - SelectorListBox::~SelectorListBox() { disposeOnce(); diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 01cfd273c3ba..17938e30e12f 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -49,8 +49,6 @@ public: virtual void dispose() override; virtual ~SelectorListBox() override; - virtual void GetFocus() override; - void ReleaseFocus_Impl(); void SetChartController( const css::uno::Reference< css::frame::XController >& xChartController ); |