diff options
Diffstat (limited to 'desktop/source/deployment/registry/sfwk/dp_sfwk.cxx')
| -rw-r--r-- | desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 02b6452f33cb..0e8dc29d53c4 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,12 +64,12 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend class PackageImpl : public ::dp_registry::backend::Package { BackendImpl * getMyBackend() const; - + Reference< container::XNameContainer > m_xNameCntrPkgHandler; - OUString m_descr; - + OUString m_descr; + void initPackageHandler(); - + // Package virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_( ::osl::ResettableMutexGuard & guard, @@ -81,7 +81,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool startup, ::rtl::Reference<AbortChannel> const & abortChannel, Reference<XCommandEnvironment> const & xCmdEnv ); - + public: PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, @@ -91,7 +91,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend virtual OUString SAL_CALL getDescription() throw (RuntimeException); }; friend class PackageImpl; - + // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( OUString const & url, OUString const & mediaType, @@ -99,12 +99,12 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend Reference<XCommandEnvironment> const & xCmdEnv ); const Reference<deployment::XPackageTypeInfo> m_xTypeInfo; - + public: BackendImpl( Sequence<Any> const & args, Reference<XComponentContext> const & xComponentContext ); - + // XPackageRegistry virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL getSupportedPackageTypes() throw (RuntimeException); @@ -114,12 +114,12 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const { BackendImpl * pBackend = static_cast<BackendImpl *>(m_myBackend.get()); if (NULL == pBackend) - { + { //May throw a DisposedException check(); //We should never get here... throw RuntimeException( - OUSTR("Failed to get the BackendImpl"), + OUSTR("Failed to get the BackendImpl"), static_cast<OWeakObject*>(const_cast<PackageImpl *>(this))); } return pBackend; @@ -143,7 +143,7 @@ BackendImpl::PackageImpl::PackageImpl( m_descr(libType) { initPackageHandler(); - + sal_Int32 segmEnd = url.getLength(); if (url.getLength() > 0 && url[ url.getLength() - 1 ] == '/') --segmEnd; @@ -247,7 +247,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( StrCannotDetectMediaType::get() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } - + String type, subType; INetContentTypeParameterList params; if (INetContentTypes::parse( mediaType, type, subType, ¶ms )) @@ -258,15 +258,15 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( { OUString lang = OUString::createFromAscii("Script"); OUString sParcelDescURL = makeURL( - url, OUSTR("parcel-descriptor.xml") ); + url, OUSTR("parcel-descriptor.xml") ); ::ucbhelper::Content ucb_content; if (create_ucb_content( &ucb_content, sParcelDescURL, xCmdEnv, false /* no throw */ )) { - ParcelDescDocHandler* pHandler = - new ParcelDescDocHandler(); + ParcelDescDocHandler* pHandler = + new ParcelDescDocHandler(); Reference< xml::sax::XDocumentHandler > xDocHandler = pHandler; @@ -275,7 +275,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( Reference< xml::sax::XParser > xParser( xContext->getServiceManager()->createInstanceWithContext( - OUSTR("com.sun.star.xml.sax.Parser"), xContext ), + OUSTR("com.sun.star.xml.sax.Parser"), xContext ), UNO_QUERY_THROW ); xParser->setDocumentHandler( xDocHandler ); @@ -284,7 +284,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( source.sSystemId = ucb_content.getURL(); xParser->parseStream( source ); - if ( pHandler->isParsed() ) + if ( pHandler->isParsed() ) { lang = pHandler->getParcelLanguage(); } @@ -316,14 +316,14 @@ void BackendImpl::PackageImpl:: initPackageHandler() { if (m_xNameCntrPkgHandler.is()) return; - + BackendImpl * that = getMyBackend(); Any aContext; if ( that->m_eContext == CONTEXT_USER ) { aContext <<= OUSTR("user"); - } + } else if ( that->m_eContext == CONTEXT_SHARED ) { aContext <<= OUSTR("share"); @@ -338,7 +338,7 @@ void BackendImpl::PackageImpl:: initPackageHandler() // NOT supported at the momemtn // TODO } - Reference< provider::XScriptProviderFactory > xFac( + Reference< provider::XScriptProviderFactory > xFac( that->getComponentContext()->getValueByName( OUSTR( "/singletons/com.sun.star.script.provider.theMasterScriptProviderFactory") ), UNO_QUERY ); @@ -379,11 +379,11 @@ void BackendImpl::PackageImpl::processPackage_( { if ( !m_xNameCntrPkgHandler.is() ) { - dp_misc::TRACE("no package handler!!!!\n"); - throw RuntimeException( OUSTR("No package Handler " ), + dp_misc::TRACE("no package handler!!!!\n"); + throw RuntimeException( OUSTR("No package Handler " ), Reference< XInterface >() ); - } - + } + if (doRegisterPackage) { // will throw if it fails |