diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-10 10:13:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-13 08:15:27 +0200 |
| commit | a361231b1363d072d737e9b1d411b71aa9550d84 (patch) | |
| tree | 08641fe2af10c1f22c7fd58e62f99b6dbe301c62 /svx/source/form | |
| parent | ce76026231d9536d2025a1e69f435bcbf39fe4f8 (diff) | |
fix wrong SET/QUERY flags passed to uno::Reference
By creating deleted methods for the wrong calls.
Avoids the compiler needing to construct a temporary
Change-Id: I3b8c648d6bb22d22827bf74f21ea5a2a17fc0f6a
Reviewed-on: https://gerrit.libreoffice.org/72103
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/fmvwimp.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 2c64c1442e57..3fa7d45a4338 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2860,7 +2860,7 @@ Reference< XControl> FmXFormShell::impl_getControl_Lock(const Reference<XControl const SdrView* pSdrView = m_pShell ? m_pShell->GetFormView() : nullptr; ENSURE_OR_THROW( pSdrView, "no current view" ); - xControl.set( i_rKnownFormObj.GetUnoControl( *pSdrView, *pContainerWindow ), UNO_QUERY_THROW ); + xControl.set( i_rKnownFormObj.GetUnoControl( *pSdrView, *pContainerWindow ), UNO_SET_THROW ); } } catch( const Exception& ) diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 99ae528c5282..0de437d335b8 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -197,7 +197,7 @@ void FormViewPageWindowAdapter::dispose() { try { - Reference< XFormController > xController( *i, UNO_QUERY_THROW ); + Reference< XFormController > xController( *i, UNO_SET_THROW ); // detaching the events Reference< XChild > xControllerModel( xController->getModel(), UNO_QUERY ); @@ -868,7 +868,7 @@ namespace continue; Reference< XChild > xModel( pFormObject->GetUnoControlModel(), UNO_QUERY_THROW ); - Reference< XInterface > xModelParent( xModel->getParent(), UNO_QUERY_THROW ); + Reference< XInterface > xModelParent( xModel->getParent(), UNO_SET_THROW ); if ( xNormalizedForm.get() != xModelParent.get() ) continue; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index d94ab3f765f1..db5fc8ca8b14 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3498,7 +3498,7 @@ vcl::Window* FormController::getDialogParentWindow() try { Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW ); - Reference< XWindowPeer > xContainerPeer( xContainerControl->getPeer(), UNO_QUERY_THROW ); + Reference< XWindowPeer > xContainerPeer( xContainerControl->getPeer(), UNO_SET_THROW ); pParentWindow = VCLUnoHelper::GetWindow( xContainerPeer ).get(); } catch( const Exception& ) |