tdf#150380 Calc crash clicking on the title of the Border Color toolbar popdown

There is probably a better fix for this, but we have a popup inside a
popup here, so some weirdness is to be expected.

At least it doesn't crash now.

Change-Id: Ifaa928c47c3cbfaec8379f01f007b0c1daf4e5a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146359
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 7 insertions, 1 deletions

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 733d78179500..259192c854cb 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1322,7 +1322,13 @@ void SalInstanceContainer::move(weld::Widget* pWidget, weld::Container* pNewPare
     assert(!pNewParent || pNewVclParent);
     vcl::Window* pVclWindow = pVclWidget->getWidget();
     if (pNewVclParent)
-        pVclWindow->SetParent(pNewVclParent->getWidget());
+    {
+        vcl::Window* pNew = pNewVclParent->getWidget();
+        if (!pNew->isDisposed())
+            pVclWindow->SetParent(pNewVclParent->getWidget());
+        else
+            SAL_WARN("vcl", "ignoring move because new parent is already disposed");
+    }
     else
     {
         pVclWindow->Hide();