diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-08 08:16:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 13:59:47 +0100 |
| commit | 2cf0f6ea36e1525193544258eef2828a54345510 (patch) | |
| tree | b1033cc7f7ef1061bc16baa8a52480ced38e8b55 /ucb/source/ucp/gvfs | |
| parent | 48f2b7a7af3d4e9bf1b3c27e9aa5e12e60878051 (diff) | |
fdo#46808, use service constructor for ucb::CachedDynamicResultSetStubFactory
Change-Id: Iea7b21621c5d341468976507684a9c01f0822034
Diffstat (limited to 'ucb/source/ucp/gvfs')
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_content.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_directory.cxx | 6 | ||||
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_directory.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index d53b752f1792..c3ed8fd197c8 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -343,7 +343,7 @@ uno::Any SAL_CALL Content::execute( if ( bOpenFolder && isFolder( xEnv ) ) { uno::Reference< ucb::XDynamicResultSet > xSet - = new DynamicResultSet(m_xSMgr, this, aOpenCommand, xEnv ); + = new DynamicResultSet( comphelper::getComponentContext(m_xSMgr), this, aOpenCommand, xEnv ); aRet <<= xSet; } else if ( aOpenCommand.Sink.is() ) { diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 52c8fc11b65a..9ca0c2382e44 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -39,11 +39,11 @@ using namespace gvfs; // DynamicResultSet Implementation. DynamicResultSet::DynamicResultSet( - const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, const ucb::OpenCommandArgument2& rCommand, const uno::Reference< ucb::XCommandEnvironment >& rxEnv ) - : ResultSetImplHelper( rxSMgr, rCommand ), + : ResultSetImplHelper( rxContext, rCommand ), m_xContent( rxContent ), m_xEnv( rxEnv ) { @@ -51,7 +51,7 @@ DynamicResultSet::DynamicResultSet( void DynamicResultSet::initStatic() { m_xResultSet1 - = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr), + = new ::ucbhelper::ResultSet( m_xContext, m_aCommand.Properties, new DataSupplier( m_xContent, m_aCommand.Mode ), diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx index 709b71fdef04..e1847b3a470b 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.hxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx @@ -38,7 +38,7 @@ private: public: DynamicResultSet( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr, + com::sun::star::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, const com::sun::star::ucb::OpenCommandArgument2& rCommand, const com::sun::star::uno::Reference< |