From 48a307b69713a244e747b3a4d444d6793d59b8d9 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 9 Feb 2020 20:46:52 +0000 Subject: weld SvxFmAbsRecWin item window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6a11d8ba226b28447e2ab04925090491d6953132 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88348 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sd/source/ui/dlg/diactrl.cxx | 4 +++- sd/source/ui/dlg/gluectrl.cxx | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 33deff59ae14..20abb42b9bb3 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -81,7 +81,9 @@ void SdPagesField::dispose() void SdPagesField::GetFocus() { - m_xWidget->grab_focus(); + if (m_xWidget) + m_xWidget->grab_focus(); + InterimItemWindow::GetFocus(); } SdPagesField::~SdPagesField() diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 0364aad81527..ee2e49a9d7bb 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -72,7 +72,9 @@ void GlueEscDirLB::dispose() void GlueEscDirLB::GetFocus() { - m_xWidget->grab_focus(); + if (m_xWidget) + m_xWidget->grab_focus(); + InterimItemWindow::GetFocus(); } GlueEscDirLB::~GlueEscDirLB() -- cgit