From 935a5f456755ce132a42fee2792b195cfc5d1fb4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 14 Aug 2019 15:46:16 +0300 Subject: Try harder to avoid exceptions screwing stuff up for OLE clients Change-Id: I5e9ae8669c4f5c561a09f5f21f11a675a40e5929 Reviewed-on: https://gerrit.libreoffice.org/77463 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- vbahelper/source/vbahelper/vbaapplicationbase.cxx | 14 ++++++++++++-- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 20 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 90c7e83badc6..82bcf256ace5 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -225,8 +225,18 @@ sal_Bool SAL_CALL VbaApplicationBase::getInteractive() uno::Reference< frame::XModel > xModel = getCurrentDocument(); if (!xModel.is()) return true; - uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_SET_THROW ); - uno::Reference< awt::XWindow2 > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW ); + + uno::Reference< frame::XController > xController( xModel->getCurrentController() ); + if (!xController.is()) + return true; + + uno::Reference< frame::XFrame > xFrame( xController->getFrame() ); + if (!xFrame.is()) + return true; + + uno::Reference< awt::XWindow2 > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY ); + if (!xWindow.is()) + return true; return xWindow->isEnabled(); } diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index fc20c882f092..1ba2bb1a0b0f 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -222,7 +222,15 @@ uno::Any VbaDocumentsBase::createDocument() // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened) uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY ); bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating(); - bool bInteractive = !xApplication.is() || xApplication->getInteractive(); + bool bInteractive = true; + + try + { + bInteractive = !xApplication.is() || xApplication->getInteractive(); + } + catch( const uno::Exception& ) + { + } uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create(mxContext); OUString sURL; @@ -255,7 +263,15 @@ uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::A // #163808# determine state of Application.ScreenUpdating and Application.Interactive symbols (before new document is opened) uno::Reference< XApplicationBase > xApplication( Application(), uno::UNO_QUERY ); bool bScreenUpdating = !xApplication.is() || xApplication->getScreenUpdating(); - bool bInteractive = !xApplication.is() || xApplication->getInteractive(); + bool bInteractive = true; + + try + { + bInteractive = !xApplication.is() || xApplication->getInteractive(); + } + catch( const uno::Exception& ) + { + } // we need to detect if this is a URL, if not then assume it's a file path OUString aURL; -- cgit