[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - toolkit/source

[Michael Stahl (via logerrit)]

 toolkit/source/awt/vclxtoolkit.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4b691594f3b9b1810028b50daa703b33a9e61374
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Fri Jul 9 14:25:28 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Sun Jul 11 01:23:10 2021 +0200

    toolkit: initialise new VCLXTopWindow properly
    
    VCLXToolkit::createSystemChild() doesn't init WindowImpl::mpVCLXWindow
    and so it can happen that another VCLXTopWindow instance is created
    later for the same Window.
    
    Change-Id: I9ac654dceb15ea619597f2b8d9d1f9282aa1dfc1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118684
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit addd7e7835097043efda52594f3a34219dbd1063)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118713
    Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 8d7cff46e7d8..987fc40db39b 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -2048,6 +2048,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::createSystemChild( con
         SolarMutexGuard aGuard;
         pPeer->SetWindow( pChildWindow );
         xPeer = pPeer;
+        pChildWindow->SetWindowPeer(xPeer, pPeer);
     }
 
     return xPeer;