diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-17 15:42:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-08-18 11:03:02 +0200 |
| commit | 7fc6063914432d58d86cfcbd728d967e7c86ebfd (patch) | |
| tree | f71fe9f99edaa4e896c78cdf32e34b516194d748 /comphelper | |
| parent | db83c41d460103df5d80f5bd99816575c4ead5cd (diff) | |
use more Reference::query instead of UNO_QUERY_THROW
since querying with exceptions is consideably more expensive
Change-Id: I968a9a40766b2abb0d3058549b0ed44011fd5716
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155791
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/container/embeddedobjectcontainer.cxx | 6 | ||||
| -rw-r--r-- | comphelper/source/misc/instancelocker.cxx | 7 | ||||
| -rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 4 |
3 files changed, 6 insertions, 11 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 094597fe6d06..f1281132214e 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -1477,9 +1477,9 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed:: // if this method is used as part of SaveCompleted the object must stay unmodified after execution try { - uno::Reference< util::XModifiable > xModif( xObj->getComponent(), uno::UNO_QUERY_THROW ); - if ( xModif->isModified() ) - xModif->setModified( false ); + if (auto xModif = xObj->getComponent().query<util::XModifiable>() ) + if ( xModif->isModified() ) + xModif->setModified( false ); } catch (const uno::Exception&) { diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 84c8054ecbb8..f545ff1480bf 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -238,13 +238,8 @@ void OLockListener::Dispose() if ( nMode & embed::Actions::PREVENT_TERMINATION ) { - try - { - uno::Reference< frame::XDesktop > xDesktop( xInstance, uno::UNO_QUERY_THROW ); + if (auto xDesktop = xInstance.query<frame::XDesktop>() ) xDesktop->removeTerminateListener( static_cast< frame::XTerminateListener* >( this ) ); - } - catch( uno::Exception& ) - {} } } diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 9d3dbcd22732..b04c3c9ec58b 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -679,8 +679,8 @@ OUString OStorageHelper::GetODFVersionFromStorage(const uno::Reference<embed::XS OUString aODFVersion; try { - uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW); - xPropSet->getPropertyValue("Version") >>= aODFVersion; + if (auto xPropSet = xStorage.query<beans::XPropertySet>()) + xPropSet->getPropertyValue("Version") >>= aODFVersion; } catch (uno::Exception&) { |