diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-09 20:46:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-10 15:20:40 +0100 |
| commit | 48a307b69713a244e747b3a4d444d6793d59b8d9 (patch) | |
| tree | ea67c623b2e4dc156be2bd8a558e367ab8ad354b /svx/source/tbxctrls | |
| parent | abfdfe6ac1bfc917d1693874f9dec80167e0806f (diff) | |
weld SvxFmAbsRecWin item window
Change-Id: I6a11d8ba226b28447e2ab04925090491d6953132
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88348
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 8 | ||||
| -rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 0fcf01de5d32..bc9246689547 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -264,7 +264,9 @@ void ImplGrafControl::dispose() void ImplGrafControl::GetFocus() { - mxField->grab_focus(); + if (mxField) + mxField->grab_focus(); + InterimItemWindow::GetFocus(); } namespace { @@ -289,7 +291,9 @@ public: virtual void GetFocus() override { - m_xWidget->grab_focus(); + if (m_xWidget) + m_xWidget->grab_focus(); + InterimItemWindow::GetFocus(); } void set_sensitive(bool bSensitive) diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 4be04c13f882..52f28c91cb4d 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -180,7 +180,9 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) void SvxMetricField::GetFocus() { - m_xWidget->grab_focus(); + if (m_xWidget) + m_xWidget->grab_focus(); + InterimItemWindow::GetFocus(); } SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent ) : diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 81c4b8e7bd73..f03a9b36848d 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -157,7 +157,9 @@ SvxFontSizeBox_Impl::~SvxFontSizeBox_Impl() void SvxFontSizeBox_Impl::GetFocus() { - m_xWidget->grab_focus(); + if (m_xWidget) + m_xWidget->grab_focus(); + InterimItemWindow::GetFocus(); } void SvxFontSizeBox_Impl::ReleaseFocus_Impl() |