diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-25 11:30:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-25 14:15:56 +0200 |
| commit | 87db52ab1e9c39ad8319aaf9c0c59d4435b6ffb5 (patch) | |
| tree | 64795c67bc154c4d5bcf4287139d1db7e11c9a6c /scripting | |
| parent | 139cffc531277b57bae8e272fef13af00ace5366 (diff) | |
Revert "use more Reference::query instead of UNO_QUERY_THROW"
This reverts commit 7fc6063914432d58d86cfcbd728d967e7c86ebfd.
sberg noticed that there is a difference now:
there's a subtle difference now, in that if y was null originally, it would have thrown a (caught) exception, whereas now it will crash in the y.query<X>() call.
Change-Id: Idbb5a08d635d15b5ca63f4822eddf05fb0a5afa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156002
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index c139f7d17916..420161a22ee1 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -353,8 +353,15 @@ ScriptEventHelper::~ScriptEventHelper() // dispose control ( and remove any associated event registrations ) if ( m_bDispose ) { - if (auto xComp = m_xControl.query<lang::XComponent>() ) + try + { + uno::Reference< lang::XComponent > xComp( m_xControl, uno::UNO_QUERY_THROW ); xComp->dispose(); + } + // destructor can't throw + catch( uno::Exception& ) + { + } } } |