summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2021-07-09 14:25:28 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2021-07-09 16:39:27 +0200
commitaddd7e7835097043efda52594f3a34219dbd1063 (patch)
tree39d8e747bb6e92ffd4e83f8992b8e15c1da669c7 /toolkit
parent830ed2e0706a38a6a5debf41a41347b1f14a1d5b (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>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx1
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;