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/ext | |
| parent | 1dedb15b17a8e8bf04f248809ef48db663034254 (diff) | |
fdo#46808, use service constructor for ucb::Store
Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
Diffstat (limited to 'ucb/source/ucp/ext')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_provider.cxx | 11 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_provider.hxx | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 95120c3f877c..18e0e3230022 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -54,8 +54,8 @@ namespace ucb { namespace ucp { namespace ext //= ContentProvider //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - ContentProvider::ContentProvider( const Reference< XMultiServiceFactory >& i_rServiceManager ) - :ContentProvider_Base( i_rServiceManager ) + ContentProvider::ContentProvider( const Reference< XComponentContext >& rxContext ) + :ContentProvider_Base( rxContext ) { } @@ -94,8 +94,7 @@ namespace ucb { namespace ucp { namespace ext //------------------------------------------------------------------------------------------------------------------ Reference< XInterface > ContentProvider::Create( const Reference< XComponentContext >& i_rContext ) { - const ::comphelper::ComponentContext aContext( i_rContext ); - return *( new ContentProvider( aContext.getLegacyServiceFactory() ) ); + return *( new ContentProvider( i_rContext ) ); } //------------------------------------------------------------------------------------------------------------------ @@ -173,7 +172,7 @@ namespace ucb { namespace ucp { namespace ext } } } - const Reference< XContentIdentifier > xNormalizedIdentifier( new ::ucbhelper::ContentIdentifier( m_xSMgr, aComposer.makeStringAndClear() ) ); + const Reference< XContentIdentifier > xNormalizedIdentifier( new ::ucbhelper::ContentIdentifier( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), aComposer.makeStringAndClear() ) ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,7 +182,7 @@ namespace ucb { namespace ucp { namespace ext return xContent; // create a new content - xContent = new Content( m_xSMgr, this, xNormalizedIdentifier ); + xContent = new Content( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), this, xNormalizedIdentifier ); if ( !xContent->getIdentifier().is() ) throw IllegalIdentifierException(); diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 4157c35c9d57..88c7f58325fa 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -34,7 +34,7 @@ namespace ucb { namespace ucp { namespace ext class ContentProvider : public ContentProvider_Base { public: - ContentProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rServiceManager ); + ContentProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~ContentProvider(); // XServiceInfo |