From 131503c1b1387fb1e7865b123c6161fc6709a718 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 14 Feb 2017 16:10:23 +0100 Subject: Some simplifications, using UNO_QUERY_THROW Change-Id: I6723de749d0e741a79a3ec276e781ee0e5b49934 Reviewed-on: https://gerrit.libreoffice.org/34262 Tested-by: Stephan Bergmann Reviewed-by: Stephan Bergmann --- reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 4 ++-- reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'reportdesign') diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index a4ec3461b545..d736f52305f3 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -299,8 +299,8 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > if ( !m_xDelegatee.is() || !m_xModel.is() ) throw uno::Exception(); - m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY); - if ( !m_xDatabaseDataProvider.is() || !m_xDatabaseDataProvider->getActiveConnection().is() ) + m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY_THROW); + if ( !m_xDatabaseDataProvider->getActiveConnection().is() ) throw uno::Exception(); uno::Reference< reflection::XProxyFactory > xProxyFactory = reflection::ProxyFactory::create( m_xContext ); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 7d9c13a593b7..488fceaf3dff 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -355,10 +355,7 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any > { static const char s_sDatabaseDataProvider[] = "com.sun.star.chart2.data.DatabaseDataProvider"; m_xDatabaseDataProvider.set(m_xContext->getServiceManager()->createInstanceWithContext(s_sDatabaseDataProvider - ,m_xContext),uno::UNO_QUERY); - if ( !m_xDatabaseDataProvider.is() ) - throw uno::Exception(); - + ,m_xContext),uno::UNO_QUERY_THROW); m_xDatabaseDataProvider->setRowLimit(10); uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW); -- cgit