mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decrease fragility in odd use cases with no current document

Browse Source 
Change-Id: I9966166561d4c6e577f3f7e8e04572f97a0b295e
Reviewed-on: https://gerrit.libreoffice.org/49450
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist
2018-02-08 19:31:20 +02:00
parent e0a94ded5d
commit 73256b9181
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
basic/source/classes/sbxmod.cxx
View File

@@ -409,7 +409,10 @@ uno::Reference< vba::XVBACompatibility > getVBACompatibility( const uno::Referen
bool getDefaultVBAMode( StarBASIC* pb )
{
uno::Reference< vba::XVBACompatibility > xVBACompat = getVBACompatibility( getDocumentModel( pb ) );
uno::Reference< frame::XModel > xModel( getDocumentModel( pb ) );
if (!xModel.is())
return false;
uno::Reference< vba::XVBACompatibility > xVBACompat = getVBACompatibility( xModel );
return xVBACompat.is() && xVBACompat->getVBACompatibilityMode();
}

8
vbahelper/source/vbahelper/vbaapplicationbase.cxx
View File

@@ -184,7 +184,9 @@ VbaApplicationBase::~VbaApplicationBase()
sal_Bool SAL_CALL
VbaApplicationBase::getScreenUpdating()
{
uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
uno::Reference< frame::XModel > xModel = getCurrentDocument();
if (!xModel.is())
return false;
return !xModel->hasControllersLocked();
}
@@ -238,7 +240,9 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar)
sal_Bool SAL_CALL VbaApplicationBase::getInteractive()
{
uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
uno::Reference< frame::XModel > xModel = getCurrentDocument();
if (!xModel.is())
return false;
uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
uno::Reference< awt::XWindow2 > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );

8
vbahelper/source/vbahelper/vbahelper.cxx
View File

@@ -277,7 +277,13 @@ getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext )
}
catch (const uno::Exception&)
{
xModel = getThisWordDoc( xContext );
try
{
xModel = getThisWordDoc( xContext );
}
catch (const uno::Exception&)
{
}
}
return xModel;
}