diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-01-13 15:58:18 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-14 10:10:13 +0100 |
commit | ef597c30f60d83545c249e3cf02feeca1c9c8a8a (patch) | |
tree | 07d6aecbc24f1eb807d84525a74338c54d95f3fc /dbaccess | |
parent | 45ef56be4febb73924ccc1a1902adf53f00a20ce (diff) |
Resolves: tdf#138675 crash on checking if focus is in OFieldDescControl
use has_child_focus instead, which didn't exist at the time of...
commit 3fc63a7463149685b04c676968a82bc00a48a9af
Date: Fri Aug 28 10:29:55 2020 +0100
weld OTableBorderWindow
and so sidestep that m_pActFocusWindow has always fallen out of sync
when OFieldDescControl clears its contents
Change-Id: I274131c314a00bdfec2e877a2baa3758d45c325f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109237
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 525b5a580be3..2909c13be20d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1196,7 +1196,7 @@ bool OFieldDescControl::IsFocusInEditableWidget() const bool OFieldDescControl::HasChildPathFocus() const { - return m_pActFocusWindow && m_pActFocusWindow->has_focus(); + return m_xContainer && m_xContainer->has_child_focus(); } bool OFieldDescControl::isCopyAllowed() |