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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/inc/inputwin.hxx | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index ebca73d2f9f8..65d6bd4fbdc8 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2107,7 +2107,6 @@ void ScTextWnd::TextGrabFocus() } // Position window - ScPosWnd::ScPosWnd(vcl::Window* pParent) : InterimItemWindow(pParent, "modules/scalc/ui/posbox.ui", "PosBox") , m_xWidget(m_xBuilder->weld_combo_box("pos_window")) @@ -2115,6 +2114,7 @@ ScPosWnd::ScPosWnd(vcl::Window* pParent) , nTipVisible(nullptr) , bFormulaMode(false) { + InitControlBase(m_xWidget.get()); // Use calculation according to tdf#132338 to align combobox width to width of fontname combobox within formatting toolbar; // formatting toolbar is placed above formulabar when using multiple toolbars typically @@ -2135,13 +2135,6 @@ ScPosWnd::ScPosWnd(vcl::Window* pParent) m_xWidget->connect_focus_out(LINK(this, ScPosWnd, FocusOutHdl)); } -void ScPosWnd::GetFocus() -{ - if (m_xWidget) - m_xWidget->grab_focus(); - InterimItemWindow::GetFocus(); -} - ScPosWnd::~ScPosWnd() { disposeOnce(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index c461c8fdb732..7fc620eb22c1 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -166,7 +166,6 @@ public: ScPosWnd( vcl::Window* pParent ); virtual ~ScPosWnd() override; virtual void dispose() override; - virtual void GetFocus() override; void SetPos( const OUString& rPosStr ); // Displayed Text void SetFormulaMode( bool bSet ); |