diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-12 15:07:37 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-05-12 19:57:24 +0200 |
| commit | f7a86c5cdf4323c99d26512bf78de7f7c380667d (patch) | |
| tree | f299cbf4ca27b5db0e81a90cc6551469fa280e63 /toolkit/source/awt/vclxtoolkit.cxx | |
| parent | c5e5467f6a13aba68b4706a4d7feb130e824bcc6 (diff) | |
simplify the vcl<->toolkit connection
No need to store two different pointers and hide the
underlying class behind an UNO interface
Change-Id: I72c55e912caa9eae1cffa6c9d1b1d480e5668d40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115496
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit/source/awt/vclxtoolkit.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 10eb7f8019e2..287dc93f9676 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1946,9 +1946,9 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( else { xRef = pNewComp; - pNewWindow->SetComponentInterface( xRef ); + pNewWindow->SetComponentInterface( pNewComp.get() ); } - DBG_ASSERT( pNewWindow->GetComponentInterface( false ) == xRef, + DBG_ASSERT( pNewWindow->GetComponentInterface( false ) == pNewComp.get(), "VCLXToolkit::createWindow: did #133706# resurge?" ); if ( rDescriptor.WindowAttributes & css::awt::WindowAttribute::SHOW ) @@ -2502,7 +2502,7 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, break; } if (pFocus != nullptr) - xNext = pFocus->GetComponentInterface(); + xNext = static_cast<cppu::OWeakObject*>(pFocus->GetComponentInterface()); css::awt::FocusEvent aAwtEvent( static_cast< css::awt::XWindow * >(pWindow->GetWindowPeer()), static_cast<sal_Int16>(pWindow->GetGetFocusFlags()), |