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 | 4f70cd8e18074e87aa8af64bf37585e5fcebfc3f (patch) | |
| tree | f0bb218f46f877d70a55844f06e7d62eceec2aff | |
| parent | d77dfcfa0fa4172c5a8840c079b5d8cba16f3d0b (diff) | |
CWS-TOOLING: integrate CWS odfp30_DEV300
| -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 b81e3cd93cd8..a7f226f9455f 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; } |