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/ext | |
| parent | 48f2b7a7af3d4e9bf1b3c27e9aa5e12e60878051 (diff) | |
fdo#46808, use service constructor for ucb::CachedDynamicResultSetStubFactory
Change-Id: Iea7b21621c5d341468976507684a9c01f0822034
Diffstat (limited to 'ucb/source/ucp/ext')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_resultset.cxx | 9 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_resultset.hxx | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index c94be779f099..f58895bf4070 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -272,7 +272,7 @@ namespace ucb { namespace ucp { namespace ext if ( bOpenFolder && impl_isFolder() ) { Reference< XDynamicResultSet > xSet = new ResultSet( - m_xSMgr, this, aOpenCommand, i_rEvironment ); + comphelper::getComponentContext(m_xSMgr), this, aOpenCommand, i_rEvironment ); aRet <<= xSet; } diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx index 3097a65f7693..09759d77df3c 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.cxx +++ b/ucb/source/ucp/ext/ucpext_resultset.cxx @@ -41,6 +41,7 @@ namespace ucb { namespace ucp { namespace ext using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Type; + using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::ucb::XContentIdentifier; using ::com::sun::star::ucb::OpenCommandArgument2; @@ -51,9 +52,9 @@ namespace ucb { namespace ucp { namespace ext //= ResultSet //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ - ResultSet::ResultSet( const Reference< XMultiServiceFactory >& i_rORB, const ::rtl::Reference< Content >& i_rContent, + ResultSet::ResultSet( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, const OpenCommandArgument2& i_rCommand, const Reference< XCommandEnvironment >& i_rEnv ) - :ResultSetImplHelper( i_rORB, i_rCommand ) + :ResultSetImplHelper( rxContext, i_rCommand ) ,m_xEnvironment( i_rEnv ) ,m_xContent( i_rContent ) { @@ -63,12 +64,12 @@ namespace ucb { namespace ucp { namespace ext void ResultSet::initStatic() { ::rtl::Reference< DataSupplier > pDataSupplier( new DataSupplier( - m_xSMgr, + Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), m_xContent, m_aCommand.Mode ) ); m_xResultSet1 = new ::ucbhelper::ResultSet( - comphelper::getComponentContext(m_xSMgr), + m_xContext, m_aCommand.Properties, pDataSupplier.get(), m_xEnvironment diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx index 5c05ba4c54a9..3b097355326c 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.hxx +++ b/ucb/source/ucp/ext/ucpext_resultset.hxx @@ -37,7 +37,7 @@ namespace ucb { namespace ucp { namespace ext { public: ResultSet( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& i_rORB, + const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& i_rContent, const com::sun::star::ucb::OpenCommandArgument2& i_rCommand, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& i_rEnv |