diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-06 16:02:47 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-26 16:17:58 +0100 |
| commit | 317b5bdadebc5560d38da4c9dd6d68c64a93b9a8 (patch) | |
| tree | c36532feb63e89936fc3b42edbdff7ac7faedfc4 /ucb/source/ucp/webdav/webdavprovider.cxx | |
| parent | dbe081749d9c64c54fd19340a3696237a4ebdf20 (diff) | |
webdav: lang::XMultiServiceFactory -> uno::XComponentContext
Change-Id: I71984066a512a023c67d1690bd984d66f75f894b
Diffstat (limited to 'ucb/source/ucp/webdav/webdavprovider.cxx')
| -rw-r--r-- | ucb/source/ucp/webdav/webdavprovider.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index f07239d56725..b30069d644f3 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -62,8 +62,8 @@ OUString &WebDAVUserAgent::operator()() const //========================================================================= ContentProvider::ContentProvider( - const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) -: ::ucbhelper::ContentProviderImplHelper( rSMgr ), + const uno::Reference< uno::XComponentContext >& rContext ) +: ::ucbhelper::ContentProviderImplHelper( rContext ), m_xDAVSessionFactory( new DAVSessionFactory() ), m_pProps( 0 ) { @@ -73,11 +73,9 @@ ContentProvider::ContentProvider( bInit = true; try { - uno::Reference< uno::XComponentContext > xContext( - ::comphelper::getProcessComponentContext() ); uno::Reference< lang::XMultiServiceFactory > xConfigProvider( - xContext->getServiceManager()->createInstanceWithContext( - OUString("com.sun.star.configuration.ConfigurationProvider"), xContext), + rContext->getServiceManager()->createInstanceWithContext( + OUString("com.sun.star.configuration.ConfigurationProvider"), rContext), uno::UNO_QUERY_THROW ); beans::NamedValue aNodePath; @@ -151,7 +149,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, // //========================================================================= -XSERVICEINFO_IMPL_1( ContentProvider, +XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.WebDAVContentProvider" ), OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); @@ -238,7 +236,7 @@ ContentProvider::queryContent( } if ( bNewId ) - xCanonicId = new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ); + xCanonicId = new ::ucbhelper::ContentIdentifier( aURL ); else xCanonicId = Identifier; @@ -255,7 +253,7 @@ ContentProvider::queryContent( try { xContent = new ::http_dav_ucp::Content( - m_xSMgr, this, xCanonicId, m_xDAVSessionFactory ); + m_xContext, this, xCanonicId, m_xDAVSessionFactory ); registerNewContent( xContent ); } catch ( ucb::ContentCreationException const & ) |