diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-16 10:59:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-16 10:59:24 +0000 |
| commit | ac20273a69b2557e89a4c3e6eb9a1d543390739d (patch) | |
| tree | df75371f8ed8dfa0cf626dc3af06ba9eb71c86d5 /basic | |
| parent | 1ce7ca393dacafceaea22eb92e693e8b2a743619 (diff) | |
CWS-TOOLING: integrate CWS odfp30_DEV300
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/uno/namecont.cxx | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 0945400a00..21c83f85fc 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -3224,10 +3224,19 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript if( !m_bUserPackagesLoaded ) { - Reference< XPackageManager > xUserManager = - thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") ); - m_aUserPackagesSeq = xUserManager->getDeployedPackages - ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + try + { + Reference< XPackageManager > xUserManager = + thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") ); + m_aUserPackagesSeq = xUserManager->getDeployedPackages + ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + } + catch( com::sun::star::uno::DeploymentException& ) + { + // Special Office installations may not contain deployment code + m_eState = END_REACHED; + return xScriptPackage; + } m_bUserPackagesLoaded = true; } @@ -3268,10 +3277,18 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri if( !m_bSharedPackagesLoaded ) { - Reference< XPackageManager > xSharedManager = - thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") ); - m_aSharedPackagesSeq = xSharedManager->getDeployedPackages - ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + try + { + Reference< XPackageManager > xSharedManager = + thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") ); + m_aSharedPackagesSeq = xSharedManager->getDeployedPackages + ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() ); + } + catch( com::sun::star::uno::DeploymentException& ) + { + // Special Office installations may not contain deployment code + return xScriptPackage; + } m_bSharedPackagesLoaded = true; } |