diff options
Diffstat (limited to 'desktop/source/deployment/registry/sfwk/dp_sfwk.cxx')
| -rw-r--r-- | desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 4dcd55e02991..b617d7fa4ed1 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -21,6 +21,7 @@ #include <strings.hrc> #include <dp_backend.h> +#include <dp_misc.h> #include <dp_ucb.h> #include "dp_parceldesc.hxx" #include <rtl/uri.hxx> @@ -30,6 +31,7 @@ #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/xml/sax/Parser.hpp> #include <cppuhelper/supportsservice.hxx> +#include <utility> using namespace ::dp_misc; @@ -70,7 +72,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend public: PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, - OUString const & url, OUString const & libType, bool bRemoved, + OUString const & url, OUString libType, bool bRemoved, OUString const & identifier); // XPackage virtual OUString SAL_CALL getDescription() override; @@ -134,11 +136,11 @@ OUString BackendImpl::PackageImpl::getLicenseText() BackendImpl::PackageImpl::PackageImpl( ::rtl::Reference<BackendImpl> const & myBackend, - OUString const & url, OUString const & libType, bool bRemoved, + OUString const & url, OUString libType, bool bRemoved, OUString const & identifier) - : Package( myBackend.get(), url, OUString(), OUString(), + : Package( myBackend, url, OUString(), OUString(), myBackend->m_xTypeInfo, bRemoved, identifier), - m_descr(libType) + m_descr(std::move(libType)) { initPackageHandler(); @@ -244,17 +246,15 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( if (create_ucb_content( &ucb_content, sParcelDescURL, xCmdEnv, false /* no throw */ )) { - ParcelDescDocHandler* pHandler = + rtl::Reference<ParcelDescDocHandler> pHandler = new ParcelDescDocHandler(); - Reference< xml::sax::XDocumentHandler > - xDocHandler = pHandler; Reference<XComponentContext> xContext( getComponentContext() ); Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext); - xParser->setDocumentHandler( xDocHandler ); + xParser->setDocumentHandler( pHandler ); xml::sax::InputSource source; source.aInputStream = ucb_content.openStream(); source.sSystemId = ucb_content.getURL(); @@ -357,7 +357,7 @@ void BackendImpl::PackageImpl::processPackage_( if (doRegisterPackage) { // will throw if it fails - m_xNameCntrPkgHandler->insertByName( m_url, makeAny( Reference< XPackage >(this) ) ); + m_xNameCntrPkgHandler->insertByName( m_url, Any( Reference< XPackage >(this) ) ); } else // revokePackage() |