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/hierarchy | |
| parent | 48f2b7a7af3d4e9bf1b3c27e9aa5e12e60878051 (diff) | |
fdo#46808, use service constructor for ucb::CachedDynamicResultSetStubFactory
Change-Id: Iea7b21621c5d341468976507684a9c01f0822034
Diffstat (limited to 'ucb/source/ucp/hierarchy')
| -rw-r--r-- | ucb/source/ucp/hierarchy/dynamicresultset.cxx | 12 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/dynamicresultset.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx index bb7d735b84db..a36d5dff70b5 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx @@ -42,10 +42,10 @@ using namespace hierarchy_ucp; //========================================================================= DynamicResultSet::DynamicResultSet( - const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, + const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rxContent, const ucb::OpenCommandArgument2& rCommand ) -: ResultSetImplHelper( rxSMgr, rCommand ), +: ResultSetImplHelper( rxContext, rCommand ), m_xContent( rxContent ) { } @@ -60,9 +60,9 @@ void DynamicResultSet::initStatic() { m_xResultSet1 = new ::ucbhelper::ResultSet( - comphelper::getComponentContext(m_xSMgr), + m_xContext, m_aCommand.Properties, - new HierarchyResultSetDataSupplier( m_xSMgr, + new HierarchyResultSetDataSupplier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), m_xContent, m_aCommand.Mode ) ); } @@ -72,9 +72,9 @@ void DynamicResultSet::initDynamic() { m_xResultSet1 = new ::ucbhelper::ResultSet( - comphelper::getComponentContext(m_xSMgr), + m_xContext, m_aCommand.Properties, - new HierarchyResultSetDataSupplier( m_xSMgr, + new HierarchyResultSetDataSupplier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), m_xContent, m_aCommand.Mode ) ); m_xResultSet2 = m_xResultSet1; diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx index dd88cd5ecad8..79e29cf8ac89 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx @@ -37,7 +37,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< HierarchyContent >& rxContent, const com::sun::star::ucb::OpenCommandArgument2& rCommand ); }; diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index efa433c2be35..81dd0dc00f04 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -59,6 +59,7 @@ #include <com/sun/star/ucb/XPersistentPropertySet.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> @@ -440,7 +441,7 @@ uno::Any SAL_CALL HierarchyContent::execute( } uno::Reference< ucb::XDynamicResultSet > xSet - = new DynamicResultSet( m_xSMgr, this, aOpenCommand ); + = new DynamicResultSet( comphelper::getComponentContext(m_xSMgr), this, aOpenCommand ); aRet <<= xSet; } else if ( aCommand.Name == "insert" && ( m_eKind != ROOT ) && !isReadOnly() ) |