diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-31 16:08:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 16:43:14 +0100 |
| commit | 8ec2fed7c88674258ce716e69ae31d8f9be7223c (patch) | |
| tree | e6d6a9657a247bb787fb2bc17688cef456efa288 /ucb/source/ucp/cmis | |
| parent | 1dedb15b17a8e8bf04f248809ef48db663034254 (diff) | |
fdo#46808, use service constructor for ucb::Store
Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
Diffstat (limited to 'ucb/source/ucp/cmis')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.cxx | 11 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_provider.hxx | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 271cd5bb50a7..b7febb5382dd 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -28,6 +28,7 @@ #include <stdio.h> +#include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contenthelper.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> @@ -59,12 +60,12 @@ ContentProvider::queryContent( URL aUrl( Identifier->getContentIdentifier( ) ); if ( aUrl.getRepositoryId( ).isEmpty( ) ) { - xContent = new RepoContent( m_xSMgr, this, Identifier ); + xContent = new RepoContent( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier ); registerNewContent( xContent ); } else { - xContent = new Content( m_xSMgr, this, Identifier ); + xContent = new Content( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier ); registerNewContent( xContent ); } } @@ -96,8 +97,8 @@ void ContentProvider::registerSession( const rtl::OUString& sBindingUrl, libcmis } ContentProvider::ContentProvider( - const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) -: ::ucbhelper::ContentProviderImplHelper( rSMgr ) + const uno::Reference< uno::XComponentContext >& rxContext ) +: ::ucbhelper::ContentProviderImplHelper( rxContext ) { } @@ -115,7 +116,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XServiceInfo, com::sun::star::ucb::XContentProvider ); -XSERVICEINFO_IMPL_1( ContentProvider, +XSERVICEINFO_IMPL_1_CTX( ContentProvider, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.CmisContentProvider" )), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 2ade10052725..75d7de7e1d53 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -43,7 +43,7 @@ private: public: ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rSMgr ); + ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XInterface |