diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-07 17:20:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 13:59:46 +0100 |
| commit | 48f2b7a7af3d4e9bf1b3c27e9aa5e12e60878051 (patch) | |
| tree | c1491912ec67ffc609cab35a57efba756434a9ec /dbaccess | |
| parent | f96db7d0ddeb737cf0e14eea6120daab860c54b7 (diff) | |
fdo#46808, convert ucbhelper::ResultSet to XComponentContext
Along the way, remove the XMultiServiceFactory member from
a few classes that were not using it.
Change-Id: I9ee2c2ebc01144301ed8e489bd92b4695ff263d0
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/myucp_resultset.cxx | 11 |
3 files changed, 9 insertions, 16 deletions
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index 66f6a2fbed4c..108751038351 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -78,15 +78,12 @@ struct DataSupplier_Impl osl::Mutex m_aMutex; ResultList m_aResults; rtl::Reference< ODocumentContainer > m_xContent; - Reference< XMultiServiceFactory > m_xSMgr; sal_Int32 m_nOpenMode; sal_Bool m_bCountFinal; - DataSupplier_Impl( const Reference< XMultiServiceFactory >& rxSMgr, - const rtl::Reference< ODocumentContainer >& rContent, + DataSupplier_Impl( const rtl::Reference< ODocumentContainer >& rContent, sal_Int32 nOpenMode ) : m_xContent(rContent) - , m_xSMgr( rxSMgr ) , m_nOpenMode( nOpenMode ) , m_bCountFinal( sal_False ) {} ~DataSupplier_Impl(); @@ -114,10 +111,9 @@ DataSupplier_Impl::~DataSupplier_Impl() //========================================================================= DBG_NAME(DataSupplier) -DataSupplier::DataSupplier( const Reference< XMultiServiceFactory >& rxSMgr, - const rtl::Reference< ODocumentContainer >& rContent, +DataSupplier::DataSupplier( const rtl::Reference< ODocumentContainer >& rContent, sal_Int32 nOpenMode ) -: m_pImpl( new DataSupplier_Impl( rxSMgr, rContent,nOpenMode ) ) +: m_pImpl( new DataSupplier_Impl( rContent,nOpenMode ) ) { DBG_CTOR(DataSupplier,NULL); diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index e69964225b4e..0274d5cc2025 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -34,9 +34,7 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier ::std::auto_ptr<DataSupplier_Impl> m_pImpl; public: - DataSupplier( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const rtl::Reference< ODocumentContainer >& rxContent, + DataSupplier( const rtl::Reference< ODocumentContainer >& rxContent, sal_Int32 nOpenMode ); virtual ~DataSupplier(); diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx index 208def6f12cb..7da5760dd422 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx @@ -29,6 +29,7 @@ #include "myucp_datasupplier.hxx" #include "myucp_resultset.hxx" +#include <comphelper/processfactory.hxx> using namespace ::com::sun::star::uno; @@ -66,10 +67,9 @@ DynamicResultSet::DynamicResultSet( void DynamicResultSet::initStatic() { m_xResultSet1 - = new ::ucbhelper::ResultSet( m_xSMgr, + = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr), m_aCommand.Properties, - new DataSupplier( m_xSMgr, - m_xContent, + new DataSupplier( m_xContent, m_aCommand.Mode ), m_xEnv ); } @@ -77,10 +77,9 @@ void DynamicResultSet::initStatic() void DynamicResultSet::initDynamic() { m_xResultSet1 - = new ::ucbhelper::ResultSet( m_xSMgr, + = new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr), m_aCommand.Properties, - new DataSupplier( m_xSMgr, - m_xContent, + new DataSupplier( m_xContent, m_aCommand.Mode ), m_xEnv ); m_xResultSet2 = m_xResultSet1; |