strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the uno apis instead of extracting the underlying vcl::Window

Browse source 
Change-Id: I050df6d7f1325681adf9cf65d3e3b20fc63c2bfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112813
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-03-20 14:48:12 +00:00
parent 8579b53bc4
commit 05b62fa08b
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sfx2/source/inet/inettbc.cxx
View file

@ -21,6 +21,7 @@
#include <inettbc.hxx>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/awt/XTopWindow.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
@ -28,7 +29,6 @@
#include <unotools/historyoptions.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <osl/file.hxx>
#include <rtl/ustring.hxx>
@ -203,16 +203,17 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl, weld::ComboBox&, bool)
Reference< XDesktop2 > xDesktop = Desktop::create( m_xContext );
Reference< XFrame > xFrame = xDesktop->getActiveFrame();
if ( xFrame.is() )
{
VclPtr<vcl::Window> pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWin )
{
pWin->GrabFocus();
pWin->ToTop( ToTopFlags::RestoreWhenMin );
}
}
if (!xFrame.is())
return true;
auto xWin = xFrame->getContainerWindow();
if (!xWin)
return true;
xWin->setFocus();
Reference<css::awt::XTopWindow> xTop(xWin, UNO_QUERY);
if (!xTop)
return true;
xTop->toFront();
return true;
}