commit 7192448a9caa2b578db8e70cee73976b91e9d1e2
author Noel Grandin <noel.grandin@collabora.co.uk> Mon Jan 30 15:50:31 2023 +0200
committer Xisco Fauli <xiscofauli@libreoffice.org> Thu Feb 09 13:09:17 2023 +0000
tree 2c72a990bb7b6c4f10aec6321c042e746da117fb
parent 59d37768321e2975efa2c8be5513d178de899eba

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>
(cherry picked from commit f4a24366dd111c7c7434f4a887d7097ced6b5f55)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146330
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

vcl/source/app/salvtables.cxx

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2c998bd..0c2f229 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1282,7 +1282,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();