[Libreoffice-commits] core.git: basic/source

Fri Jul 27 06:01:58 UTC 2018

basic/source/basmgr/basmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ea6c0e6777c5b367ec507f10858c9c4be5960ed
Author:     Markus Mohrhard <markus.mohrhard at googlemail.com>
AuthorDate: Thu Jul 26 00:19:06 2018 +0200
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Fri Jul 27 08:01:27 2018 +0200

    tdf#109132, load VBA library by default during ODF import
    
    Without loading the VBA library any of the functions inside of the
    library will not be available for spreadsheet functions.
    
    Change-Id: I7d0b931ef4817e5870635f43f4b4ae4399780bc4
    Reviewed-on: https://gerrit.libreoffice.org/58149
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 77b2b5fe2235..1a4948ab9081 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -561,7 +561,7 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
             {
                 uno::Any aLibAny = xScriptCont->getByName( *pScriptLibName );
 
-                if ( *pScriptLibName == "Standard" )
+                if ( *pScriptLibName == "Standard" || *pScriptLibName == "VBAProject")
                     xScriptCont->loadLibrary( *pScriptLibName );
 
                 BasMgrContainerListenerImpl::insertLibraryImpl
