summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-02-09 20:46:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-02-10 15:20:40 +0100
commit48a307b69713a244e747b3a4d444d6793d59b8d9 (patch)
treeea67c623b2e4dc156be2bd8a558e367ab8ad354b /sd
parentabfdfe6ac1bfc917d1693874f9dec80167e0806f (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 'sd')
-rw-r--r--sd/source/ui/dlg/diactrl.cxx4
-rw-r--r--sd/source/ui/dlg/gluectrl.cxx4
2 files changed, 6 insertions, 2 deletions
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()