[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721b' - toolkit/source

[Michael Stahl (via logerrit)]

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

New commits:
commit f1f50a829d5194636d637b196c916133e5360fe6
Author:     Michael Stahl <michael.stahl at allotropia.de>
AuthorDate: Fri Jul 9 14:25:28 2021 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Fri Jul 9 15:32:22 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

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