diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-24 18:52:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-24 19:09:51 +0100 |
| commit | fef6bb7af23c2db714713a3b277fd5c40fd5705c (patch) | |
| tree | 45a52b0ba97fd6439bff01918748ea3477803f8a /basic | |
| parent | 91fcc0032c2d0d343b914dfe3bea0b0bf1589e91 (diff) | |
Resolves: tdf#93474 crash on importing a macro library
its a SfxLibrary which is not a XLibraryContainer
(a SfxLibraryContainer is however)
I think the issue is simply an empty name making code go down the container
rather than library route.
Change-Id: Ib0245d402fe375ac26ab9f2b14fe708b2a34a7a7
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 6b3d70ea1015..089910cc2428 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -255,7 +255,8 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con if( bLibContainer ) { uno::Reference< script::XLibraryContainer > xScriptCont( Event.Source, uno::UNO_QUERY ); - insertLibraryImpl( xScriptCont, mpMgr, Event.Element, aName ); + if (xScriptCont.is()) + insertLibraryImpl(xScriptCont, mpMgr, Event.Element, aName); StarBASIC* pLib = mpMgr->GetLib( aName ); if ( pLib ) { @@ -274,8 +275,8 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con SbModule* pMod = pLib->FindModule( aName ); if( !pMod ) { - OUString aMod; - Event.Element >>= aMod; + OUString aMod; + Event.Element >>= aMod; uno::Reference< vba::XVBAModuleInfo > xVBAModuleInfo( Event.Source, uno::UNO_QUERY ); if ( xVBAModuleInfo.is() && xVBAModuleInfo->hasModuleInfo( aName ) ) { |