diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-01-25 20:25:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-25 20:21:48 +0100 |
| commit | 1aa31294b2d3fb562ba33d5d873da62439944f07 (patch) | |
| tree | 79a604d51b0c54768c07ed8c4643cf43b29d8fca /extensions | |
| parent | 2dbc9266ec2207c2719c0104168cfcad9f6948da (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/defaulthelpprovider.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 0d7792edd1d5..8f1e22b82f12 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -145,7 +145,7 @@ namespace pcr try { Reference< XWindow > xControlWindow( _rxControl->getControlWindow(), css::uno::UNO_SET_THROW ); - pControlWindow = VCLUnoHelper::GetWindow( xControlWindow ).get(); + pControlWindow = VCLUnoHelper::GetWindow( xControlWindow ); } catch( const Exception& ) { diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 4f3365e6b099..6f9ff0e547e6 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -345,7 +345,7 @@ namespace pcr else { VCLXWindow* pContainerWindow = comphelper::getUnoTunnelImplementation<VCLXWindow>(xContainerWindow); - VclPtr<vcl::Window> pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : VclPtr<vcl::Window>(); + VclPtr<vcl::Window> pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : nullptr; if (!pParentWin) throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); xBuilder.reset(Application::CreateInterimBuilder(pParentWin, sUIFile, true)); |