toolkit/source/awt/vclxtoolkit.cxx | 1 + 1 file changed, 1 insertion(+)
New commits: commit ffeeb78118a887419c5f33bb5311f0e2ddae463c Author: Michael Stahl <[email protected]> AuthorDate: Fri Jul 9 14:25:28 2021 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Jul 9 17:38:50 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 <[email protected]> (cherry picked from commit addd7e7835097043efda52594f3a34219dbd1063) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118712 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
