From adc295a1b2e1f2ed43e7eb587fc89d7229e0f122 Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Sat, 15 Jun 2019 21:46:13 +0300 Subject: Add comphelper::getUnoTunnelImplementation template Use it instead of classname::getImplementation from UNO3_GETIMPLEMENTATION_* Change-Id: Ifcc8cfcd6369c576250008c76ce31ba79ea3a596 Reviewed-on: https://gerrit.libreoffice.org/74107 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- forms/source/richtext/richtextcontrol.cxx | 2 +- forms/source/solar/component/navbarcontrol.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'forms') diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index aa3afe77fd29..5b8158fba565 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -174,7 +174,7 @@ namespace frm vcl::Window* pParentWin = nullptr; if ( _rParentPeer.is() ) { - VCLXWindow* pParentXWin = VCLXWindow::getImplementation( _rParentPeer ); + VCLXWindow* pParentXWin = comphelper::getUnoTunnelImplementation( _rParentPeer ); if ( pParentXWin ) pParentWin = pParentXWin->GetWindow().get(); DBG_ASSERT( pParentWin, "ORichTextControl::createPeer: could not obtain the VCL-level parent window!" ); diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 8d50352baa02..f9f6fdbd8adb 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -123,7 +123,7 @@ namespace frm vcl::Window* pParentWin = nullptr; if ( _rParentPeer.is() ) { - VCLXWindow* pParentXWin = VCLXWindow::getImplementation( _rParentPeer ); + VCLXWindow* pParentXWin = comphelper::getUnoTunnelImplementation( _rParentPeer ); if ( pParentXWin ) pParentWin = pParentXWin->GetWindow().get(); DBG_ASSERT( pParentWin, "ONavigationBarControl::createPeer: could not obtain the VCL-level parent window!" ); -- cgit