[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/source

[Noel Grandin (via logerrit)]

 vcl/source/app/salvtables.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7192448a9caa2b578db8e70cee73976b91e9d1e2
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jan 30 15:50:31 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Feb 9 13:09:17 2023 +0000

    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.gran...@collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit f4a24366dd111c7c7434f4a887d7097ced6b5f55)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146330
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2c998bd6d0a2..0c2f229d5d92 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();