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 /svx/source/tbxctrls/fillctrl.cxx | |
| 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 'svx/source/tbxctrls/fillctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index fcdd67efbe38..af236864034a 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -566,6 +566,8 @@ FillControl::FillControl(vcl::Window* pParent, const css::uno::Reference<css::fr , mnTypeCurPos(0) , mnAttrCurPos(0) { + InitControlBase(mxLbFillType.get()); + mxLbFillAttr->connect_key_press(LINK(this, FillControl, AttrKeyInputHdl)); mxLbFillType->connect_key_press(LINK(this, FillControl, TypeKeyInputHdl)); mxToolBoxColor->connect_key_press(LINK(this, FillControl, ColorKeyInputHdl)); @@ -647,13 +649,6 @@ IMPL_LINK(FillControl, ColorKeyInputHdl, const KeyEvent&, rKEvt, bool) return ChildKeyInput(rKEvt); } -void FillControl::GetFocus() -{ - if (mxLbFillType) - mxLbFillType->grab_focus(); - InterimItemWindow::GetFocus(); -} - FillControl::~FillControl() { disposeOnce(); |