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 /writerfilter | |
| 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 '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, 15 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 4b7e91978128..6538f03d6ea4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4498,12 +4498,16 @@ void DomainMapper_Impl::PopShapeContext() // or anchored to a discarded header or footer if ( m_aAnchoredStack.top().bToRemove || m_bDiscardHeaderFooter ) { - if (auto xDrawPageSupplier = m_xTextDocument.query<drawing::XDrawPageSupplier>()) + try { + 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 6b5ff87317a2..4df26105a37c 100644 --- a/writerfilter/source/dmapper/ModelEventListener.cxx +++ b/writerfilter/source/dmapper/ModelEventListener.cxx @@ -102,8 +102,14 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) void ModelEventListener::disposing( const lang::EventObject& rEvent ) { - if (auto xEventBroadcaster = rEvent.Source.query<document::XEventBroadcaster>()) - xEventBroadcaster->removeEventListener(uno::Reference<document::XEventListener>(this)); + try + { + uno::Reference<document::XEventBroadcaster>(rEvent.Source, uno::UNO_QUERY_THROW )->removeEventListener( + uno::Reference<document::XEventListener>(this)); + } + catch( const uno::Exception& ) + { + } } } //namespace writerfilter::dmapper diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index bfa6a7d37bdf..e0671c8a21b6 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:") ); } - if (auto xComp = xEmbeddedResolver.query<lang::XComponent>() ) - xComp->dispose(); + uno::Reference< lang::XComponent > xComp( xEmbeddedResolver, uno::UNO_QUERY_THROW ); + xComp->dispose(); m_aURL = aURL; } catch( const uno::Exception& ) |