diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-07-09 14:25:28 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-07-09 17:38:50 +0200 |
| commit | ffeeb78118a887419c5f33bb5311f0e2ddae463c (patch) | |
| tree | 4e116e6de4e19668a78c74f0331ce58cb7cf4a53 /toolkit | |
| parent | c7e0d552915667ab364ec719f2e6f79f9cb1b78c (diff) | |
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@allotropia.de>
(cherry picked from commit addd7e7835097043efda52594f3a34219dbd1063)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118712
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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; |