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 /dbaccess | |
| parent | 48f2b7a7af3d4e9bf1b3c27e9aa5e12e60878051 (diff) | |
fdo#46808, use service constructor for ucb::CachedDynamicResultSetStubFactory
Change-Id: Iea7b21621c5d341468976507684a9c01f0822034
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/documentcontainer.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/myucp_resultset.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/myucp_resultset.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 6d02c142ba79..54cda9269439 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -427,7 +427,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com // open as folder - return result set Reference< XDynamicResultSet > xSet - = new DynamicResultSet( m_aContext.getLegacyServiceFactory(), + = new DynamicResultSet( m_aContext.getUNOContext(), this, aOpenCommand, Environment ); diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx index 7da5760dd422..f9dab3313935 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx @@ -49,11 +49,11 @@ using namespace dbaccess; //========================================================================= DynamicResultSet::DynamicResultSet( - const Reference< XMultiServiceFactory >& rxSMgr, + const Reference< XComponentContext >& rxContext, const rtl::Reference< ODocumentContainer >& rxContent, const OpenCommandArgument2& rCommand, const Reference< XCommandEnvironment >& rxEnv ) - :ResultSetImplHelper( rxSMgr, rCommand ) + :ResultSetImplHelper( rxContext, rCommand ) ,m_xContent(rxContent) ,m_xEnv( rxEnv ) { @@ -67,7 +67,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 ), @@ -77,7 +77,7 @@ void DynamicResultSet::initStatic() void DynamicResultSet::initDynamic() { 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/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx index a103378d488d..09ff945dc650 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx @@ -41,7 +41,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< ODocumentContainer >& rxContent, const com::sun::star::ucb::OpenCommandArgument2& rCommand, const com::sun::star::uno::Reference< |