commit 04f72656705905be13a006004dc18ac6cff4832b
author Caolán McNamara <caolanm@redhat.com> Thu Apr 29 12:32:37 2021 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Apr 29 17:57:37 2021 +0200
tree 177ec9d4c57f5203078ed69e7f598b1c5bab6471
parent 0dc9da5df470b9c345e78dbe9553d81b9e4a7435

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>

svx/source/dialog/rubydialog.cxx

diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 439b4fb..f080f03 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();