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 /ucb/source/ucp/gvfs | |
| 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 'ucb/source/ucp/gvfs')
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_directory.cxx | 13 | ||||
| -rw-r--r-- | ucb/source/ucp/gvfs/gvfs_directory.hxx | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 7ece3b2eb5ce..52c8fc11b65a 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -31,6 +31,7 @@ #include <libgnomevfs/gnome-vfs-utils.h> #include <libgnomevfs/gnome-vfs-directory.h> +#include <comphelper/processfactory.hxx> using namespace com::sun::star; using namespace gvfs; @@ -50,10 +51,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 ); } @@ -108,15 +108,13 @@ struct gvfs::DataSupplier_Impl osl::Mutex m_aMutex; ResultList m_aResults; rtl::Reference< Content > m_xContent; - uno::Reference< lang::XMultiServiceFactory > m_xSMgr; sal_Int32 m_nOpenMode; sal_Bool m_bCountFinal; DataSupplier_Impl( - const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode ) - : m_xContent( rContent ), m_xSMgr( rxSMgr ), + : m_xContent( rContent ), m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {} ~DataSupplier_Impl() { @@ -132,10 +130,9 @@ struct gvfs::DataSupplier_Impl }; DataSupplier::DataSupplier( - const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode ) -: m_pImpl( new DataSupplier_Impl( rxSMgr, rContent, nOpenMode ) ) +: m_pImpl( new DataSupplier_Impl( rContent, nOpenMode ) ) { } diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx index 45273b7de82d..709b71fdef04 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.hxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx @@ -54,9 +54,7 @@ private: sal_Bool getData(); public: - DataSupplier( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const rtl::Reference< Content >& rContent, + DataSupplier(const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode); virtual ~DataSupplier(); |