summaryrefslogtreecommitdiff
path: root/svx/source/dialog/rubydialog.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-04-29 12:32:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-04-29 17:57:37 +0200
commit04f72656705905be13a006004dc18ac6cff4832b (patch)
tree177ec9d4c57f5203078ed69e7f598b1c5bab6471 /svx/source/dialog/rubydialog.cxx
parent0dc9da5df470b9c345e78dbe9553d81b9e4a7435 (diff)
tdf#141967 bail early in Activate if disposing
because focus bounces around the dialog as its being torn down widget by widget Change-Id: I2afd094bb13929c25268168175c142ca8e0074e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114880 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/dialog/rubydialog.cxx')
-rw-r--r--svx/source/dialog/rubydialog.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 439b4fbab178..f080f03521e9 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -271,6 +271,11 @@ void SvxRubyDialog::Close()
void SvxRubyDialog::Activate()
{
SfxModelessDialogController::Activate();
+ if (!m_xContentArea)
+ {
+ // tdf#141967 if Activate is called during tear down bail early
+ return;
+ }
//get selection from current view frame
SfxViewFrame* pCurFrm = SfxViewFrame::Current();
Reference<XController> xCtrl = pCurFrm->GetFrame().GetController();