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

Avoid a SolarMutex assertion failure in some use cases from Automation

Browse Source 
For instance when opening a Calc Document through ooo::vba::excel::
XWorkbooks::Open(). Instead just let the function return null. It does
seem that callers are prepared for that.

Change-Id: I7136133155f95a696b5ed3e661a9adb98396c9c5
This commit is contained in:
Tor Lillqvist
2018-04-25 16:44:01 +03:00
parent fad591f79e
commit 1b55ed02a4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vbahelper/source/vbahelper/vbahelper.cxx
View File

@@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column:100 -*- */
/* /*
* This file is part of the LibreOffice project. * This file is part of the LibreOffice project.
* *
@@ -39,6 +39,7 @@
#include <ooo/vba/msforms/XShape.hpp> #include <ooo/vba/msforms/XShape.hpp>
#include <comphelper/automationinvokedzone.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
@@ -1122,6 +1123,12 @@ uno::Reference< XHelperInterface > getUnoDocModule( const OUString& aModName, Sf
if ( pShell ) if ( pShell )
{ {
OUString sProj( "Standard" ); OUString sProj( "Standard" );
// GetBasicManager() causes a SolarMutex assertion failure in some use cases from
// Automation, at least when opening a Calc Document through ooo::vba::excel::
// XWorkbooks::Open(). Let's see if this check is a good way around that. It does seem that
// callers are prepared for this to return null?
if (comphelper::Automation::AutomationInvokedZone::isActive())
return xIf;
BasicManager* pBasMgr = pShell->GetBasicManager(); BasicManager* pBasMgr = pShell->GetBasicManager();
if ( pBasMgr && !pBasMgr->GetName().isEmpty() ) if ( pBasMgr && !pBasMgr->GetName().isEmpty() )
sProj = pBasMgr->GetName(); sProj = pBasMgr->GetName();