diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-02 16:44:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-03 08:11:02 +0200 |
| commit | bd2bf6bd559163389d1e6b6b948fc29cee5f13f5 (patch) | |
| tree | e17f74246d0138bcd87100b8853da96423bb3fd1 /basic/source/basmgr | |
| parent | 2b7215e6fa12cd947bdbbe195909642a850cfd69 (diff) | |
loplugin:unuseddefaultparams in basic
Change-Id: I286efdac6af47a859693fccc71b445915f76945c
Diffstat (limited to 'basic/source/basmgr')
| -rw-r--r-- | basic/source/basmgr/basmgr.cxx | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 12f015aa8e73..533fb0cd78ab 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -713,7 +713,7 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib ) pStdLib->SetFlag( SbxFlagBits::DontStore | SbxFlagBits::ExtSearch ); } -void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL, bool bLoadLibs ) +void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL ) { tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( szManagerStream, eStreamReadMode ); @@ -793,7 +793,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase mpImpl->aLibs.push_back(std::unique_ptr<BasicLibInfo>(pInfo)); // Libs from external files should be loaded only when necessary. // But references are loaded at once, otherwise some big customers get into trouble - if ( bLoadLibs && pInfo->DoLoad() && + if ( pInfo->DoLoad() && ( !pInfo->IsExtern() || pInfo->IsReference())) { ImpLoadLibrary( pInfo, &rStorage ); @@ -928,7 +928,7 @@ BasicLibInfo* BasicManager::CreateLibInfo() return pInf; } -bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, bool bInfosOnly ) +bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage ) { try { DBG_ASSERT( pLibInfo, "LibInfo!?" ); @@ -982,29 +982,18 @@ bool BasicManager::ImpLoadLibrary( BasicLibInfo* pLibInfo, SotStorage* pCurStora bool bLoaded = false; if ( xBasicStream->Seek( STREAM_SEEK_TO_END ) != 0 ) { - if ( !bInfosOnly ) + if ( !pLibInfo->GetLib().Is() ) { - if ( !pLibInfo->GetLib().Is() ) - { - pLibInfo->SetLib( new StarBASIC( GetStdLib(), mbDocMgr ) ); - } - xBasicStream->SetBufferSize( 1024 ); - xBasicStream->Seek( STREAM_SEEK_TO_BEGIN ); - bLoaded = ImplLoadBasic( *xBasicStream, pLibInfo->GetLibRef() ); - xBasicStream->SetBufferSize( 0 ); - StarBASICRef xStdLib = pLibInfo->GetLib(); - xStdLib->SetName( pLibInfo->GetLibName() ); - xStdLib->SetModified( false ); - xStdLib->SetFlag( SbxFlagBits::DontStore ); - } - else - { - // Skip Basic... - xBasicStream->Seek( STREAM_SEEK_TO_BEGIN ); - ImplEncryptStream( *xBasicStream ); - SbxBase::Skip( *xBasicStream ); - bLoaded = true; + pLibInfo->SetLib( new StarBASIC( GetStdLib(), mbDocMgr ) ); } + xBasicStream->SetBufferSize( 1024 ); + xBasicStream->Seek( STREAM_SEEK_TO_BEGIN ); + bLoaded = ImplLoadBasic( *xBasicStream, pLibInfo->GetLibRef() ); + xBasicStream->SetBufferSize( 0 ); + StarBASICRef xStdLib = pLibInfo->GetLib(); + xStdLib->SetName( pLibInfo->GetLibName() ); + xStdLib->SetModified( false ); + xStdLib->SetFlag( SbxFlagBits::DontStore ); } if ( !bLoaded ) { |