From 1aa31294b2d3fb562ba33d5d873da62439944f07 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 25 Jan 2021 20:25:51 +0200 Subject: avoid some ref-counting can just return a pointer here, instead of VclPtr. Change-Id: I9ab8962cbbe84ed4dfcfd658a6d758112914cb89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109923 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svx/source/dialog/srchdlg.cxx | 4 ++-- svx/source/fmcomp/fmgridif.cxx | 2 +- svx/source/form/fmtextcontrolshell.cxx | 2 +- svx/source/form/formcontroller.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'svx') diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index a1d99ca3ec5c..4b660cdb7a8e 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2363,7 +2363,7 @@ static void lcl_SetSearchLabelWindow(const OUString& rStr) return; css::uno::Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW); - VclPtr< ToolBox > pToolBox = static_cast( VCLUnoHelper::GetWindow(xWindow).get() ); + VclPtr< ToolBox > pToolBox = static_cast( VCLUnoHelper::GetWindow(xWindow) ); for (ToolBox::ImplToolItems::size_type i = 0; pToolBox && i < pToolBox->GetItemCount(); ++i) { sal_uInt16 id = pToolBox->GetItemId(i); @@ -2410,7 +2410,7 @@ OUString SvxSearchDialogWrapper::GetSearchLabel() return OUString(); css::uno::Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), css::uno::UNO_QUERY_THROW); - VclPtr< ToolBox > pToolBox = static_cast( VCLUnoHelper::GetWindow(xWindow).get() ); + VclPtr< ToolBox > pToolBox = static_cast( VCLUnoHelper::GetWindow(xWindow) ); for (ToolBox::ImplToolItems::size_type i = 0; pToolBox && i < pToolBox->GetItemCount(); ++i) { sal_uInt16 id = pToolBox->GetItemId(i); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 164aee16dc24..fc8d52735ea6 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -474,7 +474,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& { VCLXWindow* pParent = comphelper::getUnoTunnelImplementation(rParentPeer); if (pParent) - pParentWin = pParent->GetWindow().get(); + pParentWin = pParent->GetWindow(); } FmXGridPeer* pPeer = imp_CreatePeer(pParentWin); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index d996e3baf970..a9ec64108a85 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -479,7 +479,7 @@ namespace svx if ( _rxControl.is() ) xControlPeer = _rxControl->getPeer(); if ( xControlPeer.is() ) - pWindow = VCLUnoHelper::GetWindow( xControlPeer ).get(); + pWindow = VCLUnoHelper::GetWindow( xControlPeer ); } catch( const Exception& ) { diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 7799c76b7860..c05b272b94e8 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3454,7 +3454,7 @@ vcl::Window* FormController::getDialogParentWindow() { Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW ); Reference< XWindowPeer > xContainerPeer( xContainerControl->getPeer(), UNO_SET_THROW ); - pParentWindow = VCLUnoHelper::GetWindow( xContainerPeer ).get(); + pParentWindow = VCLUnoHelper::GetWindow( xContainerPeer ); } catch( const Exception& ) { -- cgit