From ffeeb78118a887419c5f33bb5311f0e2ddae463c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 9 Jul 2021 14:25:28 +0200 Subject: 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 (cherry picked from commit addd7e7835097043efda52594f3a34219dbd1063) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118712 --- toolkit/source/awt/vclxtoolkit.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'toolkit') diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 10eb7f8019e2..070d579d92bb 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.get()); } return xPeer; -- cgit