[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/dialog/rubydialog.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 04f72656705905be13a006004dc18ac6cff4832b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 29 12:32:37 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Apr 29 17:57:37 2021 +0200

    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 at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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();