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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/ModelEventListener.cxx | 10 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/OLEHandler.cxx | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a9522e53db2c..d9faf0c206a4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4498,16 +4498,12 @@ void DomainMapper_Impl::PopShapeContext() // or anchored to a discarded header or footer if ( m_aAnchoredStack.top().bToRemove || m_bDiscardHeaderFooter ) { - try + if (auto xDrawPageSupplier = m_xTextDocument.query<drawing::XDrawPageSupplier>()) { - uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(m_xTextDocument, uno::UNO_QUERY_THROW); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); if ( xDrawPage.is() ) xDrawPage->remove( xShape ); } - catch( const uno::Exception& ) - { - } } // Relative width calculations deferred until section's margins are defined. diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx index 4df26105a37c..6b5ff87317a2 100644 --- a/writerfilter/source/dmapper/ModelEventListener.cxx +++ b/writerfilter/source/dmapper/ModelEventListener.cxx @@ -102,14 +102,8 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) void ModelEventListener::disposing( const lang::EventObject& rEvent ) { - try - { - uno::Reference<document::XEventBroadcaster>(rEvent.Source, uno::UNO_QUERY_THROW )->removeEventListener( - uno::Reference<document::XEventListener>(this)); - } - catch( const uno::Exception& ) - { - } + if (auto xEventBroadcaster = rEvent.Source.query<document::XEventBroadcaster>()) + xEventBroadcaster->removeEventListener(uno::Reference<document::XEventListener>(this)); } } //namespace writerfilter::dmapper diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index e0671c8a21b6..bfa6a7d37bdf 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -315,8 +315,8 @@ OUString OLEHandler::copyOLEOStream( sRet = aPersistName.copy( strlen("vnd.sun.star.EmbeddedObject:") ); } - uno::Reference< lang::XComponent > xComp( xEmbeddedResolver, uno::UNO_QUERY_THROW ); - xComp->dispose(); + if (auto xComp = xEmbeddedResolver.query<lang::XComponent>() ) + xComp->dispose(); m_aURL = aURL; } catch( const uno::Exception& ) |