From 87db52ab1e9c39ad8319aaf9c0c59d4435b6ffb5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 25 Aug 2023 11:30:42 +0200 Subject: 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() call. Change-Id: Idbb5a08d635d15b5ca63f4822eddf05fb0a5afa0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156002 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basic/source/classes/sbxmod.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'basic/source/classes') diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 020f3814ec8c..15e4719569ba 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -395,8 +395,8 @@ static uno::Reference< vba::XVBACompatibility > getVBACompatibility( const uno:: uno::Reference< vba::XVBACompatibility > xVBACompat; try { - if (auto xModelProps = rxModel.query() ) - xVBACompat.set( xModelProps->getPropertyValue( "BasicLibraries" ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xModelProps( rxModel, uno::UNO_QUERY_THROW ); + xVBACompat.set( xModelProps->getPropertyValue( "BasicLibraries" ), uno::UNO_QUERY ); } catch(const uno::Exception& ) { -- cgit